[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-772-gdf5b26878

ticho at claws-mail.org ticho at claws-mail.org
Thu Aug 8 19:40:11 CEST 2019


The branch, gtk3 has been updated
       via  df5b2687888428ca65c5e19e3ea243925b583905 (commit)
       via  e139c1126120ac1c0112948216b98b77130cffbd (commit)
       via  02730a60e1c7b77131558661f2ad163d0bde6c26 (commit)
       via  78723ba10749e4ef3a8d6bcd8f0af70ecbc7cfc7 (commit)
       via  ef64f05e6a50457971531bd54c58517e78214424 (commit)
       via  825be32b2503b4c6138c1df4eeac25d70e84d10c (commit)
       via  179c736dbf494c20d6812e5310254b65aadb7904 (commit)
       via  aba296bd2f1beaa750add7656003d809dc763381 (commit)
       via  82db6d4cb619d5fff7bb979c3e6515052987d5b9 (commit)
       via  7eca362ef251644bc0ceb7310ae26f2c7a5943a0 (commit)
       via  bcb0c74e062af68754f1f430bb7f0b65407cea61 (commit)
       via  27534b6ba53ff71d4bb935490db9e6e64c7a820f (commit)
       via  4d6d31e8c5e6b16dabd253e3b70eaf1aa02a0313 (commit)
       via  32e4bbe817586dfabb3e83265ecbcb45b3eadf3e (commit)
       via  95bd2a18ed7da8754ee4445ca24d6b196147031c (commit)
       via  3e3fa274fd7b3b9f0772c3141cd470deaaf65e37 (commit)
       via  80108ed0f1bd1d9df477cef5336e90d660dbc67e (commit)
       via  bcde37e89350aa6992e1bc2430d1b4f84165a0b4 (commit)
       via  8fb446dda5e0d83166e3718a4a5e0ae1504985fa (commit)
       via  7b996f775c123d29cdcfc0a117de1bd3e0d06867 (commit)
       via  fe04873dd3b27991f984c7c1292a6a49847d5b19 (commit)
       via  c8cb6c4ce1f6b9ea2838c8288a3f32923d1d7f6e (commit)
      from  3c182109663906bb388798f0cc7587fdfdeb1d60 (commit)

Summary of changes:
 NEWS                                      |   73 +
 README                                    |    3 +-
 RELEASE_NOTES                             |   85 +-
 po/de.po                                  |    2 +-
 po/es.po                                  | 3156 +++++++++++++++--------------
 po/fr.po                                  | 2886 +++++++++++++-------------
 src/common/tlds.h                         |    9 +-
 src/compose.c                             |  240 ++-
 src/grouplistdialog.c                     |    9 +-
 src/image_viewer.c                        |    7 +-
 src/mimeview.c                            |   38 +
 src/plugins/fancy/fancy_viewer.c          |    2 +-
 src/plugins/litehtml_viewer/lh_viewer.c   |   22 +-
 src/plugins/litehtml_viewer/lh_widget.cpp |   14 +-
 src/plugins/litehtml_viewer/plugin.c      |    2 +-
 src/plugins/perl/cm_perl.pod              |    6 +-
 src/procmime.c                            |   33 +-
 src/procmime.h                            |    5 +-
 src/summaryview.c                         |   19 +-
 src/textview.c                            |   13 +-
 20 files changed, 3516 insertions(+), 3108 deletions(-)


- Log -----------------------------------------------------------------
commit df5b2687888428ca65c5e19e3ea243925b583905
Author: Paul <paul at claws-mail.org>
Date:   Fri Jul 26 09:55:39 2019 +0100

    more translation updates

diff --git a/po/de.po b/po/de.po
index a58d7d714..f6c56c79a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10405,7 +10405,7 @@ msgstr "GData-Plugin: Fehler beim Erneuern der Autorisierung: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:506
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "GData-Plugin: Erneuern der Autorisierung erfolgreich\n"
+msgstr "GData-Plugin: Erneuern der Autorisierung erfolgreich: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:566
 #, c-format
diff --git a/po/es.po b/po/es.po
index e50401cb8..1d28d2edc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.17.2\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2017-03-25 21:08+0100\n"
+"POT-Creation-Date: 2019-07-26 09:48+0100\n"
 "PO-Revision-Date: 2019-07-22 00:09+0200\n"
 "Last-Translator: Ricardo Mones <ricardo at mones.org>\n"
 "Language-Team: Spanish\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:396 src/account.c:463
+#: src/account.c:402 src/account.c:469
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -28,15 +28,15 @@ msgstr ""
 "Hay ventanas de composición abiertas.\n"
 "Cierre todas las ventanas de composición antes de editar las cuentas."
 
-#: src/account.c:441
+#: src/account.c:447
 msgid "Can't create folder."
 msgstr "No se puede crear la carpeta."
 
-#: src/account.c:728
+#: src/account.c:735
 msgid "Edit accounts"
 msgstr "Editar cuentas"
 
-#: src/account.c:745
+#: src/account.c:752
 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,60 +46,60 @@ msgstr ""
 "orden dado, la casilla indica que cuentas se incluirán. El texto en negrita "
 "indica la cuenta predeterminada."
 
-#: src/account.c:816
+#: src/account.c:823
 msgid " _Set as default account "
 msgstr " _Establecer como primaria "
 
-#: src/account.c:908
+#: src/account.c:915
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Las cuentas con carpetas remotas no se pueden copiar."
 
-#: src/account.c:915
+#: src/account.c:922
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 
-#: src/account.c:1096
+#: src/account.c:1119
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Realmente quiere borrar la cuenta «%s»?"
 
-#: src/account.c:1098
+#: src/account.c:1121
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: src/account.c:1099
+#: src/account.c:1122
 msgid "Delete account"
 msgstr "Borrar cuenta"
 
-#: src/account.c:1589
+#: src/account.c:1596
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1595
+#: src/account.c:1602
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 
-#: src/account.c:1602 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7333 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/account.c:1609 src/addrduplicates.c:471 src/addressadd.c:222
+#: src/addressbook.c:128 src/compose.c:7467 src/editaddress.c:1473
+#: src/editaddress.c:1502 src/editaddress.c:1518
+#: src/editaddress_other_attributes_ldap.c:371
+#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:170
+#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:427
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
-#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1792
-#: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1868 src/prefs_template.c:79
+#: src/mimeview.c:303 src/plugins/managesieve/sieve_manager.c:470
+#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: src/plugins/pgpcore/select-keys.c:463 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1874 src/prefs_template.c:79 src/prefs_themes.c:990
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account.c:1610 src/prefs_account.c:1096 src/prefs_account.c:4141
+#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4647
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:1618 src/ssl_manager.c:100
+#: src/account.c:1625 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Servidor"
 
@@ -126,11 +126,11 @@ msgstr ""
 "La acción seleccionada no se puede usar en la ventana de composición\n"
 "porque contiene %%f, %%F, %%as o %%p."
 
-#: src/action.c:719
+#: src/action.c:728
 msgid "There is no filtering action set"
 msgstr "No hay acciones de filtrado establecidas"
 
-#: src/action.c:721
+#: src/action.c:730
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -139,7 +139,7 @@ msgstr ""
 "Acciones de filtrado inválidas:\n"
 "%s"
 
-#: src/action.c:986
+#: src/action.c:997
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -150,34 +150,35 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:988 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:857
-#: src/plugins/tnef_parse/tnef_parse.c:75
+#: src/action.c:999 src/compose.c:5262 src/compose.c:5267 src/ldaputil.c:333
+#: src/plugins/bogofilter/bogofilter.c:858
+#: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
 #: src/plugins/vcalendar/vcal_folder.c:1831
-#: src/plugins/vcalendar/vcal_folder.c:1844
-#: src/plugins/vcalendar/vcal_folder.c:1847 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1849
+#: src/plugins/vcalendar/vcal_folder.c:1852 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/action.c:1206 src/action.c:1371
+#: src/action.c:1218 src/action.c:1390
 msgid "Completed"
 msgstr "Completado"
 
-#: src/action.c:1242
+#: src/action.c:1254
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Ejecutando: %s\n"
 
-#: src/action.c:1246
+#: src/action.c:1258
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 
-#: src/action.c:1279
+#: src/action.c:1304
 msgid "Action's input/output"
 msgstr "Entrada/salida de la acción"
 
-#: src/action.c:1607
+#: src/action.c:1636
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -188,11 +189,11 @@ msgstr ""
 "(«%%h» será sustituido con el parámetro)\n"
 "  %s"
 
-#: src/action.c:1612
+#: src/action.c:1641
 msgid "Action's hidden user argument"
 msgstr "Parámetro de usuario oculto para la acción"
 
-#: src/action.c:1616
+#: src/action.c:1645
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -203,24 +204,24 @@ msgstr ""
 "(«%%u» será sustituido con el parámetro)\n"
 "  %s"
 
-#: src/action.c:1621
+#: src/action.c:1650
 msgid "Action's user argument"
 msgstr "Parámetro de usuario para la acción"
 
-#: src/addrclip.c:479
+#: src/addrclip.c:481
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "No se puede copiar una carpeta a si misma o su sub-estructura."
 
-#: src/addrclip.c:502
+#: src/addrclip.c:504
 msgid "Cannot copy an address book to itself."
 msgstr "No se puede copiar una agenda a si misma."
 
-#: src/addrclip.c:593
+#: src/addrclip.c:595
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "No se puede mover la carpeta a si misma o a su sub-estructura."
 
-#: src/addr_compl.c:689 src/addressbook.c:4946
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/addr_compl.c:689 src/addressbook.c:5017
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "Grupo"
 
@@ -260,31 +261,31 @@ msgstr "fax"
 msgid "website"
 msgstr "página web"
 
-#: src/addrcustomattr.c:141
+#: src/addrcustomattr.c:146
 msgid "Attribute name"
 msgstr "Nombre del atributo"
 
-#: src/addrcustomattr.c:156
+#: src/addrcustomattr.c:161
 msgid "Delete all attribute names"
 msgstr "Borrar todos los nombres de atributo"
 
-#: src/addrcustomattr.c:157
+#: src/addrcustomattr.c:162
 msgid "Do you really want to delete all attribute names?"
 msgstr "¿Quiere borrar realmente todos los nombres de atributos?"
 
-#: src/addrcustomattr.c:181
+#: src/addrcustomattr.c:186
 msgid "Delete attribute name"
 msgstr "Borrar nombre de atributo"
 
-#: src/addrcustomattr.c:182
+#: src/addrcustomattr.c:187
 msgid "Do you really want to delete this attribute name?"
 msgstr "¿Quiere borrar realmente este nombre de atributo?"
 
-#: src/addrcustomattr.c:191
+#: src/addrcustomattr.c:196
 msgid "Reset to default"
 msgstr "Reiniciar valores"
 
-#: src/addrcustomattr.c:192
+#: src/addrcustomattr.c:197
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
@@ -292,36 +293,36 @@ msgstr ""
 "¿Realmente quiere reemplazar todos los nombres de\n"
 "atributos con los valores iniciales predeterminados?"
 
-#: 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:1307 src/prefs_actions.c:1084
-#: src/prefs_filtering.c:1695 src/prefs_template.c:1109
+#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
+#: src/addressbook.c:484 src/edittags.c:286
+#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1085
+#: src/prefs_filtering.c:1699 src/prefs_template.c:1111
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1085
-#: src/prefs_filtering.c:1696 src/prefs_template.c:1110
+#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1086
+#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "Delete _all"
 msgstr "_Borrar todo"
 
-#: src/addrcustomattr.c:214
+#: src/addrcustomattr.c:219
 msgid "_Reset to default"
 msgstr "_Reiniciar valores"
 
-#: src/addrcustomattr.c:403
+#: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
 msgstr "No se estableció el nombre del atributo."
 
-#: src/addrcustomattr.c:462
+#: src/addrcustomattr.c:469
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Editar nombres de atributos"
 
-#: src/addrcustomattr.c:476
+#: src/addrcustomattr.c:483
 msgid "New attribute name:"
 msgstr "Nombre del nuevo atributo:"
 
-#: src/addrcustomattr.c:513
+#: src/addrcustomattr.c:520
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -355,8 +356,8 @@ msgstr "No se encontraron direcciones de correo duplicadas en la agenda"
 msgid "Duplicate email addresses"
 msgstr "Direcciones de correo duplicadas"
 
-#: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:526
+#: src/addrduplicates.c:442 src/addressadd.c:234
+#: src/plugins/pgpcore/select-keys.c:469 src/toolbar.c:529
 msgid "Address"
 msgstr "Dirección"
 
@@ -364,50 +365,50 @@ msgstr "Dirección"
 msgid "Address book path"
 msgstr "Ruta a la agenda de direcciones"
 
-#: src/addrduplicates.c:793 src/addressbook.c:1438 src/addressbook.c:1491
+#: src/addrduplicates.c:790 src/addressbook.c:1444 src/addressbook.c:1497
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addrduplicates.c:794 src/addressbook.c:1492
+#: src/addrduplicates.c:791 src/addressbook.c:1498
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addrduplicates.c:842
+#: src/addrduplicates.c:840
 msgid "Delete address"
 msgstr "Borrar dirección"
 
-#: src/addrduplicates.c:843 src/addressbook.c:1439
+#: src/addrduplicates.c:841 src/addressbook.c:1445
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Esta dirección es solo de lectura y no se puede borrar."
 
-#: src/addressadd.c:185 src/prefs_filtering_action.c:201
+#: src/addressadd.c:192 src/prefs_filtering_action.c:195
 msgid "Add to address book"
 msgstr "Añadir a la agenda"
 
-#: src/addressadd.c:207
+#: src/addressadd.c:214
 msgid "Contact"
 msgstr "Contacto"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1056
-#: src/editaddress.c:1131 src/editgroup.c:290
+#: src/addressadd.c:245 src/addressbook.c:130 src/editaddress.c:1257
+#: src/editaddress.c:1301 src/editgroup.c:292
 msgid "Remarks"
 msgstr "Notas"
 
-#: src/addressadd.c:257 src/addressbook_foldersel.c:158
+#: src/addressadd.c:286 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:534 src/addressbook.c:3216 src/addressbook.c:3267
+#: src/addressadd.c:596 src/addressbook.c:3267 src/addressbook.c:3318
 msgid "Add address(es)"
 msgstr "Añadir dirección(es)"
 
-#: src/addressadd.c:535
+#: src/addressadd.c:597
 msgid "Can't add the specified address"
 msgstr "No se puede añadir la dirección especificada"
 
-#: 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
+#: src/addressbook.c:129 src/addressbook.c:5005 src/editaddress.c:1246
+#: src/editaddress.c:1284 src/editgroup.c:291 src/expldifdlg.c:517
+#: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
 msgid "Email Address"
 msgstr "Dirección de correo"
 
@@ -415,27 +416,27 @@ msgstr "Dirección de correo"
 msgid "_Book"
 msgstr "_Agenda"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:602 src/mainwindow.c:514
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
+#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:523
+#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/addressbook.c:407 src/compose.c:607 src/mainwindow.c:517
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:526
+#: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: src/addressbook.c:408 src/compose.c:608 src/mainwindow.c:519
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:528
+#: src/messageview.c:216
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: src/addressbook.c:411 src/addressbook.c:468
+#: src/addressbook.c:411 src/addressbook.c:469
 msgid "New _Book"
 msgstr "Nueva _agenda"
 
-#: src/addressbook.c:412 src/addressbook.c:469
+#: src/addressbook.c:412 src/addressbook.c:470
 msgid "New _Folder"
 msgstr "Nueva _carpeta"
 
@@ -459,209 +460,213 @@ msgstr "_Editar agenda"
 msgid "_Delete book"
 msgstr "_Borrar agenda"
 
-#: src/addressbook.c:427 src/compose.c:619
+#: src/addressbook.c:427 src/compose.c:624
 #: src/plugins/managesieve/sieve_editor.c:85
-#: src/plugins/managesieve/sieve_editor.c:433
-#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_editor.c:434
+#: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Guardar..."
 
-#: src/addressbook.c:428 src/compose.c:623 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:629
+#: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
 msgid "_Select all"
 msgstr "_Seleccionar todo"
 
-#: src/addressbook.c:433 src/addressbook.c:472 src/addressbook.c:488
+#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:631 src/mainwindow.c:548 src/messageview.c:225
+#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
+#: src/compose.c:636 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
+#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/addressbook.c:440 src/addressbook.c:485
+#: src/addressbook.c:440 src/addressbook.c:486
 msgid "New _Address"
 msgstr "Nueva _dirección"
 
-#: src/addressbook.c:441 src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
 msgid "New _Group"
 msgstr "Nuevo _grupo"
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:443 src/addressbook.c:493
 msgid "_Mail To"
 msgstr "_Correo para"
 
-#: src/addressbook.c:447
+#: src/addressbook.c:444 src/addressbook.c:497
+msgid "_Merge"
+msgstr ""
+
+#: src/addressbook.c:448
 msgid "Import _LDIF file..."
 msgstr "Importar fichero _LDIF..."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:449
 msgid "Import M_utt file..."
 msgstr "Importar fichero M_utt..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:450
 msgid "Import _Pine file..."
 msgstr "Importar fichero _Pine..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:452
 msgid "Export _HTML..."
 msgstr "Exportar _HTML..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:453
 msgid "Export LDI_F..."
 msgstr "Exportar LDI_F..."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:455
 msgid "Find duplicates..."
 msgstr "Buscar duplicados..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:456
 msgid "Edit custom attributes..."
 msgstr "Editar atributos de usuario..."
 
-#: src/addressbook.c:458 src/compose.c:709 src/mainwindow.c:815
-#: src/messageview.c:337
+#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:825
+#: src/messageview.c:340
 msgid "_About"
 msgstr "_Acerca de"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:495
 msgid "_Browse Entry"
 msgstr "_Ver entrada"
 
-#: 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:782
-#: src/prefs_themes.c:814 src/prefs_themes.c:815
+#: src/addressbook.c:509 src/crash.c:456 src/crash.c:475 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
+#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
+#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
+#: src/prefs_themes.c:851 src/prefs_themes.c:852
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/addressbook.c:514 src/addressbook.c:533 src/importldif.c:121
+#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
 msgid "Success"
 msgstr "Éxito"
 
-#: src/addressbook.c:515 src/importldif.c:122
+#: src/addressbook.c:517 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Argumentos incorrectos"
 
-#: src/addressbook.c:516 src/importldif.c:123
+#: src/addressbook.c:518 src/importldif.c:123
 msgid "File not specified"
 msgstr "No se especificó el fichero"
 
-#: src/addressbook.c:517 src/importldif.c:124
+#: src/addressbook.c:519 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Error abriendo el fichero"
 
-#: src/addressbook.c:518 src/importldif.c:125
+#: src/addressbook.c:520 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Error leyendo el fichero"
 
-#: src/addressbook.c:519 src/importldif.c:126
+#: src/addressbook.c:521 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Encontrado final del fichero"
 
-#: src/addressbook.c:520 src/importldif.c:127
+#: src/addressbook.c:522 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Error reservando memoria"
 
-#: src/addressbook.c:521 src/importldif.c:128
+#: src/addressbook.c:523 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Formato de fichero erróneo"
 
-#: src/addressbook.c:522 src/importldif.c:129
+#: src/addressbook.c:524 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Error escribiendo en el fichero"
 
-#: src/addressbook.c:523 src/importldif.c:130
+#: src/addressbook.c:525 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Error abriendo el directorio"
 
-#: src/addressbook.c:524 src/importldif.c:131
+#: src/addressbook.c:526 src/importldif.c:131
 msgid "No path specified"
 msgstr "No se especificó una ruta"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:536
 msgid "Error connecting to LDAP server"
 msgstr "Error conectando al servidor LDAP"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:537
 msgid "Error initializing LDAP"
 msgstr "Error inicializando LDAP"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:538
 msgid "Error binding to LDAP server"
 msgstr "Error enlazando con el servidor LDAP"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:539
 msgid "Error searching LDAP database"
 msgstr "Error buscando en la base de datos LDAP"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:540
 msgid "Timeout performing LDAP operation"
 msgstr "Fuera de tiempo en la operación LDAP"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:541
 msgid "Error in LDAP search criteria"
 msgstr "Error en el criterio de búsqueda LDAP"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:542
 msgid "No LDAP entries found for search criteria"
 msgstr "No se encontraron entradas LDAP para el criterio de búsqueda"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:543
 msgid "LDAP search terminated on request"
 msgstr "Se solicitó concluir la búsqueda LDAP"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:544
 msgid "Error starting STARTTLS connection"
 msgstr "Error iniciando la conexión con STARTTLS"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:545
 msgid "Distinguished Name (dn) is missing"
 msgstr "Falta el nombre distinguido (dn)"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:546
 msgid "Missing required information"
 msgstr "Falta la información necesaria"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:547
 msgid "Another contact exists with that key"
 msgstr "Ya existe un contacto con esa clave"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:548
 msgid "Strong(er) authentication required"
 msgstr "Se necesita autenticación (más) fuerte"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:916
 msgid "Sources"
 msgstr "Fuentes"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:268 src/toolbar.c:2441
+#: src/addressbook.c:920 src/prefs_matcher.c:642 src/prefs_other.c:492
+#: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:1112 src/editldap.c:781
+#: src/addressbook.c:1117 src/editldap.c:793
 msgid "Search"
 msgstr "Buscar"
 
-#: src/addressbook.c:1483
+#: src/addressbook.c:1489
 msgid "Delete group"
 msgstr "Borrar grupo"
 
-#: src/addressbook.c:1484
+#: src/addressbook.c:1490
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -669,26 +674,26 @@ msgstr ""
 "¿Quiere borrar el(los) grupo(s)?\n"
 "Las direcciones que contienen no se perderán."
 
-#: src/addressbook.c:2195
+#: src/addressbook.c:2217
 msgid "Cannot paste. Target address book is readonly."
 msgstr "No puedo pegar. El libro de direcciones destino es solo de lectura."
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2227
 msgid "Cannot paste into an address group."
 msgstr "No se puede pegar dentro de un grupo de direcciones."
 
-#: src/addressbook.c:2913
+#: src/addressbook.c:2964
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "¿Quiere borrar los resultados de la búsqueda y direcciones en «%s»?"
 
-#: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
-#: src/toolbar.c:494
+#: src/addressbook.c:2967 src/addressbook.c:2993 src/addressbook.c:3000
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
+#: src/toolbar.c:497
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:2925
+#: src/addressbook.c:2976
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -697,20 +702,20 @@ msgstr ""
 "¿Quiere borrar «%s»? Si borra sólo la carpeta las direcciones que contenga "
 "se moverán a la carpeta padre."
 
-#: src/addressbook.c:2928 src/imap_gtk.c:370 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
+#: src/addressbook.c:2979 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2980
 msgid "Delete _folder only"
 msgstr "Borrar sólo _carpeta"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2980
 msgid "Delete folder and _addresses"
 msgstr "Borrar carpeta y _direcciones"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2991
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -719,7 +724,7 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene no se perderán."
 
-#: src/addressbook.c:2947
+#: src/addressbook.c:2998
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -728,28 +733,28 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene se perderán."
 
-#: src/addressbook.c:3061
+#: src/addressbook.c:3112
 #, c-format
 msgid "Search '%s'"
 msgstr " Buscar «%s»"
 
-#: src/addressbook.c:3199 src/addressbook.c:3248
+#: src/addressbook.c:3250 src/addressbook.c:3299
 msgid "New Contacts"
 msgstr "Nuevos contactos"
 
-#: src/addressbook.c:4087
+#: src/addressbook.c:4136
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se puede guardar el fichero índice."
 
-#: src/addressbook.c:4091
+#: src/addressbook.c:4140
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pueden guardar los ficheros de direcciones"
 
-#: src/addressbook.c:4101
+#: src/addressbook.c:4150
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:4106
+#: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -757,7 +762,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se puede guardar el nuevo fichero índice."
 
-#: src/addressbook.c:4119
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -765,7 +770,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:4125
+#: src/addressbook.c:4174
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -773,7 +778,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "no se pudo guardar el fichero índice para la nueva."
 
-#: src/addressbook.c:4130
+#: src/addressbook.c:4179
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -781,280 +786,264 @@ msgstr ""
 "No se puede convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para la nueva."
 
-#: src/addressbook.c:4137 src/addressbook.c:4143
+#: src/addressbook.c:4186 src/addressbook.c:4192
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:4257
+#: src/addressbook.c:4307
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:4258
+#: src/addressbook.c:4308
 msgid "Could not read address index"
 msgstr "No se puede leer el índice de direcciones"
 
-#: src/addressbook.c:4589
+#: src/addressbook.c:4639
 msgid "Busy searching..."
 msgstr "Buscando..."
 
-#: src/addressbook.c:4898 src/prefs_send.c:188
+#: src/addressbook.c:4969 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:4910
+#: src/addressbook.c:4981
 msgid "Address Books"
 msgstr "Agendas de direcciones"
 
-#: src/addressbook.c:4922
+#: src/addressbook.c:4993
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:355
-#: src/folderview.c:443 src/prefs_account.c:2799 src/prefs_folder_column.c:78
+#: src/addressbook.c:5029 src/exporthtml.c:885 src/folderview.c:361
+#: src/folderview.c:449 src/prefs_account.c:3172 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:4970
+#: src/addressbook.c:5041
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4982 src/addressbook.c:4994
+#: src/addressbook.c:5053 src/addressbook.c:5065
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5006
+#: src/addressbook.c:5077
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
-#: src/addressbook.c:5018
+#: src/addressbook.c:5089
 msgid "LDAP Query"
 msgstr "Petición LDAP"
 
-#: src/addressbook_foldersel.c:182 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:984 src/importldif.c:657
+#: src/addressbook_foldersel.c:200 src/exphtmldlg.c:371 src/expldifdlg.c:388
+#: src/exporthtml.c:985 src/importldif.c:541
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: 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/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:2520
-#: src/prefs_matcher.c:2524
-msgid "Any"
-msgstr "Cualquiera"
-
-#: src/addrgather.c:173
+#: src/addrgather.c:179
 msgid "Please specify name for address book."
 msgstr "Especifique el nombre de la agenda por favor."
 
-#: src/addrgather.c:180
+#: src/addrgather.c:186
 msgid "No available address book."
 msgstr "No hay agendas disponibles."
 
-#: src/addrgather.c:201
+#: src/addrgather.c:207
 msgid "Please select the mail headers to search."
 msgstr "Seleccione las cabeceras a buscar por favor."
 
-#: src/addrgather.c:208
+#: src/addrgather.c:214
 msgid "Collecting addresses..."
 msgstr "Recopilando direcciones..."
 
-#: src/addrgather.c:248
-msgid "address added by claws-mail"
+#: src/addrgather.c:254
+#, fuzzy
+msgid "address added by Claws Mail"
 msgstr "dirección añadida por claws-mail"
 
-#: src/addrgather.c:276
+#: src/addrgather.c:285
 msgid "Addresses collected successfully."
 msgstr "Direcciones recopiladas con éxito."
 
-#: src/addrgather.c:351
+#: src/addrgather.c:360
 msgid "Current folder:"
 msgstr "Directorio actual:"
 
-#: src/addrgather.c:362
+#: src/addrgather.c:371
 msgid "Address book name:"
 msgstr "Agenda de direcciones :"
 
-#: src/addrgather.c:389
+#: src/addrgather.c:398
 msgid "Address book folder size:"
 msgstr "Tamaño de la carpeta de agenda:"
 
-#: src/addrgather.c:393 src/addrgather.c:403
+#: src/addrgather.c:402 src/addrgather.c:411
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr "Número máximo de entradas por carpeta dentro de la nueva agenda creada"
 
-#: src/addrgather.c:407
+#: src/addrgather.c:415
 msgid "Process these mail header fields"
 msgstr "Procesar las siguientes cabeceras"
 
-#: src/addrgather.c:426
+#: src/addrgather.c:434
 msgid "Include subfolders"
 msgstr "Incluir subcarpetas"
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1426
+#: src/addrgather.c:492 src/prefs_filtering_action.c:1383
 msgid "Header Name"
 msgstr "Nombre cabecera"
 
-#: src/addrgather.c:451
+#: src/addrgather.c:498
 msgid "Address Count"
 msgstr "N.º direcciones"
 
-#: src/addrgather.c:561
+#: src/addrgather.c:585
 msgid "Header Fields"
 msgstr "Campos cabecera"
 
-#: src/addrgather.c:562 src/exphtmldlg.c:658 src/expldifdlg.c:722
-#: src/importldif.c:1022
+#: src/addrgather.c:586 src/exphtmldlg.c:658 src/expldifdlg.c:722
+#: src/importldif.c:981
 msgid "Finish"
 msgstr "Finalizar"
 
-#: src/addrgather.c:620
+#: src/addrgather.c:644
 msgid "Collect email addresses from selected messages"
 msgstr "Recopilar direcciones de correo de los mensajes seleccionados"
 
-#: src/addrgather.c:624
+#: src/addrgather.c:648
 msgid "Collect email addresses from folder"
 msgstr "Recopilar direcciones de correo de la carpeta"
 
-#: src/addrindex.c:124
+#: src/addrindex.c:125
 msgid "Common addresses"
 msgstr "Direcciones comunes"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:126
 msgid "Personal addresses"
 msgstr "Direcciones personales"
 
-#: src/addrindex.c:131
+#: src/addrindex.c:132
 msgid "Common address"
 msgstr "Dirección común"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:133
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/addrindex.c:1829
+#: src/addrindex.c:1834
 msgid "Address(es) update"
 msgstr "Actualizar dirección(es)"
 
-#: src/addrindex.c:1830
+#: src/addrindex.c:1835
 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:9624
+#: src/alertpanel.c:144 src/compose.c:9788
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:159 src/compose.c:5780 src/compose.c:6301
-#: src/compose.c:12047 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4895
+#: src/alertpanel.c:157 src/compose.c:5853 src/compose.c:6395
+#: src/compose.c:12377 src/file_checker.c:84 src/file_checker.c:108
+#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:811
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5111
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5717 src/inc.c:663
-#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5790 src/inc.c:723
+#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
 msgid "Error"
 msgstr "Error"
 
-#: src/alertpanel.c:196 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
 msgid "_View log"
 msgstr "_Ver traza"
 
-#: src/alertpanel.c:347
+#: src/alertpanel.c:346
 msgid "Show this message next time"
 msgstr "Mostrar este mensaje de nuevo"
 
-#: src/browseldap.c:218
+#: src/browseldap.c:223
 msgid "Browse Directory Entry"
 msgstr "Ver entrada del directorio"
 
-#: src/browseldap.c:237
+#: src/browseldap.c:243
 msgid "Server Name:"
 msgstr "Nombre del servidor :"
 
-#: src/browseldap.c:247
+#: src/browseldap.c:253
 msgid "Distinguished Name (dn):"
 msgstr "Nombre distinguido (dn) :"
 
-#: src/browseldap.c:270
+#: src/browseldap.c:284
 msgid "LDAP Name"
 msgstr "Nombre LDAP"
 
-#: src/browseldap.c:272
+#: src/browseldap.c:290
 msgid "Attribute Value"
 msgstr "Valor del atributo"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:70
 msgid "Nothing"
 msgstr "Nada"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:71
 msgid "a viewer"
 msgstr "un visor"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:72
 msgid "a MIME parser"
 msgstr "un parser MIME"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:73
 msgid "folders"
 msgstr "carpetas"
 
-#: src/common/plugin.c:73
+#: src/common/plugin.c:74
 msgid "filtering"
 msgstr "filtrado"
 
-#: src/common/plugin.c:74
+#: src/common/plugin.c:75
 msgid "a privacy interface"
 msgstr "un interfaz de privacidad"
 
-#: src/common/plugin.c:75
+#: src/common/plugin.c:76
 msgid "a notifier"
 msgstr "un notificador"
 
-#: src/common/plugin.c:76
+#: src/common/plugin.c:77
 msgid "an utility"
 msgstr "una utilidad"
 
-#: src/common/plugin.c:77
+#: src/common/plugin.c:78
 msgid "things"
 msgstr "cosas"
 
-#: src/common/plugin.c:334
+#: src/common/plugin.c:335
 #, 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:437
+#: src/common/plugin.c:438
 msgid "Plugin already loaded"
 msgstr "El módulo ya está cargado"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:449
 msgid "Failed to allocate memory for Plugin"
 msgstr "Falló la petición de memoria para el Módulo"
 
-#: src/common/plugin.c:482
+#: src/common/plugin.c:483
 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:491
+#: src/common/plugin.c:492
 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:769
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1063,7 +1052,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:772
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1071,16 +1060,16 @@ 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:781
+#: src/common/plugin.c:782
 #, 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:783
+#: src/common/plugin.c:784
 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."
 
-#: src/common/session.c:183 src/imap.c:1207
+#: src/common/session.c:201 src/imap.c:1233
 msgid "SSL/TLS handshake failed\n"
 msgstr "Negociación SSL/TLS fallida\n"
 
@@ -1100,7 +1089,7 @@ msgstr "respuesta SMTP incorrecta\n"
 msgid "error occurred on SMTP session\n"
 msgstr "hubo un error en la sesión SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:905
+#: src/common/smtp.c:535 src/pop.c:907
 msgid "error occurred on authentication\n"
 msgstr "hubo un error en la autenticación\n"
 
@@ -1109,7 +1098,7 @@ msgstr "hubo un error en la autenticación\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "El mensaje es demasiado grande (Máximo %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:898
+#: src/common/smtp.c:617 src/pop.c:900
 msgid "couldn't start STARTTLS session\n"
 msgstr "no se pudo iniciar la sesión STARTTLS\n"
 
@@ -1121,104 +1110,104 @@ msgstr "Tiempo límite de E/S en el conector.\n"
 msgid "Connection timed out.\n"
 msgstr "La conexión excedió el límite de tiempo.\n"
 
-#: src/common/socket.c:734
+#: src/common/socket.c:740
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: la conexión ha fallado (%s).\n"
 
-#: src/common/socket.c:974
+#: src/common/socket.c:980
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: anfitrión desconocido.\n"
 
-#: src/common/socket.c:1066
+#: src/common/socket.c:1072
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: falló la búsqueda de la máquina (%s).\n"
 
-#: src/common/socket.c:1370
+#: src/common/socket.c:1385
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escribir en fd%d: %s\n"
 
-#: src/common/ssl_certificate.c:326
+#: src/common/ssl_certificate.c:338
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "No se encuentra el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:334
+#: src/common/ssl_certificate.c:346
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "No se puede leer el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:343
+#: src/common/ssl_certificate.c:355
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "No se puede importar el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:628
+#: src/common/ssl_certificate.c:640
 msgid "Internal error"
 msgstr "Error interno"
 
-#: src/common/ssl_certificate.c:633
+#: src/common/ssl_certificate.c:645
 msgid "Uncheckable"
 msgstr "No se puede comprobar"
 
-#: src/common/ssl_certificate.c:637
+#: src/common/ssl_certificate.c:649
 msgid "Self-signed certificate"
 msgstr "Certificado firmado por si mismo"
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:652
 msgid "Revoked certificate"
 msgstr "Certificado revocado"
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:654
 msgid "No certificate issuer found"
 msgstr "No se encontró el emisor del certificado"
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:656
 msgid "Certificate issuer is not a CA"
 msgstr "El emisor del certificado no es una AC"
 
-#: src/common/ssl_certificate.c:869
+#: src/common/ssl_certificate.c:881
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "No se puede abrir el fichero de certificado %s: %s\n"
 
-#: src/common/ssl_certificate.c:873
+#: src/common/ssl_certificate.c:885
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "Falta el fichero de certificado %s (%s)\n"
 
-#: src/common/ssl_certificate.c:892
+#: src/common/ssl_certificate.c:904
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "No se puede abrir el fichero de clave %s (%s)\n"
 
-#: src/common/ssl_certificate.c:896
+#: src/common/ssl_certificate.c:908
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "Falta el fichero de claves %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1044
+#: src/common/ssl_certificate.c:1056
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "No se puede leer el fichero de certificado P12 %s\n"
 
-#: src/common/ssl_certificate.c:1047
+#: src/common/ssl_certificate.c:1059
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "No se puede abrir el fichero de certificado P12 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1051
+#: src/common/ssl_certificate.c:1063
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "Falta el fichero de certificado P12 %s (%s)\n"
 
-#: 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
+#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:87
+#: src/gtk/sslcertwindow.c:94 src/gtk/sslcertwindow.c:109
+#: src/gtk/sslcertwindow.c:114 src/gtk/sslcertwindow.c:121
+#: src/gtk/sslcertwindow.c:136
 msgid "<not in certificate>"
 msgstr "<no en el certificado>"
 
@@ -1226,581 +1215,591 @@ msgstr "<no en el certificado>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Asunto vacío por expr. reg.)"
 
-#: src/common/utils.c:256
+#: src/common/utils.c:200
 #, c-format
 msgid "%dB"
 msgstr "%d B"
 
-#: src/common/utils.c:257
+#: src/common/utils.c:201
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d kB"
 
-#: src/common/utils.c:258
+#: src/common/utils.c:202
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d MB"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:203
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f GB"
 
-#: src/common/utils.c:4759
+#: src/common/utils.c:4028
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/common/utils.c:4760
+#: src/common/utils.c:4029
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/common/utils.c:4761
+#: src/common/utils.c:4030
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/common/utils.c:4762
+#: src/common/utils.c:4031
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/common/utils.c:4763
+#: src/common/utils.c:4032
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/common/utils.c:4764
+#: src/common/utils.c:4033
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/common/utils.c:4765
+#: src/common/utils.c:4034
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/common/utils.c:4767
+#: src/common/utils.c:4036
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Enero"
 
-#: src/common/utils.c:4768
+#: src/common/utils.c:4037
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrero"
 
-#: src/common/utils.c:4769
+#: src/common/utils.c:4038
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marzo"
 
-#: src/common/utils.c:4770
+#: src/common/utils.c:4039
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4771
+#: src/common/utils.c:4040
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mayo"
 
-#: src/common/utils.c:4772
+#: src/common/utils.c:4041
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junio"
 
-#: src/common/utils.c:4773
+#: src/common/utils.c:4042
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julio"
 
-#: src/common/utils.c:4774
+#: src/common/utils.c:4043
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: src/common/utils.c:4775
+#: src/common/utils.c:4044
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septiembre"
 
-#: src/common/utils.c:4776
+#: src/common/utils.c:4045
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4777
+#: src/common/utils.c:4046
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Noviembre"
 
-#: src/common/utils.c:4778
+#: src/common/utils.c:4047
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Diciembre"
 
-#: src/common/utils.c:4780
+#: src/common/utils.c:4049
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4050
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4051
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4052
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mié"
 
-#: src/common/utils.c:4784
+#: src/common/utils.c:4053
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jue"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4054
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Vie"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4055
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/common/utils.c:4788
+#: src/common/utils.c:4057
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Ene"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4058
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4790
+#: src/common/utils.c:4059
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4791
+#: src/common/utils.c:4060
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:4792
+#: src/common/utils.c:4061
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "May"
 
-#: src/common/utils.c:4793
+#: src/common/utils.c:4062
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4794
+#: src/common/utils.c:4063
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4795
+#: src/common/utils.c:4064
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:4796
+#: src/common/utils.c:4065
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4797
+#: src/common/utils.c:4066
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4798
+#: src/common/utils.c:4067
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4799
+#: src/common/utils.c:4068
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dic"
 
-#: src/common/utils.c:4810
+#: src/common/utils.c:4079
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4811
+#: src/common/utils.c:4080
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4812
+#: src/common/utils.c:4081
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4082
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:591
+#: src/compose.c:596
 msgid "_Add..."
 msgstr "_Añadir..."
 
-#: src/compose.c:592 src/mh_gtk.c:377 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:316
+#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: src/compose.c:594 src/folderview.c:254
+#: src/compose.c:599 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: src/compose.c:601 src/mainwindow.c:516 src/messageview.c:211
+#: src/compose.c:606 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "_Spelling"
 msgstr "_Ortografía"
 
-#: src/compose.c:606 src/compose.c:673
+#: src/compose.c:611 src/compose.c:678
 msgid "_Options"
 msgstr "_Opciones"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "S_end"
 msgstr "_Enviar"
 
-#: src/compose.c:611
+#: src/compose.c:616
 msgid "Send _later"
 msgstr "Enviar _después"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "_Attach file"
 msgstr "_Adjuntar fichero"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "_Insert file"
 msgstr "_Insertar fichero"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "Insert si_gnature"
 msgstr "Insertar _firma"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "_Replace signature"
 msgstr "_Reemplazar firma"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "_Print"
 msgstr "I_mprimir"
 
-#: src/compose.c:626 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: src/compose.c:627 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: src/compose.c:630 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "_Special paste"
 msgstr "Pegar e_special"
 
-#: src/compose.c:635
+#: src/compose.c:640
 msgid "As _quotation"
 msgstr "Como _citación"
 
-#: src/compose.c:636
+#: src/compose.c:641
 msgid "_Wrapped"
 msgstr "_Recortado"
 
-#: src/compose.c:637
+#: src/compose.c:642
 msgid "_Unwrapped"
 msgstr "_Sin recortar"
 
-#: src/compose.c:639 src/mainwindow.c:549
+#: src/compose.c:644 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Seleccionar todo"
 
-#: src/compose.c:641
+#: src/compose.c:646
 msgid "A_dvanced"
 msgstr "Avanza_das"
 
-#: src/compose.c:642
+#: src/compose.c:647
 msgid "Move a character backward"
 msgstr "Ir al carácter anterior"
 
-#: src/compose.c:643
+#: src/compose.c:648
 msgid "Move a character forward"
 msgstr "Ir al carácter siguiente"
 
-#: src/compose.c:644
+#: src/compose.c:649
 msgid "Move a word backward"
 msgstr "Ir a la palabra anterior"
 
-#: src/compose.c:645
+#: src/compose.c:650
 msgid "Move a word forward"
 msgstr "Ir a la palabra siguiente"
 
-#: src/compose.c:646
+#: src/compose.c:651
 msgid "Move to beginning of line"
 msgstr "Ir al principio de la línea"
 
-#: src/compose.c:647
+#: src/compose.c:652
 msgid "Move to end of line"
 msgstr "Ir al final de la línea"
 
-#: src/compose.c:648
+#: src/compose.c:653
 msgid "Move to previous line"
 msgstr "Ir a la línea anterior"
 
-#: src/compose.c:649
+#: src/compose.c:654
 msgid "Move to next line"
 msgstr "Ir a la línea siguiente"
 
-#: src/compose.c:650
+#: src/compose.c:655
 msgid "Delete a character backward"
 msgstr "Borrar el carácter anterior"
 
-#: src/compose.c:651
+#: src/compose.c:656
 msgid "Delete a character forward"
 msgstr "Borrar el carácter siguiente"
 
-#: src/compose.c:652
+#: src/compose.c:657
 msgid "Delete a word backward"
 msgstr "Borrar la palabra anterior"
 
-#: src/compose.c:653
+#: src/compose.c:658
 msgid "Delete a word forward"
 msgstr "Borrar la palabra siguiente"
 
-#: src/compose.c:654
+#: src/compose.c:659
 msgid "Delete line"
 msgstr "Borrar línea"
 
-#: src/compose.c:655
+#: src/compose.c:660
 msgid "Delete to end of line"
 msgstr "Borrar hasta el final de la línea"
 
-#: src/compose.c:658 src/messageview.c:228
+#: src/compose.c:663 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Buscar"
 
-#: src/compose.c:661
+#: src/compose.c:666
 msgid "_Wrap current paragraph"
 msgstr "_Recortar el párrafo actual"
 
-#: src/compose.c:662
+#: src/compose.c:667
 msgid "Wrap all long _lines"
 msgstr "Recortar todas las líneas largas"
 
-#: src/compose.c:664
+#: src/compose.c:669
 msgid "Edit with e_xternal editor"
 msgstr "Editar con un editor e_xterno"
 
-#: src/compose.c:667
+#: src/compose.c:672
 msgid "_Check all or check selection"
 msgstr "_Comprobar todo o la selección"
 
-#: src/compose.c:668
+#: src/compose.c:673
 msgid "_Highlight all misspelled words"
 msgstr "_Resaltar todas las faltas ortográficas"
 
-#: src/compose.c:669
+#: src/compose.c:674
 msgid "Check _backwards misspelled word"
 msgstr "Comprobar faltas hacia _atrás"
 
-#: src/compose.c:670
+#: src/compose.c:675
 msgid "_Forward to next misspelled word"
 msgstr "Avanzar hasta la siguiente _falta"
 
-#: src/compose.c:677
+#: src/compose.c:682
 msgid "Reply _mode"
 msgstr "_Modo de respuesta"
 
-#: src/compose.c:679
+#: src/compose.c:684
 msgid "Privacy _System"
 msgstr "_Sistema de privacidad"
 
-#: src/compose.c:683
+#: src/compose.c:688
 msgid "_Priority"
 msgstr "_Prioridad"
 
-#: src/compose.c:685 src/mainwindow.c:611 src/messageview.c:264
+#: src/compose.c:690 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "Codificación de caract_eres"
 
-#: src/compose.c:690 src/mainwindow.c:616 src/messageview.c:269
+#: src/compose.c:695 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: src/compose.c:691 src/mainwindow.c:617 src/messageview.c:270
+#: src/compose.c:696 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:692 src/mainwindow.c:618 src/messageview.c:271
+#: src/compose.c:697 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/compose.c:693 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:698 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:694 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:699 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:695 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:700 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/compose.c:696 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:701 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Chino"
 
-#: src/compose.c:697 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:702 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:698 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:703 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Tailandés"
 
-#: src/compose.c:701 src/mainwindow.c:734 src/messageview.c:313
+#: src/compose.c:706 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Agenda de direcciones"
 
-#: src/compose.c:703
+#: src/compose.c:708
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:705 src/mainwindow.c:762 src/messageview.c:333
+#: src/compose.c:710 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "Accio_nes"
 
-#: src/compose.c:714
+#: src/compose.c:719
 msgid "Aut_o wrapping"
 msgstr "Aut_o-recorte"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "Auto _indent"
 msgstr "Auto-_sangrado"
 
-#: src/compose.c:716
+#: src/compose.c:721
 msgid "Si_gn"
 msgstr "Fir_mar"
 
-#: src/compose.c:717
+#: src/compose.c:722
 msgid "_Encrypt"
 msgstr "_Cifrado"
 
-#: src/compose.c:718
+#: src/compose.c:723
 msgid "_Request Return Receipt"
 msgstr "Solicitar acuse de _recibo"
 
-#: src/compose.c:719
+#: src/compose.c:724
 msgid "Remo_ve references"
 msgstr "Eliminar re_ferencias"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "Show _ruler"
 msgstr "Mostrar _regleta"
 
-#: src/compose.c:725 src/compose.c:735
+#: src/compose.c:730 src/compose.c:740
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:726 src/mainwindow.c:665 src/messageview.c:302
+#: src/compose.c:731 src/mainwindow.c:674 src/messageview.c:305
+#: src/summaryview.c:431
 msgid "_All"
 msgstr "_Todo"
 
-#: src/compose.c:727 src/mainwindow.c:666 src/messageview.c:303
+#: src/compose.c:732 src/mainwindow.c:675 src/messageview.c:306
+#: src/summaryview.c:432
 msgid "_Sender"
 msgstr "_Remitente"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "_Mailing-list"
 msgstr "_Lista-Correo"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "_Highest"
 msgstr "_Muy alta"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "Hi_gh"
 msgstr "_Alta"
 
-#: src/compose.c:736
+#: src/compose.c:741
 msgid "Lo_w"
 msgstr "_Baja"
 
-#: src/compose.c:737
+#: src/compose.c:742
 msgid "_Lowest"
 msgstr "M_uy baja"
 
-#: src/compose.c:742 src/mainwindow.c:880 src/messageview.c:350
+#: src/compose.c:747 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Automático"
 
-#: src/compose.c:743 src/mainwindow.c:881 src/messageview.c:351
+#: src/compose.c:748 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:744 src/mainwindow.c:882 src/messageview.c:352
+#: src/compose.c:749 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:748 src/mainwindow.c:886 src/messageview.c:356
+#: src/compose.c:753 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:751 src/mainwindow.c:889 src/messageview.c:359
+#: src/compose.c:756 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griego (ISO-8859-_7)"
 
-#: src/compose.c:756 src/mainwindow.c:894 src/messageview.c:364
+#: src/compose.c:761 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
-#: src/compose.c:1085
+#: src/compose.c:1015 src/compose.c:1697
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+
+#: src/compose.c:1051
 msgid "New message From format error."
 msgstr "Error de formato en el «Desde» del mensaje nuevo."
 
-#: src/compose.c:1177
+#: src/compose.c:1144
 msgid "New message subject format error."
 msgstr "Error de formato en el asunto del mensaje nuevo."
 
-#: src/compose.c:1208 src/quote_fmt.c:570
+#: src/compose.c:1176 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Componer» en la línea %d."
 
-#: src/compose.c:1469
+#: src/compose.c:1445
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "No se puede responder. El correo original probablemente no existe."
 
-#: src/compose.c:1652 src/quote_fmt.c:587
+#: src/compose.c:1630 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1808,12 +1807,12 @@ msgstr ""
 "El campo «Desde» de la plantilla «Responder» contiene una dirección de "
 "correo inválida."
 
-#: src/compose.c:1700 src/quote_fmt.c:590
+#: src/compose.c:1679 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Responder» en la línea %d."
 
-#: src/compose.c:1834 src/compose.c:2025 src/quote_fmt.c:607
+#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1821,55 +1820,55 @@ msgstr ""
 "El campo «Desde» de la plantilla «Reenviar» contiene una dirección de correo "
 "inválida."
 
-#: src/compose.c:1894 src/quote_fmt.c:610
+#: src/compose.c:1883 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Reenviar» en la línea %d."
 
-#: src/compose.c:2067
+#: src/compose.c:2059
 msgid "Fw: multiple emails"
 msgstr "Rv: múltiples correos"
 
-#: src/compose.c:2569
+#: src/compose.c:2566
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Redirigir» en la línea %d."
 
-#: src/compose.c:2636 src/gtk/headers.h:14
+#: src/compose.c:2633 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2639 src/gtk/headers.h:15
+#: src/compose.c:2636 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2642 src/gtk/headers.h:12
+#: src/compose.c:2639 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
-#: src/compose.c:2645 src/compose.c:4963 src/compose.c:4965
+#: src/compose.c:2642 src/compose.c:5011 src/compose.c:5013
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grupos:"
 
-#: src/compose.c:2648 src/gtk/headers.h:34
+#: src/compose.c:2645 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Seguimiento-A:"
 
-#: src/compose.c:2651 src/gtk/headers.h:17
+#: src/compose.c:2648 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En-Respuesta-A:"
 
-#: src/compose.c:2655 src/compose.c:4960 src/compose.c:4968
-#: src/gtk/headers.h:13 src/summary_search.c:481
+#: src/compose.c:2652 src/compose.c:5008 src/compose.c:5016
+#: src/gtk/headers.h:13 src/summary_search.c:421
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2841
+#: src/compose.c:2842
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "No se pudo adjuntar un fichero (falló la conversión de caracteres)."
 
-#: src/compose.c:2847
+#: src/compose.c:2848 src/compose.c:10974
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1884,16 +1883,16 @@ msgstr[1] ""
 "Se han adjuntado los siguientes ficheros: \n"
 "%s"
 
-#: src/compose.c:3124
+#: src/compose.c:3128
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "La «marca de cita» de la plantilla no es válida."
 
-#: src/compose.c:3630
+#: src/compose.c:3657
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "No se puede obtener el tamaño del fichero «%s»."
 
-#: src/compose.c:3641
+#: src/compose.c:3675
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1902,57 +1901,57 @@ msgstr ""
 "Está a punto de insertar un fichero de %s en el cuerpo del mensaje. ¿Está "
 "seguro de que desea hacerlo?"
 
-#: src/compose.c:3644
+#: src/compose.c:3678
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: src/compose.c:3645 src/compose.c:10650 src/compose.c:11526
+#: src/compose.c:3679 src/compose.c:10837 src/compose.c:11857
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: src/compose.c:3769
+#: src/compose.c:3804
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:3770
+#: src/compose.c:3805
 msgid "Empty file"
 msgstr "Fichero vacío"
 
-#: src/compose.c:3771
+#: src/compose.c:3806
 msgid "_Attach anyway"
 msgstr "_Adjuntar igualmente"
 
-#: src/compose.c:3780
+#: src/compose.c:3815
 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 
-#: src/compose.c:3807
+#: src/compose.c:3842
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:4800 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4852 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:4807 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4859 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:4810 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4862 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sin asunto] - Componer mensaje%s"
 
-#: src/compose.c:4812 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4864 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Componer un mensaje nuevo"
 
-#: src/compose.c:4839 src/messageview.c:903
+#: src/compose.c:4891 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1960,105 +1959,114 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:5060 src/compose.c:5097
+#: src/compose.c:5108 src/compose.c:5145
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección predeterminada «%s». ¿Enviar de todas "
 "formas?"
 
-#: src/compose.c:5062 src/compose.c:5099 src/compose.c:5142 src/compose.c:5190
-#: src/prefs_account.c:3323 src/toolbar.c:484 src/toolbar.c:516
+#: src/compose.c:5110 src/compose.c:5147 src/compose.c:5185 src/compose.c:5228
+#: src/prefs_account.c:3781 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:5064 src/compose.c:5101 src/compose.c:5135 src/compose.c:5183
-#: src/compose.c:5718 src/folderview.c:2543 src/messageview.c:856
-#: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
-#: src/toolbar.c:2933
+#: src/compose.c:5112 src/compose.c:5149 src/compose.c:5186 src/compose.c:5229
+#: src/compose.c:5791 src/folderview.c:2546 src/messageview.c:859
+#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:5118
+#: src/compose.c:5166
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:5137 src/compose.c:5185
-#: src/plugins/attachwarner/attachwarner.c:212
-msgid "_Queue"
-msgstr "_A la cola"
-
-#: src/compose.c:5138
+#: src/compose.c:5181
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "El asunto esta vacío. %s"
 
-#: src/compose.c:5139 src/compose.c:5187
-#: src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5182 src/compose.c:5225
+#: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "¿Enviarlo igualmente?"
 
-#: src/compose.c:5140 src/compose.c:5188
-#: src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5183 src/compose.c:5226
+#: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "¿Ponerlo en la cola igualmente?"
 
-#: src/compose.c:5142 src/compose.c:5190 src/toolbar.c:517
+#: src/compose.c:5185 src/compose.c:5228 src/toolbar.c:520
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:5186
+#: src/compose.c:5186 src/compose.c:5229
+msgid "_Queue"
+msgstr "_A la cola"
+
+#: src/compose.c:5224
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Enviando a %d destinatarios. %s"
 
-#: src/compose.c:5243 src/compose.c:10122
+#: src/compose.c:5253
+msgid "Could not queue message."
+msgstr "El mensaje no se pudo poner en la cola."
+
+#: src/compose.c:5256
+#, c-format
 msgid ""
-"Could not queue message for sending:\n"
+"Could not queue message:\n"
 "\n"
-"Charset conversion failed."
+"%s."
 msgstr ""
-"No se puede poner en la cola el mensaje para enviar:\n"
+"No se puede poner en la cola el mensaje:\n"
 "\n"
-"Falló la conversión del conjunto caracteres."
+"%s."
 
-#: src/compose.c:5246 src/compose.c:10125
+#: src/compose.c:5260
+#, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Couldn't get recipient encryption key."
+"Signature failed: %s"
 msgstr ""
 "No se puede poner en la cola el mensaje para enviar:\n"
 "\n"
-"No se pudo obtener la clave de cifrado del destinatario."
+"Falló la firma: %s"
 
-#: src/compose.c:5252 src/compose.c:10119
-#, c-format
+#: src/compose.c:5265
+#, fuzzy, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Signature failed: %s"
+"Encryption failed: %s"
 msgstr ""
 "No se puede poner en la cola el mensaje para enviar:\n"
 "\n"
 "Falló la firma: %s"
 
-#: src/compose.c:5255
-#, c-format
+#: src/compose.c:5270
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"%s."
+"Charset conversion failed."
 msgstr ""
-"No se pudo poner en la cola el mensaje para enviar:\n"
+"No se puede poner en la cola el mensaje para enviar:\n"
 "\n"
-"%s."
+"Falló la conversión del conjunto caracteres."
 
-#: src/compose.c:5257
-msgid "Could not queue message for sending."
-msgstr "No se pudo poner en la cola el mensaje para enviar."
+#: src/compose.c:5274
+msgid ""
+"Could not queue message for sending:\n"
+"\n"
+"Couldn't get recipient encryption key."
+msgstr ""
+"No se puede poner en la cola el mensaje para enviar:\n"
+"\n"
+"No se pudo obtener la clave de cifrado del destinatario."
 
-#: src/compose.c:5272 src/compose.c:5332
+#: src/compose.c:5334 src/compose.c:5394
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2066,7 +2074,7 @@ msgstr ""
 "El mensaje está en la cola pero no se pudo enviar.\n"
 "Utilice «Enviar mensaje(s) en cola» en la ventana principal para enviarlo"
 
-#: src/compose.c:5328
+#: src/compose.c:5390
 #, c-format
 msgid ""
 "%s\n"
@@ -2075,7 +2083,7 @@ msgstr ""
 "%s\n"
 "Utilice «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
 
-#: src/compose.c:5714
+#: src/compose.c:5787
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2086,7 +2094,7 @@ msgstr ""
 "al conjunto de caracteres %s especificado.\n"
 "¿Enviarlo como %s?"
 
-#: src/compose.c:5776
+#: src/compose.c:5849
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2099,103 +2107,98 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:5887
-#, c-format
-msgid "Couldn't encrypt the email: %s"
-msgstr "No se pudo cifrar el correo: %s"
-
-#: src/compose.c:6008
+#: src/compose.c:6081
 msgid "Encryption warning"
 msgstr "Aviso de cifrado"
 
-#: src/compose.c:6009
+#: src/compose.c:6082
 msgid "C_ontinue"
 msgstr "C_ontinuar"
 
-#: src/compose.c:6058
+#: src/compose.c:6131
 msgid "No account for sending mails available!"
 msgstr "¡No hay ninguna cuenta disponible para enviar correos!"
 
-#: src/compose.c:6067
+#: src/compose.c:6140
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "La cuenta seleccionada no es NNTP: es imposible enviar el post."
 
-#: src/compose.c:6300
+#: src/compose.c:6394
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "El adjunto %s ya no existe. ¿Ignorar?"
 
-#: src/compose.c:6301 src/mainwindow.c:656 src/toolbar.c:274 src/toolbar.c:2466
+#: src/compose.c:6396 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Cancelar envío"
 
-#: src/compose.c:6301
+#: src/compose.c:6396
 msgid "Ignore attachment"
 msgstr "Ignorar adjunto"
 
-#: src/compose.c:6341
+#: src/compose.c:6452
 #, c-format
 msgid "Original %s part"
 msgstr "Parte original %s"
 
-#: src/compose.c:6941
+#: src/compose.c:7052
 msgid "Add to address _book"
 msgstr "Añadir a la agen_da"
 
-#: src/compose.c:7102
+#: src/compose.c:7219
 msgid "Delete entry contents"
 msgstr "Borrar contenidos de la cuenta"
 
-#: src/compose.c:7106 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7223 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar «tab» para autocompletar con la agenda"
 
-#: src/compose.c:7321
+#: src/compose.c:7455
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7327 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:85 src/summaryview.c:446
+#: src/compose.c:7461 src/mimeview.c:302 src/plugins/pgpcore/select-keys.c:451
+#: src/prefs_matcher.c:640 src/prefs_summaries.c:612
+#: src/prefs_summary_column.c:84 src/summaryview.c:470
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:7390
+#: src/compose.c:7523
 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 
-#: src/compose.c:7427 src/editjpilot.c:276 src/editldap.c:519
-#: 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:1075
-#: src/plugins/bogofilter/bogofilter_gtk.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:252
+#: src/compose.c:7554 src/editjpilot.c:276 src/editldap.c:517
+#: src/editvcard.c:192 src/export.c:165 src/import.c:163 src/importmutt.c:238
+#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/bogofilter/bogofilter_gtk.c:213
+#: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
-#: src/plugins/clamd/clamav_plugin_gtk.c:300
-#: src/plugins/spamassassin/spamassassin_gtk.c:418
+#: src/plugins/clamd/clamav_plugin_gtk.c:295
+#: src/plugins/spamassassin/spamassassin_gtk.c:434
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: src/compose.c:7449
+#: src/compose.c:7570
 msgid "Select folder to save message to"
 msgstr "Seleccionar la carpeta en la que guardar el mensaje"
 
-#: src/compose.c:7906
+#: src/compose.c:8027
 msgid "Hea_der"
 msgstr "_Cabecera"
 
-#: src/compose.c:7911
+#: src/compose.c:8032
 msgid "_Attachments"
 msgstr "_Adjuntos"
 
-#: src/compose.c:7925
+#: src/compose.c:8046
 msgid "Othe_rs"
 msgstr "Ot_ros"
 
-#: src/compose.c:7940
+#: src/compose.c:8061
 msgid "S_ubject:"
 msgstr "As_unto:"
 
-#: src/compose.c:8164
+#: src/compose.c:8285
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2204,19 +2207,19 @@ msgstr ""
 "No se puede iniciar el corrector ortográfico.\n"
 "%s"
 
-#: src/compose.c:8311
+#: src/compose.c:8432
 msgid "_From:"
 msgstr "_Desde:"
 
-#: src/compose.c:8328
+#: src/compose.c:8449
 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 
-#: src/compose.c:8330
+#: src/compose.c:8451
 msgid "Sender address to be used"
 msgstr "Dirección del remitente a usar"
 
-#: src/compose.c:8496
+#: src/compose.c:8633
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2225,50 +2228,50 @@ msgstr ""
 "No se ha podido cargar el sistema de privacidad «%s». No será posible firmar "
 "o cifrar este mensaje."
 
-#: src/compose.c:8597 src/plugins/archive/archiver_gtk.c:1174
+#: src/compose.c:8744 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/compose.c:8698 src/prefs_template.c:750
+#: src/compose.c:8845 src/prefs_template.c:751
 #, 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:8793
+#: src/compose.c:8942
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Error de formato en la cabecera «%s» de la plantilla."
 
-#: src/compose.c:9194
+#: src/compose.c:9366
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:9209
+#: src/compose.c:9381
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:9283
+#: src/compose.c:9455
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:9300
+#: src/compose.c:9472
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:9341
+#: src/compose.c:9505
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:9361
+#: src/compose.c:9525
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:9362
+#: src/compose.c:9526
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:9621
+#: src/compose.c:9785
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2279,34 +2282,19 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:10088 src/messageview.c:1105
+#: src/compose.c:10258 src/messageview.c:1088
 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:10114
-msgid "Could not queue message."
-msgstr "El mensaje no se pudo poner en la cola."
-
-#: src/compose.c:10116
-#, c-format
-msgid ""
-"Could not queue message:\n"
-"\n"
-"%s."
-msgstr ""
-"No se puede poner en la cola el mensaje:\n"
-"\n"
-"%s."
-
-#: src/compose.c:10294
+#: src/compose.c:10451
 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 
-#: src/compose.c:10298
+#: src/compose.c:10455
 msgid "Could not save draft"
 msgstr "No se puede guardar el borrador"
 
-#: src/compose.c:10299
+#: src/compose.c:10456
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2314,24 +2302,24 @@ msgstr ""
 "No se ha podido guardar el borrador.\n"
 "¿Desea cancelar la salida o descartar este correo?"
 
-#: src/compose.c:10301
+#: src/compose.c:10458
 msgid "_Cancel exit"
 msgstr "_Cancelar salida"
 
-#: src/compose.c:10301
+#: src/compose.c:10458
 msgid "_Discard email"
 msgstr "_Descartar correo"
 
-#: src/compose.c:10461 src/compose.c:10475
+#: src/compose.c:10647 src/compose.c:10661
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:10489
+#: src/compose.c:10675
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero «%s»."
 
-#: src/compose.c:10491
+#: src/compose.c:10677
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2340,50 +2328,59 @@ msgstr ""
 "El fichero «%s» contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 
-#: src/compose.c:10570
+#: src/compose.c:10756
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:10571
+#: src/compose.c:10757
 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
-#: src/compose.c:10572 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10572 src/compose.c:10576
+#: src/compose.c:10758 src/compose.c:10763
 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 
-#: src/compose.c:10574 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10761 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: src/compose.c:10575
+#: src/compose.c:10762
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Este mensaje se ha modificado. ¿Guardar los últimos cambios?"
 
-#: src/compose.c:10576
+#: src/compose.c:10763
 msgid "_Don't save"
 msgstr "_No guardar"
 
-#: src/compose.c:10647
+#: src/compose.c:10834
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:10649
+#: src/compose.c:10836
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:10650 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:774 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1063
+#: src/compose.c:10837 src/prefs_actions.c:330 src/prefs_filtering_action.c:582
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:794 src/prefs_template.c:310
+#: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:11519
+#: src/compose.c:11024
+#, fuzzy, c-format
+msgid ""
+"The pasted image has been attached as: \n"
+"%s"
+msgstr ""
+"Se ha adjuntado el siguiente fichero: \n"
+"%s"
+
+#: src/compose.c:11850
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2398,20 +2395,20 @@ msgstr[1] ""
 "¿Quiere insertar el contenido de estos %d ficheros en el cuerpo del correo o "
 "prefiere adjuntarlos al mismo?"
 
-#: src/compose.c:11525
+#: src/compose.c:11856
 msgid "Insert or attach?"
 msgstr "¿Insertar o adjuntar?"
 
-#: src/compose.c:11526
+#: src/compose.c:11857
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: src/compose.c:11744
+#: src/compose.c:12075
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de formato de cita en la línea %d."
 
-#: src/compose.c:12041
+#: src/compose.c:12371
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2442,7 +2439,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Traza de depuración"
 
-#: src/crash.c:251 src/toolbar.c:534
+#: src/crash.c:251 src/toolbar.c:539
 msgid "Close"
 msgstr "Cerrar"
 
@@ -2458,11 +2455,11 @@ msgstr "Crear informe de error"
 msgid "Save crash information"
 msgstr "Guardar información de terminación incorrecta"
 
-#: src/editaddress.c:155 src/editaddress.c:231
+#: src/editaddress.c:150 src/editaddress.c:288
 msgid "Add New Person"
 msgstr "Añadir persona nueva"
 
-#: src/editaddress.c:157
+#: src/editaddress.c:152
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2488,7 +2485,7 @@ msgstr ""
 "Pulse «Aceptar» para seguir editando este contacto.\n"
 "Pulse «Cancelar» para cerrar sin guardar."
 
-#: src/editaddress.c:168
+#: src/editaddress.c:163
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2510,35 +2507,35 @@ msgstr ""
 "Pulse «Aceptar» para seguir editando este contacto.\n"
 "Pulse «Cancelar» para cerrar sin guardar."
 
-#: src/editaddress.c:232
+#: src/editaddress.c:289
 msgid "Edit Person Details"
 msgstr "Editar detalles personales"
 
-#: src/editaddress.c:410
+#: src/editaddress.c:507
 msgid "An Email address must be supplied."
 msgstr "Debe especificarse una dirección de correo."
 
-#: src/editaddress.c:586 src/editaddress_other_attributes_ldap.c:198
+#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
 msgid "A Name and Value must be supplied."
 msgstr "Debe especificarse un Nombre y un Valor"
 
-#: src/editaddress.c:675 src/prefs_folder_item.c:1694
+#: src/editaddress.c:820 src/prefs_folder_item.c:1784
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/editaddress.c:676
+#: src/editaddress.c:821
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/editaddress.c:706 src/editaddress.c:755
+#: src/editaddress.c:851 src/editaddress.c:900
 msgid "Edit Person Data"
 msgstr "Editar datos personales"
 
-#: src/editaddress.c:784
+#: src/editaddress.c:929
 msgid "Choose a picture"
 msgstr "Elegir una imagen"
 
-#: src/editaddress.c:803
+#: src/editaddress.c:948
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2547,58 +2544,58 @@ msgstr ""
 "Falló al importar la imagen: \n"
 "%s"
 
-#: src/editaddress.c:845
+#: src/editaddress.c:990
 msgid "_Set picture"
 msgstr "A_sociar imagen"
 
-#: src/editaddress.c:846
+#: src/editaddress.c:991
 msgid "_Unset picture"
 msgstr "Q_uitar imagen asociada"
 
-#: src/editaddress.c:904
+#: src/editaddress.c:1049
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:951 src/editaddress.c:953 src/expldifdlg.c:516
-#: src/exporthtml.c:761 src/ldif.c:746
+#: src/editaddress.c:1096 src/editaddress.c:1098 src/expldifdlg.c:516
+#: src/exporthtml.c:762 src/ldif.c:747
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#: src/editaddress.c:962 src/editaddress.c:966 src/ldif.c:754
+#: src/editaddress.c:1107 src/editaddress.c:1111 src/ldif.c:755
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/editaddress.c:963 src/editaddress.c:965 src/ldif.c:750
+#: src/editaddress.c:1108 src/editaddress.c:1110 src/ldif.c:751
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/editaddress.c:969 src/editaddress.c:971
+#: src/editaddress.c:1114 src/editaddress.c:1116
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/editaddress.c:1055 src/editaddress.c:1123
+#: src/editaddress.c:1252 src/editaddress.c:1293
 msgid "Alias"
 msgstr "Alias"
 
-#: 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
+#: src/editaddress.c:1478 src/editaddress.c:1511 src/editaddress.c:1527
+#: src/editaddress_other_attributes_ldap.c:376
+#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:222
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1425
+#: src/editaddress.c:1593
 msgid "_User Data"
 msgstr "Datos de _usuario"
 
-#: src/editaddress.c:1426
+#: src/editaddress.c:1594
 msgid "_Email Addresses"
 msgstr "_Direcciones de correo"
 
-#: src/editaddress.c:1429 src/editaddress.c:1432
+#: src/editaddress.c:1597 src/editaddress.c:1600
 msgid "O_ther Attributes"
 msgstr "O_tros atributos"
 
-#: src/editaddress.c:1583
+#: src/editaddress.c:1768
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2628,8 +2625,8 @@ 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:1976
-#: src/wizard.c:1196 src/wizard.c:1616
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2181
+#: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Fichero"
 
@@ -2641,19 +2638,19 @@ msgstr "Añadir nueva agenda"
 msgid "A Group Name must be supplied."
 msgstr "Debe proporcionar un nombre de grupo"
 
-#: src/editgroup.c:294
+#: src/editgroup.c:296
 msgid "Edit Group Data"
 msgstr "Editar datos del grupo"
 
-#: src/editgroup.c:323 src/exporthtml.c:597
+#: src/editgroup.c:325 src/exporthtml.c:598
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: src/editgroup.c:342
+#: src/editgroup.c:344
 msgid "Addresses in Group"
 msgstr "Direcciones en el grupo"
 
-#: src/editgroup.c:377
+#: src/editgroup.c:378
 msgid "Available Addresses"
 msgstr "Direcciones disponibles"
 
@@ -2669,21 +2666,21 @@ msgstr "Editar detalles del grupo"
 msgid "Add New Group"
 msgstr "Añadir nuevo grupo"
 
-#: src/editgroup.c:553
+#: src/editgroup.c:552
 msgid "Edit folder"
 msgstr "Editar carpeta"
 
-#: src/editgroup.c:553
+#: src/editgroup.c:552
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:556 src/foldersel.c:594 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
+#: src/editgroup.c:555 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:557 src/foldersel.c:595 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: src/editgroup.c:556 src/foldersel.c:571 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2707,33 +2704,35 @@ msgstr "Elemento(s) adicional(es) de la dirección"
 msgid "Add New JPilot Entry"
 msgstr "Añadir nueva entrada JPilot"
 
-#: src/editldap_basedn.c:137
+#: src/editldap_basedn.c:153
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Seleccionar base de búsqueda"
 
-#: src/editldap_basedn.c:156 src/editldap.c:441
+#: src/editldap_basedn.c:172 src/editldap.c:440 src/prefs_account.c:2933
+#: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "Nombre de máquina"
 
-#: src/editldap_basedn.c:166 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:390 src/ssl_manager.c:108
+#: src/editldap_basedn.c:182 src/editldap.c:457
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2940
+#: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Puerto"
 
-#: src/editldap_basedn.c:176 src/editldap.c:503
+#: src/editldap_basedn.c:192 src/editldap.c:501
 msgid "Search Base"
 msgstr "Base de búsqueda"
 
-#: src/editldap_basedn.c:197
+#: src/editldap_basedn.c:220
 msgid "Available Search Base(s)"
 msgstr "Base(s) de búsqueda disponible(s)"
 
-#: src/editldap_basedn.c:287
+#: src/editldap_basedn.c:326
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "No pude leer la base de búsqueda del servidor - configúrela manualmente"
 
-#: src/editldap_basedn.c:291 src/editldap.c:281
+#: src/editldap_basedn.c:330 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "No se puede conectar al servidor"
 
@@ -2753,15 +2752,15 @@ msgstr "Debe proporcionar al menos un atributo de búsqueda LDAP."
 msgid "Connected successfully to server"
 msgstr "Conectado con éxito al servidor"
 
-#: src/editldap.c:336 src/editldap.c:971
+#: src/editldap.c:335 src/editldap.c:990
 msgid "Edit LDAP Server"
 msgstr "Editar servidor LDAP"
 
-#: src/editldap.c:437
+#: src/editldap.c:436
 msgid "A name that you wish to call the server."
 msgstr "Un nombre con el que denominar al servidor."
 
-#: src/editldap.c:450
+#: src/editldap.c:449
 msgid ""
 "This is the hostname of the server. For example, \"ldap.example.org\" may be "
 "appropriate for the \"example.org\" organization. An IP address may also be "
@@ -2773,15 +2772,15 @@ msgstr ""
 "dirección IP. Puede especificar «localhost» si el servidor LDAP esta "
 "ejecutándose en la misma máquina que Claws Mail."
 
-#: src/editldap.c:470
+#: src/editldap.c:468
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3396
+#: src/editldap.c:469 src/prefs_account.c:3854
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: src/editldap.c:475
+#: src/editldap.c:473
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
@@ -2792,7 +2791,7 @@ msgstr ""
 "falla compruebe que la configuración en ldap.conf es correcta (especialmente "
 "los campos TLS_CACERTDIR y TLS_REQCERT)."
 
-#: src/editldap.c:480
+#: src/editldap.c:478
 msgid ""
 "Enable secure connection to the LDAP server via SSL/TLS. If connection "
 "fails, be sure to check the correct configuration in ldap.conf "
@@ -2802,19 +2801,19 @@ msgstr ""
 "falla compruebe que la configuración en ldap.conf es correcta (especialmente "
 "los campos TLS_CACERTDIR y TLS_REQCERT)."
 
-#: src/editldap.c:492
+#: src/editldap.c:490
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "El número de puerto en el que escucha el servidor. Por omisión el 389."
 
-#: src/editldap.c:495
+#: src/editldap.c:493
 msgid " Check Server "
 msgstr " Comprobar servidor "
 
-#: src/editldap.c:499
+#: src/editldap.c:497
 msgid "Press this button to test the connection to the server."
 msgstr "Pulse este botón para probar la conexión con el servidor."
 
-#: src/editldap.c:512
+#: src/editldap.c:510
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2828,7 +2827,7 @@ msgstr ""
 "  ou=gente,dc=nombredominio,dc=com\n"
 "  o=Nombre Organizacion,c=Pais\n"
 
-#: src/editldap.c:523
+#: src/editldap.c:521
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
@@ -2836,11 +2835,11 @@ msgstr ""
 "Pulse este botón para buscar el nombre de los nombres de directorio "
 "disponibles en el servidor."
 
-#: src/editldap.c:579
+#: src/editldap.c:577
 msgid "Search Attributes"
 msgstr "Atributos de búsqueda"
 
-#: src/editldap.c:588
+#: src/editldap.c:586
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
@@ -2848,11 +2847,11 @@ msgstr ""
 "Una lista de nombres de atributos LDAP que deberán buscarse cuando se vaya a "
 "encontrar un nombre o dirección."
 
-#: src/editldap.c:591
+#: src/editldap.c:589
 msgid " Defaults "
 msgstr " Por omisión "
 
-#: src/editldap.c:595
+#: src/editldap.c:593
 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 +2859,11 @@ msgstr ""
 "Reinicia los nombres de atributo al valor predeterminado que debería "
 "encontrar la mayoría de nombres y direcciones durante un proceso de búsqueda."
 
-#: src/editldap.c:601
+#: src/editldap.c:599
 msgid "Max Query Age (secs)"
 msgstr "Espera máx. por petición (seg.)"
 
-#: src/editldap.c:616
+#: src/editldap.c:613
 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 "
@@ -2888,11 +2887,11 @@ msgstr ""
 "búsqueda en las búsquedas siguientes. Esto es útil para los servidores "
 "lentos a costa de un mayor uso de memoria para almacenar los resultados."
 
-#: src/editldap.c:633
+#: src/editldap.c:630
 msgid "Include server in dynamic search"
 msgstr "Incluir el servidor en la búsqueda dinámica"
 
-#: src/editldap.c:638
+#: src/editldap.c:635
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
@@ -2900,11 +2899,11 @@ msgstr ""
 "Marque esta opción para incluir este servidor en las búsquedas dinámicas al "
 "usar autocompletar direcciones."
 
-#: src/editldap.c:644
+#: src/editldap.c:641
 msgid "Match names 'containing' search term"
 msgstr "Coincide con nombres «conteniendo» el término buscado"
 
-#: src/editldap.c:649
+#: src/editldap.c:646
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2919,11 +2918,11 @@ msgstr ""
 "las búsquedas de autocompletar contra otros interfaces de direcciones usan "
 "«comienza-con»."
 
-#: src/editldap.c:702
+#: src/editldap.c:709
 msgid "Bind DN"
 msgstr "DN de enlace"
 
-#: src/editldap.c:711
+#: src/editldap.c:718
 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 "
@@ -2935,84 +2934,91 @@ msgstr ""
 "formatea como «cn=usuario,dc=claws-mail,dc=com». Normalmente se deja vacío "
 "al realizar una búsqueda."
 
-#: src/editldap.c:718
+#: src/editldap.c:725
 msgid "Bind Password"
 msgstr "Contraseña de enlace"
 
-#: src/editldap.c:728
+#: src/editldap.c:735
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "La contraseña a usar al conectar como el usuario \"DN de enlace\"."
 
-#: src/editldap.c:733
+#: src/editldap.c:738 src/prefs_account.c:1405 src/prefs_account.c:2026
+#: src/prefs_account.c:2745 src/prefs_account.c:2773 src/prefs_account.c:2978
+#: src/prefs_proxy.c:146
+#, fuzzy
+msgid "Show password"
+msgstr "Contraseña SMTP:"
+
+#: src/editldap.c:747
 msgid "Timeout (secs)"
 msgstr "Tiempo límite (seg.)"
 
-#: src/editldap.c:747
+#: src/editldap.c:760
 msgid "The timeout period in seconds."
 msgstr "El tiempo máximo en segundos."
 
-#: src/editldap.c:751
+#: src/editldap.c:764
 msgid "Maximum Entries"
 msgstr "N.º entradas máximas"
 
-#: src/editldap.c:765
+#: src/editldap.c:777
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 "El número máximo de entradas que deberían retornarse en los resultados de la "
 "búsqueda."
 
-#: src/editldap.c:780 src/prefs_account.c:3287
+#: src/editldap.c:792 src/prefs_account.c:3745
 msgid "Basic"
 msgstr "Básicas"
 
-#: src/editldap.c:782 src/gtk/quicksearch.c:708
+#: src/editldap.c:794 src/gtk/quicksearch.c:706
 msgid "Extended"
 msgstr "Extendido"
 
-#: src/editldap.c:976
+#: src/editldap.c:995
 msgid "Add New LDAP Server"
 msgstr "Añadir nuevo servidor LDAP"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1447
-#: src/prefs_summaries.c:449
+#: src/edittags.c:192 src/prefs_filtering_action.c:1402
+#: src/prefs_summaries.c:619
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: src/edittags.c:216
+#: src/edittags.c:221
 msgid "Delete tag"
 msgstr "Borrar etiqueta"
 
-#: src/edittags.c:217
+#: src/edittags.c:222
 msgid "Do you really want to delete this tag?"
 msgstr "¿Quiere borrar realmente esta etiqueta?"
 
-#: src/edittags.c:244
+#: src/edittags.c:257
 msgid "Delete all tags"
 msgstr "Borrar todas las etiquetas"
 
-#: src/edittags.c:245
+#: src/edittags.c:258
 msgid "Do you really want to delete all tags?"
 msgstr "¿Quiere borrar realmente todas las etiquetas?"
 
-#: src/edittags.c:416
+#: src/edittags.c:430
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "El nombre de etiqueta introducido está reservado, elija uno distinto."
 
-#: src/edittags.c:458
+#: src/edittags.c:472
 msgid "Tag is not set."
 msgstr "Etiqueta no establecida."
 
-#: src/edittags.c:523
+#: src/edittags.c:550
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Aplicar etiquetas"
 
-#: src/edittags.c:537
+#: src/edittags.c:566
 msgid "New tag:"
 msgstr "Nueva etiqueta:"
 
-#: src/edittags.c:570
+#: src/edittags.c:599
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr ""
 "Seleccione las etiquetas a aplicar/eliminar. Los cambios son inmediatos."
@@ -3037,6 +3043,16 @@ msgstr "Añadir nueva entrada vCard"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Imposible establecer el certificado de cliente.\n"
 
+#: src/etpan/nntp-thread.c:949
+#, fuzzy
+msgid "couldn't get xover range\n"
+msgstr "no se pudo obtener xover\n"
+
+#: src/etpan/nntp-thread.c:1048
+#, fuzzy
+msgid "couldn't get xhdr range\n"
+msgstr "no se pudo obtener xhdr\n"
+
 #: src/exphtmldlg.c:105
 msgid "Please specify output directory and file to create."
 msgstr "Especifique el directorio de salida y el fichero a crear."
@@ -3087,30 +3103,31 @@ msgstr "Seleccionar el fichero HTML de salida"
 msgid "HTML Output File"
 msgstr "Fichero HTML de salida"
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
-#: src/importldif.c:684
+#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:172 src/import.c:170
+#: src/importldif.c:568
 msgid "B_rowse"
 msgstr "Explo_rar"
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:300
+#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:301
 msgid "Stylesheet"
 msgstr "Hoja de estilos"
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1190
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
+#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:123 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:941
-#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6019
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1040
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6289
 msgid "None"
 msgstr "Ninguno"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:520 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
+#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
+#: src/prefs_other.c:128 src/prefs_other.c:416
 msgid "Default"
 msgstr "Por omisión"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:243
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
+#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
 msgid "Full"
 msgstr "Completo"
 
@@ -3154,11 +3171,11 @@ msgstr "Formatear enlaces de correo electrónico"
 msgid "Format User Attributes"
 msgstr "Formatear atributos del usuario"
 
-#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
+#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:850
 msgid "Address Book:"
 msgstr "Agenda de direcciones :"
 
-#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
+#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:860
 msgid "File Name:"
 msgstr "Nombre de fichero :"
 
@@ -3170,7 +3187,7 @@ msgstr "Abrir con el navegador web"
 msgid "Export Address Book to HTML File"
 msgstr "Exportar agenda a un fichero HTML"
 
-#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:1020
+#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:979
 msgid "File Info"
 msgstr "Información de fichero"
 
@@ -3341,7 +3358,7 @@ msgstr "Exportar agenda a un fichero LDIF"
 msgid "Distinguished Name"
 msgstr "Nombre distinguido"
 
-#: src/export.c:113 src/summaryview.c:8177
+#: src/export.c:113 src/summaryview.c:8504
 msgid "Export to mbox file"
 msgstr "Exportar a fichero mbox"
 
@@ -3357,66 +3374,66 @@ msgstr "Directorio de origen:"
 msgid "Mbox file:"
 msgstr "Fichero mbox:"
 
-#: src/export.c:203
+#: src/export.c:204
 msgid "Target mbox filename can't be left empty."
 msgstr "El nombre de fichero mbox de destino no se puede dejar vacío."
 
-#: src/export.c:208
+#: src/export.c:209
 msgid "Source folder can't be left empty."
 msgstr "La carpeta de origen no se puede dejar vacía."
 
-#: src/export.c:221
+#: src/export.c:222
 msgid "Couldn't find the source folder."
 msgstr "No se pudo encontrar la carpeta de origen."
 
-#: src/export.c:245
+#: src/export.c:246
 msgid "Select exporting file"
 msgstr "Seleccione fichero de exportación"
 
-#: src/export.c:268
+#: src/export.c:269
 msgid "Select folder to export"
 msgstr "Seleccionar la carpeta a exportar"
 
-#: src/exporthtml.c:767
+#: src/exporthtml.c:768
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: src/exporthtml.c:771 src/importldif.c:1021
-#: src/plugins/archive/archiver_gtk.c:769
+#: src/exporthtml.c:772 src/importldif.c:980
+#: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/exporthtml.c:974
+#: src/exporthtml.c:975
 msgid "Claws Mail Address Book"
 msgstr "Agenda de direcciones de Claws Mail"
 
-#: src/exporthtml.c:1069 src/exportldif.c:606
+#: src/exporthtml.c:1070 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
 msgstr "El nombre ya existe pero no es un directorio."
 
-#: src/exporthtml.c:1072 src/exportldif.c:609
+#: src/exporthtml.c:1073 src/exportldif.c:610
 msgid "No permissions to create directory."
 msgstr "No tiene permisos para crear el directorio."
 
-#: src/exporthtml.c:1075 src/exportldif.c:612
+#: src/exporthtml.c:1076 src/exportldif.c:613
 msgid "Name is too long."
 msgstr "El nombre es demasiado largo."
 
-#: src/exporthtml.c:1078 src/exportldif.c:615
+#: src/exporthtml.c:1079 src/exportldif.c:616
 msgid "Not specified."
 msgstr "Sin especificar."
 
-#: src/file_checker.c:76
+#: src/file_checker.c:82
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr "¡Falta el fichero «%s»! ¿Desea usar la copia de respaldo de «%s»?"
 
-#: src/file_checker.c:84 src/file_checker.c:106
+#: src/file_checker.c:91 src/file_checker.c:115
 #, c-format
 msgid "Could not copy %s to %s"
 msgstr "No se puede copiar «%s» a «%s»"
 
-#: src/file_checker.c:98
+#: src/file_checker.c:106
 #, c-format
 msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3525,51 +3542,51 @@ msgstr "la acción no se pudo aplicar\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "no se sigue procesando después de la acción [ %s ]\n"
 
-#: src/filtering.c:810
+#: src/filtering.c:809
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "procesando regla «%s» [ %s ]\n"
 
-#: src/filtering.c:814
+#: src/filtering.c:813
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "procesando regla <sinnombre> [ %s ]\n"
 
-#: src/filtering.c:832
+#: src/filtering.c:831
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "desactivada regla «%s» [ %s ]\n"
 
-#: src/filtering.c:836
+#: src/filtering.c:835
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "desactivada regla <sinnombre> [ %s ]\n"
 
-#: src/filtering.c:874
+#: src/filtering.c:873
 msgid "undetermined"
 msgstr "indeterminada"
 
-#: src/filtering.c:878
+#: src/filtering.c:877
 msgid "incorporation"
 msgstr "incorporación"
 
-#: src/filtering.c:882
+#: src/filtering.c:881
 msgid "manually"
 msgstr "manualmente"
 
-#: src/filtering.c:886
+#: src/filtering.c:885
 msgid "folder processing"
 msgstr "procesamiento de la carpeta"
 
-#: src/filtering.c:890
+#: src/filtering.c:889
 msgid "pre-processing"
 msgstr "pre-procesamiento"
 
-#: src/filtering.c:894
+#: src/filtering.c:893
 msgid "post-processing"
 msgstr "post-procesamiento"
 
-#: src/filtering.c:911
+#: src/filtering.c:908
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3586,11 +3603,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:913 src/filtering.c:922
+#: src/filtering.c:910 src/filtering.c:919
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:920
+#: src/filtering.c:917
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3599,92 +3616,93 @@ msgstr ""
 "filtrando mensaje (%s%s%s)\n"
 "%sfichero de mensaje: %s\n"
 
-#: src/folder.c:1570 src/foldersel.c:412 src/prefs_folder_item.c:315
+#: src/folder.c:1595 src/prefs_folder_item.c:319
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/folder.c:1574 src/foldersel.c:416
+#: src/folder.c:1599
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/folder.c:1578 src/foldersel.c:420 src/prefs_folder_item.c:318
+#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
+#: src/prefs_folder_item.c:322
 msgid "Queue"
 msgstr "Cola"
 
-#: src/folder.c:1582 src/foldersel.c:424 src/prefs_folder_item.c:319
+#: src/folder.c:1607 src/prefs_folder_item.c:323
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/folder.c:1586 src/foldersel.c:428 src/prefs_folder_item.c:317
+#: src/folder.c:1611 src/prefs_folder_item.c:321
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/folder.c:2017
+#: src/folder.c:2042
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Procesando (%s)...\n"
 
-#: src/folder.c:3262
+#: src/folder.c:3289
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s a %s...\n"
 
-#: src/folder.c:3262
+#: src/folder.c:3289
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Moviendo %s a %s...\n"
 
-#: src/folder.c:3572
+#: src/folder.c:3599
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualizando caché para %s..."
 
-#: src/folder.c:4434
+#: src/folder.c:4461
 msgid "Processing messages..."
 msgstr "Procesando mensajes..."
 
-#: src/folder.c:4569
+#: src/folder.c:4596
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso sin conexión...\n"
 
-#: src/folder.c:4828
+#: src/folder.c:4855
 msgid "A folder name cannot begin or end with a dot."
 msgstr "El nombre de una carpeta no puede empezar o terminar con un punto."
 
-#: src/folder.c:4832
+#: src/folder.c:4859
 msgid "A folder name can not end with a space."
 msgstr "El nombre de una carpeta no puede terminar con un espacio."
 
-#: src/foldersel.c:250
+#: src/foldersel.c:249
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:596 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
+#: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:604 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:580 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:432
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2063
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
+#: src/plugins/rssyl/rssyl_cb_menu.c:202
+#: src/plugins/vcalendar/vcal_folder.c:2068
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "No se puede usar «%c» en el nombre de la carpeta."
 
-#: src/foldersel.c:619 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:595 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:444 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2070
+#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
+#: src/plugins/vcalendar/vcal_folder.c:2075
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:626 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:602 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
+#: src/plugins/rssyl/rssyl_cb_menu.c:125
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "No se puede crear la carpeta «%s»."
@@ -3709,7 +3727,7 @@ msgstr "Marcar todos como no leídos recursi_vamente"
 msgid "R_un processing rules"
 msgstr "Ejec_utar reglas de procesamiento"
 
-#: src/folderview.c:253 src/mainwindow.c:553
+#: src/folderview.c:253 src/mainwindow.c:562
 msgid "_Search folder..."
 msgstr "_Buscar en carpeta..."
 
@@ -3725,38 +3743,43 @@ msgstr "_Vaciar papelera..."
 msgid "Send _queue..."
 msgstr "Enviar _cola..."
 
-#: src/folderview.c:397 src/folderview.c:444
+#: src/folderview.c:264
+#, fuzzy
+msgid "Set Displayed columns"
+msgstr "Establecer _columnas visibles"
+
+#: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6293
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6563
 msgid "New"
 msgstr "Nuevos"
 
-#: src/folderview.c:398 src/folderview.c:445
+#: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6295
-#: src/toolbar.c:509
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6565
+#: src/toolbar.c:512
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:399 src/plugins/notification/notification_lcdproc.c:149
-#: src/prefs_folder_column.c:81
+#: src/folderview.c:405 src/plugins/notification/notification_lcdproc.c:149
+#: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:447 src/summaryview.c:447
+#: src/folderview.c:453 src/summaryview.c:471
 msgid "#"
 msgstr "N.º"
 
-#: src/folderview.c:782
+#: src/folderview.c:783
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:867 src/summaryview.c:4140
+#: src/folderview.c:868 src/summaryview.c:4308
 msgid "Mark all as read"
 msgstr "Marcar todo como leído"
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3764,15 +3787,15 @@ msgstr ""
 "¿Desea marcar todos los correos en esta carpeta y sus subcarpetas como "
 "leídos?"
 
-#: src/folderview.c:870 src/summaryview.c:4141
+#: src/folderview.c:871 src/summaryview.c:4309
 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:873 src/summaryview.c:4179
+#: src/folderview.c:874 src/summaryview.c:4354
 msgid "Mark all as unread"
 msgstr "Marcar todo como no leído"
 
-#: src/folderview.c:874
+#: src/folderview.c:875
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
@@ -3780,95 +3803,95 @@ msgstr ""
 "¿Desea marcar todos los correos en esta carpeta y sus subcarpetas como no "
 "leídos?"
 
-#: src/folderview.c:876 src/summaryview.c:4180
+#: src/folderview.c:877 src/summaryview.c:4355
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 "¿Quiere realmente marcar todos los correos en la carpeta como no leídos?"
 
-#: src/folderview.c:1066 src/imap.c:4605
+#: src/folderview.c:1067 src/imap.c:4637
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Revisando carpeta %s/%s..."
 
-#: src/folderview.c:1069 src/imap.c:4609 src/mainwindow.c:5249 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4641 src/mainwindow.c:5290 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Revisando carpeta %s..."
 
-#: src/folderview.c:1100
+#: src/folderview.c:1101
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:1101
+#: src/folderview.c:1102
 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:1111
+#: src/folderview.c:1112
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo árbol de carpetas..."
 
-#: src/folderview.c:1113
+#: src/folderview.c:1114
 msgid "Scanning folder tree..."
 msgstr "Explorando árbol de carpetas..."
 
-#: src/folderview.c:1204
+#: src/folderview.c:1205
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No se puede explorar la carpeta %s\n"
 
-#: src/folderview.c:1258
+#: src/folderview.c:1259
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:2229
+#: src/folderview.c:2233
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Cerrando carpeta %s..."
 
-#: src/folderview.c:2324
+#: src/folderview.c:2328
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abriendo carpeta %s..."
 
-#: src/folderview.c:2342
+#: src/folderview.c:2346
 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 
-#: src/folderview.c:2484 src/mainwindow.c:2906 src/mainwindow.c:2910
+#: src/folderview.c:2486 src/mainwindow.c:2896 src/mainwindow.c:2901
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2487
 msgid "Delete all messages in trash?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2488
 msgid "_Empty trash"
 msgstr "_Vaciar papelera"
 
-#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:2911
+#: src/folderview.c:2532 src/inc.c:1662 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Notificación conexión"
 
-#: src/folderview.c:2530 src/toolbar.c:2912
+#: src/folderview.c:2533 src/toolbar.c:3033
 msgid "You're working offline. Override?"
 msgstr "Está trabajando sin conexión ¿Ignorar?"
 
-#: src/folderview.c:2541 src/toolbar.c:2931
+#: src/folderview.c:2544 src/toolbar.c:3052
 msgid "Send queued messages"
 msgstr "Enviar mensajes en la cola"
 
-#: src/folderview.c:2542 src/toolbar.c:2932
+#: src/folderview.c:2545 src/toolbar.c:3053
 msgid "Send all queued messages?"
 msgstr "¿Enviar todos los mensajes en la cola?"
 
-#: src/folderview.c:2551 src/toolbar.c:2951
+#: src/folderview.c:2554 src/toolbar.c:3072
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 
-#: src/folderview.c:2554 src/main.c:2752 src/toolbar.c:2954
+#: src/folderview.c:2557 src/main.c:2811 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3877,64 +3900,64 @@ msgstr ""
 "Hubo algún error enviando los mensajes en la cola:\n"
 "%s"
 
-#: src/folderview.c:2629
+#: src/folderview.c:2632
 #, 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:2630
+#: src/folderview.c:2633
 #, 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:2632
+#: src/folderview.c:2635
 msgid "Copy folder"
 msgstr "Copiar carpeta"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2635
 msgid "Move folder"
 msgstr "Mover carpeta"
 
-#: src/folderview.c:2643
+#: src/folderview.c:2646
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s a %s..."
 
-#: src/folderview.c:2643
+#: src/folderview.c:2646
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 
-#: src/folderview.c:2677
+#: src/folderview.c:2680
 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 
-#: src/folderview.c:2680
+#: src/folderview.c:2683
 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:2681
+#: src/folderview.c:2684
 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:2684
+#: src/folderview.c:2687
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 
-#: src/folderview.c:2687
+#: src/folderview.c:2690
 msgid "Copy failed!"
 msgstr "¡Copiar falló!"
 
-#: src/folderview.c:2687
+#: src/folderview.c:2690
 msgid "Move failed!"
 msgstr "¡Mover falló!"
 
-#: src/folderview.c:2737
+#: src/folderview.c:2740
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuración de procesamiento para la carpeta «%s»"
 
-#: src/folderview.c:3177 src/summaryview.c:4576 src/summaryview.c:4682
+#: src/folderview.c:3175 src/summaryview.c:4763 src/summaryview.c:4869
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La carpeta destino sólo puede usarse para almacenar subcarpetas."
 
@@ -3958,7 +3981,7 @@ msgstr " Buscar "
 msgid "Newsgroup name"
 msgstr "Nombre de grupo"
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:171
+#: src/grouplistdialog.c:205 src/prefs_send.c:188
 msgid "Messages"
 msgstr "Mensajes"
 
@@ -3966,49 +3989,49 @@ msgstr "Mensajes"
 msgid "Type"
 msgstr "Tipo"
 
-#: src/grouplistdialog.c:347
+#: src/grouplistdialog.c:346
 msgid "moderated"
 msgstr "moderado"
 
-#: src/grouplistdialog.c:349
+#: src/grouplistdialog.c:348
 msgid "readonly"
 msgstr "solo lectura"
 
-#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:297
-#: src/plugins/vcalendar/vcal_manager.c:114
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: src/plugins/vcalendar/vcal_manager.c:115
+#: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/grouplistdialog.c:422
+#: src/grouplistdialog.c:421
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1587
+#: src/grouplistdialog.c:458 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
 msgid "Done."
 msgstr "Hecho."
 
-#: src/grouplistdialog.c:492
+#: src/grouplistdialog.c:491
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de noticias recibidos (%s leídos)"
 
-#: src/gtk/about.c:132
+#: src/gtk/about.c:133
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr ""
 "Claws Mail es un cliente de correo ligero, rápido y altamente configurable."
 
-#: src/gtk/about.c:135
+#: src/gtk/about.c:136
 msgid "For further information visit the Claws Mail website:"
 msgstr "Para más información visite el sitio web de Claws Mail:"
 
-#: src/gtk/about.c:140
+#: src/gtk/about.c:141
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
 "Para soporte y discusión suscríbase a la lista de usuarios de Claws Mail:"
 
-#: src/gtk/about.c:146
+#: src/gtk/about.c:147
 msgid ""
 "Claws Mail is free software released under the GPL. If you wish to donate to "
 "the Claws Mail project you can do so at:"
@@ -4016,21 +4039,22 @@ msgstr ""
 "Claws Mail es software libre distribuido bajo licencia GPL. Si desea "
 "realizar alguna donación al proyecto Claws Mail puede hacerlo en:"
 
-#: src/gtk/about.c:162
+#: src/gtk/about.c:163 src/gtk/about.c:851
+#, fuzzy
 msgid ""
-"Copyright (C) 1999-2017\n"
+"Copyright (C) 1999-2019\n"
 "The Claws Mail Team\n"
-" and Hiroyuki Yamamoto"
+"and Hiroyuki Yamamoto"
 msgstr ""
 "Copyright (C) 1999-2019\n"
-"El Equipo de Claws Mail\n"
+"El equipo de Claws Mail\n"
 "e Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:167
+#: src/gtk/about.c:168
 msgid "System Information\n"
 msgstr "Información del sistema\n"
 
-#: src/gtk/about.c:173
+#: src/gtk/about.c:174
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4039,7 +4063,7 @@ msgstr ""
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: %s %s (%s)"
 
-#: src/gtk/about.c:182
+#: src/gtk/about.c:183
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4048,7 +4072,7 @@ msgstr ""
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: %s"
 
-#: src/gtk/about.c:191
+#: src/gtk/about.c:192
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4057,96 +4081,96 @@ msgstr ""
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: desconocido"
 
-#: src/gtk/about.c:247 src/prefs_themes.c:805 src/wizard.c:527
+#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
 msgid "The Claws Mail Team"
 msgstr "El equipo de Claws Mail"
 
-#: src/gtk/about.c:266
+#: src/gtk/about.c:267
 msgid "Previous team members"
 msgstr "Miembros anteriores del equipo"
 
-#: src/gtk/about.c:285
+#: src/gtk/about.c:286
 msgid "The translation team"
 msgstr "El equipo de traducción"
 
-#: src/gtk/about.c:304
+#: src/gtk/about.c:305
 msgid "Documentation team"
 msgstr "El equipo de documentación"
 
-#: src/gtk/about.c:322
+#: src/gtk/about.c:323
 msgid "Logo"
 msgstr "Logotipo"
 
-#: src/gtk/about.c:341
+#: src/gtk/about.c:342
 msgid "Icons"
 msgstr "Iconos"
 
-#: src/gtk/about.c:360
+#: src/gtk/about.c:361
 msgid "Contributors"
 msgstr "Contribuciones"
 
-#: src/gtk/about.c:408
+#: src/gtk/about.c:409
 msgid "Compiled-in Features"
 msgstr "Características incluidas al compilar"
 
-#: src/gtk/about.c:425
+#: src/gtk/about.c:426
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "Añade soporte para la cabecera X-Face\n"
 
-#: src/gtk/about.c:435
+#: src/gtk/about.c:436
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "Añade soporte para la comprobación ortográfica\n"
 
-#: src/gtk/about.c:445
+#: src/gtk/about.c:446
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "Añade soporte para conexiones cifradas con los servidores\n"
 
-#: src/gtk/about.c:455
+#: src/gtk/about.c:456
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr ""
 "Añade soporte para direcciones IPv6, el nuevo protocolo de direcciones de "
 "Internet\n"
 
-#: src/gtk/about.c:466
+#: src/gtk/about.c:467
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "Permite conversiones entre diferentes conjuntos de caracteres\n"
 
-#: src/gtk/about.c:476
+#: src/gtk/about.c:477
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "Añade soporte para agendas de direcciones de PalmOS\n"
 
-#: src/gtk/about.c:486
+#: src/gtk/about.c:487
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "Añade soporte para agendas de direcciones compartidas con LDAP\n"
 
-#: src/gtk/about.c:496
+#: src/gtk/about.c:497
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "Añade soporte para servidores IMAP y NNTP\n"
 
-#: src/gtk/about.c:506
+#: src/gtk/about.c:507
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "Añade soporte para el manejo de sesión\n"
 
-#: src/gtk/about.c:516
+#: src/gtk/about.c:517
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "Añade soporte para detectar los cambios de conexión de red\n"
 
-#: src/gtk/about.c:526
+#: src/gtk/about.c:527
 msgctxt "librSVG"
 msgid "adds support for SVG themes\n"
 msgstr "Añade soporte para temas en formato SVG\n"
 
-#: src/gtk/about.c:558
+#: src/gtk/about.c:559
 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 "
@@ -4157,7 +4181,7 @@ msgstr ""
 "Foundation; tanto en versión 3, como (opcionalmente) cualquier versión "
 "posterior."
 
-#: src/gtk/about.c:565
+#: src/gtk/about.c:566
 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 "
@@ -4169,7 +4193,7 @@ msgstr ""
 "ADECUACIÓN PARA ALGÚN PROPÓSITO PARTICULAR. Véase la GNU General Public "
 "License para más detalles."
 
-#: src/gtk/about.c:584
+#: src/gtk/about.c:585
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4177,157 +4201,147 @@ msgstr ""
 "Debería haber recibido una copia de la GNU General Public License junto con "
 "este programa; en caso contrario, vea "
 
-#: src/gtk/about.c:717 src/main.c:2576
+#: src/gtk/about.c:718 src/main.c:2635
 msgid "Session statistics\n"
 msgstr "Estadísticas de sesión\n"
 
-#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2586 src/main.c:2589
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2645 src/main.c:2648
 #, c-format
 msgid "Started: %s\n"
 msgstr "Iniciado: %s\n"
 
-#: src/gtk/about.c:737 src/main.c:2595
+#: src/gtk/about.c:738 src/main.c:2654
 msgid "Incoming traffic\n"
 msgstr "Tráfico entrante\n"
 
-#: src/gtk/about.c:740 src/main.c:2598
+#: src/gtk/about.c:741 src/main.c:2657
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mensajes recibidos: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2604
+#: src/gtk/about.c:748 src/main.c:2663
 msgid "Outgoing traffic\n"
 msgstr "Tráfico saliente\n"
 
-#: src/gtk/about.c:750 src/main.c:2607
+#: src/gtk/about.c:751 src/main.c:2666
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Mensajes nuevos/redirigidos: %d\n"
 
-#: src/gtk/about.c:755 src/main.c:2611
+#: src/gtk/about.c:756 src/main.c:2670
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Mensajes respondidos: %d\n"
 
-#: src/gtk/about.c:760 src/main.c:2615
+#: src/gtk/about.c:761 src/main.c:2674
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Mensajes reenviados: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2619
+#: src/gtk/about.c:766 src/main.c:2678
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total mensajes salientes: %d\n"
 
-#: src/gtk/about.c:792
+#: src/gtk/about.c:793
 msgid "About Claws Mail"
 msgstr "Acerca de Claws Mail"
 
-#: src/gtk/about.c:850
-msgid ""
-"Copyright (C) 1999-2017\n"
-"The Claws Mail Team\n"
-"and Hiroyuki Yamamoto"
-msgstr ""
-"Copyright (C) 1999-2019\n"
-"El equipo de Claws Mail\n"
-"e Hiroyuki Yamamoto"
-
-#: src/gtk/about.c:864
+#: src/gtk/about.c:865
 msgid "_Info"
 msgstr "_Información"
 
-#: src/gtk/about.c:870
+#: src/gtk/about.c:871
 msgid "_Authors"
 msgstr "_Autores"
 
-#: src/gtk/about.c:876
+#: src/gtk/about.c:877
 msgid "_Features"
 msgstr "_Características"
 
-#: src/gtk/about.c:882
+#: src/gtk/about.c:883
 msgid "_License"
 msgstr "_Licencia"
 
-#: src/gtk/about.c:890
+#: src/gtk/about.c:891
 msgid "_Release Notes"
 msgstr "_Notas de la versión"
 
-#: src/gtk/about.c:896
+#: src/gtk/about.c:897
 msgid "_Statistics"
 msgstr "E_stadísticas"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:367
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Naranja"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:371
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Rojo"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:375
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:379
+#: 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:383
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Azul"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:387
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Verde"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:391
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Marrón"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:395
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Gris"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:399
+#: 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:403
+#: 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:407
+#: 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:411
+#: 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:415
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Dorado"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:419
+#: 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:423
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/foldersort.c:156
+#: src/gtk/foldersort.c:241
 msgid "Set mailbox order"
 msgstr "Establecer orden de los buzones"
 
-#: src/gtk/foldersort.c:190
+#: src/gtk/foldersort.c:276
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 "Mueva los buzones arriba o abajo para cambiar la posición en la lista de "
 "carpetas."
 
-#: src/gtk/foldersort.c:216
+#: src/gtk/foldersort.c:310
 msgid "Mailboxes"
 msgstr "Buzones"
 
@@ -4353,16 +4367,16 @@ msgstr "No se pudo inicializar el diccionario %s:"
 msgid "No misspelled word found."
 msgstr "No se encontraron faltas ortográficas."
 
-#: src/gtk/gtkaspell.c:1443
+#: src/gtk/gtkaspell.c:1451
 msgid "Replace unknown word"
 msgstr "Sustituir palabra desconocida"
 
-#: src/gtk/gtkaspell.c:1460
+#: src/gtk/gtkaspell.c:1467
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr "Sustituir «%s» con: "
 
-#: src/gtk/gtkaspell.c:1503
+#: src/gtk/gtkaspell.c:1510
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
@@ -4370,10 +4384,6 @@ msgstr ""
 "Si pulsa la tecla Control junto con el Retorno\n"
 "de carro se aprenderá del error.\n"
 
-#: src/gtk/gtkaspell.c:1800
-msgid "Change to..."
-msgstr "Cambiar a..."
-
 #: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
 msgstr "Más..."
@@ -4418,11 +4428,11 @@ msgstr "Usar alternativo (%s)"
 msgid "Use both dictionaries"
 msgstr "Usar ambos diccionarios"
 
-#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:144
+#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:143
 msgid "Check while typing"
 msgstr "Comprobar mientras se escribe"
 
-#: src/gtk/gtkaspell.c:2153
+#: src/gtk/gtkaspell.c:2154
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4431,7 +4441,7 @@ msgstr ""
 "El corrector no pudo cambiar de diccionario.\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2209
+#: src/gtk/gtkaspell.c:2210
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4440,26 +4450,26 @@ msgstr ""
 "El corrector ortográfico no pudo cambiar el diccionario alternativo.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1927
+#: src/gtk/gtkutils.c:1862
 msgid "Failed: no service record found."
 msgstr "Falló: no hay registro del servicio."
 
-#: src/gtk/gtkutils.c:1930
+#: src/gtk/gtkutils.c:1865
 msgid "Failed: network error."
 msgstr "Falló: error de la red."
 
-#: src/gtk/gtkutils.c:1933
+#: src/gtk/gtkutils.c:1868
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Falló: error desconocido (%d)."
 
-#: src/gtk/gtkutils.c:2003
+#: src/gtk/gtkutils.c:1938
 msgid "Configuring..."
 msgstr "Configurando..."
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2166 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:445
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1224
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2213 src/prefs_summaries.c:613
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:469
 msgid "Date"
 msgstr "Fecha"
 
@@ -4467,13 +4477,13 @@ msgstr "Fecha"
 msgid "Date:"
 msgstr "Fecha:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2163 src/prefs_summaries.c:445
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:443
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1221
+#: src/prefs_matcher.c:2210 src/prefs_summaries.c:615
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:467
 msgid "From"
 msgstr "Desde"
 
-#: src/gtk/headers.h:10 src/summary_search.c:474
+#: src/gtk/headers.h:10 src/summary_search.c:414
 msgid "From:"
 msgstr "Desde:"
 
@@ -4489,14 +4499,14 @@ msgstr "Remitente:"
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1257
-#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:57 src/summaryview.c:444
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1222
+#: src/prefs_matcher.c:2211 src/prefs_summaries.c:616
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:468
 msgid "To"
 msgstr "Para"
 
-#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2165 src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1223
+#: src/prefs_matcher.c:2212 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4504,8 +4514,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1225
+#: src/prefs_matcher.c:2214 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "ID-Mensaje"
 
@@ -4517,8 +4527,8 @@ msgstr "ID-Mensaje:"
 msgid "In-Reply-To"
 msgstr "En-Respuesta-A"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2169 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1227
+#: src/prefs_matcher.c:2216 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referencias"
 
@@ -4526,18 +4536,18 @@ msgstr "Referencias"
 msgid "References:"
 msgstr "Referencias:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2162 src/prefs_summaries.c:447
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:442
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1220
+#: src/prefs_matcher.c:2209 src/prefs_summaries.c:617
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:466
 msgid "Subject"
 msgstr "Asunto"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:700
-#: src/summary_search.c:488
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/summary_search.c:428
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:431
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
 msgid "Comments"
 msgstr "Comentarios"
 
@@ -4549,7 +4559,7 @@ msgstr "Comentarios:"
 msgid "Keywords"
 msgstr "Palabras-Clave"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Keywords:"
 msgstr "Palabras-Clave:"
 
@@ -4625,8 +4635,8 @@ msgstr "Recibido"
 msgid "Received:"
 msgstr "Recibido:"
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2168 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1226
+#: src/prefs_matcher.c:2215 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Grupos"
 
@@ -4651,12 +4661,13 @@ msgid "Seen:"
 msgstr "Visto:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:451
-#: src/prefs_summary_column.c:79 src/summaryview.c:2810
+#: src/gtk/sslcertwindow.c:190 src/prefs_summaries.c:621
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/ssl_manager.c:124
+#: src/summaryview.c:2918
 msgid "Status"
 msgstr "Estado"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:996
+#: src/gtk/headers.h:37
 msgid "Status:"
 msgstr "Estado:"
 
@@ -4696,7 +4707,7 @@ msgstr "Agente-Usuario:"
 msgid "Content-Type"
 msgstr "Tipo-Contenido"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:327
+#: src/gtk/headers.h:42 src/image_viewer.c:338
 msgid "Content-Type:"
 msgstr "Tipo-Contenido:"
 
@@ -4724,7 +4735,7 @@ msgstr "Precedencia"
 msgid "Precedence:"
 msgstr "Precedencia:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1066
+#: src/gtk/headers.h:46 src/prefs_account.c:1169
 msgid "Organization"
 msgstr "Organización"
 
@@ -4955,43 +4966,48 @@ msgstr ""
 "Los siguientes iconos se usan para mostrar el estado de los mensajes y las "
 "carpetas:"
 
-#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
+#: src/gtk/inputdialog.c:228 src/gtk/inputdialog.c:250
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Contraseña para %s en %s:"
 
-#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
-#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
+#: src/gtk/inputdialog.c:231 src/gtk/inputdialog.c:234
+#: src/gtk/inputdialog.c:253 src/gtk/inputdialog.c:256
 #, c-format
 msgid "Input password for %s:"
 msgstr "Introduzca contraseña para %s:"
 
-#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
+#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:259
 msgid "Input password:"
 msgstr "Introduzca contraseña:"
 
-#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:238 src/gtk/inputdialog.c:266
+#: src/gtk/inputdialog.c:278
 msgid "Input password"
 msgstr "Introducir contraseña"
 
-#: src/gtk/inputdialog.c:273
+#: src/gtk/inputdialog.c:268
 msgid "Remember password for this session"
 msgstr "Recordar la contraseña para esta sesión"
 
-#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:419
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:410
 msgid "Remember this"
 msgstr "Recordar esto"
 
-#: src/gtk/logwindow.c:447
+#: src/gtk/logwindow.c:449
+#, fuzzy
+msgid "_Go to last error"
+msgstr "_Ir a hoy"
+
+#: src/gtk/logwindow.c:456
 msgid "Clear _Log"
 msgstr "_Limpiar traza"
 
-#: src/gtk/menu.c:137
+#: src/gtk/menu.c:135
 msgid "Warning:"
 msgstr "Aviso:"
 
-#: src/gtk/menu.c:138
+#: src/gtk/menu.c:136
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -5034,18 +5050,18 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
 #: src/plugins/address_keeper/address_keeper_prefs.c:273
 #: src/plugins/archive/archiver_prefs.c:106
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:498
+#: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:549
-#: src/plugins/fancy/fancy_prefs.c:114
+#: src/plugins/clamd/clamav_plugin_gtk.c:537
+#: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:424
+#: src/plugins/managesieve/sieve_prefs.c:423
 #: src/plugins/notification/notification_prefs.c:398
 #: src/plugins/notification/notification_prefs.c:413
 #: src/plugins/notification/notification_prefs.c:432
@@ -5054,40 +5070,43 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:486
 #: src/plugins/notification/notification_prefs.c:504
 #: src/plugins/notification/notification_prefs.c:522
-#: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
+#: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:957
+#: src/plugins/spamassassin/spamassassin_gtk.c:670
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "Módulos"
 
 #: src/gtk/pluginwindow.c:336
-msgid "Load..."
+#, fuzzy
+msgid "_Load..."
 msgstr "Cargar..."
 
 #: src/gtk/pluginwindow.c:337
-msgid "Unload"
+#, fuzzy
+msgid "_Unload"
 msgstr "Descargar"
 
-#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:229
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:235
 msgid "Description"
 msgstr "Descripción"
 
-#: src/gtk/pluginwindow.c:374
+#: src/gtk/pluginwindow.c:375
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr ""
 "Para más información sobre los módulos vea el %ssitio web de Claws Mail%s."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:416
 msgid "Click here to load one or more plugins"
 msgstr "Pulse aquí para cargar uno o más módulos"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:419
 msgid "Unload the selected plugin"
 msgstr "Descargar el módulo seleccionado"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:484
 msgid "Loaded plugins"
 msgstr "Módulos cargados"
 
@@ -5095,211 +5114,220 @@ msgstr "Módulos cargados"
 msgid "Page Index"
 msgstr "Índice de páginas"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:843
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:853
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: 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:1422 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1877
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:693
+#: src/prefs_account.c:3744 src/prefs_account.c:3762 src/prefs_account.c:3780
+#: src/prefs_account.c:3798 src/prefs_account.c:3816 src/prefs_account.c:3834
+#: src/prefs_account.c:3853 src/prefs_account.c:3946 src/prefs_account.c:3964
+#: src/prefs_filtering_action.c:1379 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1883
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:472
 msgid "all messages"
 msgstr "todos los mensajes"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:473
 msgid "messages whose age is greater than # days"
 msgstr "mensajes cuya edad es mayor que # días"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:474
 msgid "messages whose age is less than # days"
 msgstr "mensajes cuya edad es menor que # días"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:475
 msgid "messages whose age is greater than # hours"
 msgstr "mensajes cuya edad es mayor que # horas"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:476
 msgid "messages whose age is less than # hours"
 msgstr "mensajes cuya edad es menor que # horas"
 
-#: src/gtk/quicksearch.c:483
+#: src/gtk/quicksearch.c:477
 msgid "messages which contain S in the message body"
 msgstr "mensajes que contienen S en el cuerpo del mensaje"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:478
 msgid "messages which contain S in the whole message"
 msgstr "mensajes que contienen S en el mensaje completo"
 
-#: src/gtk/quicksearch.c:485
+#: src/gtk/quicksearch.c:479
 msgid "messages carbon-copied to S"
 msgstr "mensajes con copia-carbón a S"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:480
 msgid "message is either To: or Cc: to S"
 msgstr "mensaje con Para: o Cc: a S"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:481
 msgid "deleted messages"
 msgstr "mensajes borrados"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:482
+#, fuzzy
+msgid "messages whose date is after requested date (time is optional)"
+msgstr "mensajes cuya edad es mayor que # días"
+
+#: src/gtk/quicksearch.c:484
+msgid "messages whose date is before requested date (time is optional)"
+msgstr ""
+
+#: src/gtk/quicksearch.c:486
 msgid "messages which contain S in the Sender field"
 msgstr "mensajes que contienen S en el campo remitente"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:487
 msgid "true if execute \"S\" succeeds"
 msgstr "cierto si ejecutar \"S\" tiene éxito"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:488
 msgid "messages originating from user S"
 msgstr "mensajes provenientes del usuario S"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:489
 msgid "forwarded messages"
 msgstr "mensajes reenviados"
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:490
 msgid "messages which have attachments"
 msgstr "mensajes que tienen adjuntos"
 
-#: src/gtk/quicksearch.c:493
+#: src/gtk/quicksearch.c:491
 msgid "messages which contain S in any header name or value"
 msgstr "mensajes que contienen S en el nombre o el valor de cualquier cabecera"
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:492
 msgid "messages which contain S in the value of any header"
 msgstr "mensajes que contienen S en el valor de cualquier cabecera"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:493
 msgid "messages which contain S in Message-ID header"
 msgstr "mensajes que contienen S en la cabecera Message-ID"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:494
 msgid "messages which contain S in In-Reply-To header"
 msgstr "mensajes que contienen S en la cabecera In-Reply-To"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:495
 msgid "messages which are marked with color #"
 msgstr "mensajes que están marcados con el color n.º"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:496
 msgid "locked messages"
 msgstr "mensajes bloqueados"
 
-#: src/gtk/quicksearch.c:499
+#: src/gtk/quicksearch.c:497
 msgid "messages which are in newsgroup S"
 msgstr "mensajes que están en el grupo de noticias S"
 
-#: src/gtk/quicksearch.c:500
+#: src/gtk/quicksearch.c:498
 msgid "new messages"
 msgstr "mensajes nuevos"
 
-#: src/gtk/quicksearch.c:501
+#: src/gtk/quicksearch.c:499
 msgid "old messages"
 msgstr "mensajes antiguos"
 
-#: src/gtk/quicksearch.c:502
+#: src/gtk/quicksearch.c:500
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "mensajes incompletos (no descargados por completo)"
 
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:501
 msgid "messages which you have replied to"
 msgstr "mensajes que usted ha respondido"
 
-#: src/gtk/quicksearch.c:504
+#: src/gtk/quicksearch.c:502
 msgid "read messages"
 msgstr "mensajes leídos"
 
-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:503
 msgid "messages which contain S in subject"
 msgstr "mensajes que contienen S en el asunto"
 
-#: src/gtk/quicksearch.c:506
+#: src/gtk/quicksearch.c:504
 msgid "messages whose score is equal to # points"
 msgstr "mensajes con puntuación igual a # puntos"
 
-#: src/gtk/quicksearch.c:507
+#: src/gtk/quicksearch.c:505
 msgid "messages whose score is greater than # points"
 msgstr "mensajes con puntuación mayor que # puntos"
 
-#: src/gtk/quicksearch.c:508
+#: src/gtk/quicksearch.c:506
 msgid "messages whose score is lower than # points"
 msgstr "mensajes con puntuación menor que # puntos"
 
-#: src/gtk/quicksearch.c:509
+#: src/gtk/quicksearch.c:507
 msgid "messages whose size is equal to # bytes"
 msgstr "mensajes con tamaño igual a # bytes"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:508
 msgid "messages whose size is greater than # bytes"
 msgstr "mensajes con tamaño mayor que # bytes"
 
-#: src/gtk/quicksearch.c:511
+#: src/gtk/quicksearch.c:509
 msgid "messages whose size is smaller than # bytes"
 msgstr "mensajes con tamaño menor que # bytes"
 
-#: src/gtk/quicksearch.c:512
+#: src/gtk/quicksearch.c:510
 msgid "messages which have been sent to S"
 msgstr "mensajes que han sido enviados a S"
 
-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:511
 msgid "messages which tags contain S"
 msgstr "mensajes cuyas etiquetas contienen S"
 
-#: src/gtk/quicksearch.c:514
+#: src/gtk/quicksearch.c:512
 msgid "messages which have tag(s)"
 msgstr "mensajes que tienen etiqueta(s)"
 
-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:513
 msgid "marked messages"
 msgstr "mensajes marcados"
 
-#: src/gtk/quicksearch.c:516
+#: src/gtk/quicksearch.c:514
 msgid "unread messages"
 msgstr "mensajes sin leer"
 
-#: src/gtk/quicksearch.c:517
+#: src/gtk/quicksearch.c:515
 msgid "messages which contain S in References header"
 msgstr "mensajes que contienen S en la cabecera References"
 
-#: src/gtk/quicksearch.c:518
+#: src/gtk/quicksearch.c:516
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "mensajes que devuelven 0 al pasarlos a una orden - %F es el fichero del "
 "mensaje"
 
-#: src/gtk/quicksearch.c:519
+#: src/gtk/quicksearch.c:517
 msgid "messages which contain S in X-Label header"
 msgstr "mensajes que contienen S en la cabecera X-Label"
 
-#: src/gtk/quicksearch.c:521
+#: src/gtk/quicksearch.c:519
 msgid "logical AND operator"
 msgstr "operador Y lógico"
 
-#: src/gtk/quicksearch.c:522
+#: src/gtk/quicksearch.c:520
 msgid "logical OR operator"
 msgstr "operador O lógico"
 
-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:521
 msgid "logical NOT operator"
 msgstr "operador NO lógico"
 
-#: src/gtk/quicksearch.c:524
+#: src/gtk/quicksearch.c:522
 msgid "case sensitive search"
 msgstr "sensible a mayús./minús."
 
-#: src/gtk/quicksearch.c:525
+#: src/gtk/quicksearch.c:523
 msgid "match using regular expressions instead of substring search"
 msgstr "buscar coincidencias con expresiones regulares en lugar de sub-cadenas"
 
-#: src/gtk/quicksearch.c:527
+#: src/gtk/quicksearch.c:525
 msgid ""
 "all filtering expressions are allowed, but cannot be mixed through logical "
 "operators with the expressions above"
@@ -5307,11 +5335,11 @@ msgstr ""
 "se permiten todas las expresiones de filtrado, pero no se pueden mezclar "
 "usando operadores lógicos con las expresiones anteriores"
 
-#: src/gtk/quicksearch.c:537 src/summary_search.c:521
+#: src/gtk/quicksearch.c:535 src/summary_search.c:461
 msgid "Extended Search"
 msgstr "Búsqueda extendida"
 
-#: src/gtk/quicksearch.c:538
+#: src/gtk/quicksearch.c:536
 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"
@@ -5321,99 +5349,108 @@ msgstr ""
 "para los mensajes mostrados en la lista de mensajes.\n"
 "Se pueden utilizar los siguientes símbolos:"
 
-#: src/gtk/quicksearch.c:638
+#: src/gtk/quicksearch.c:640
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Algo falló durante la búsqueda. Por favor compruebe la traza."
 
-#: src/gtk/quicksearch.c:704
+#: src/gtk/quicksearch.c:702
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Desde/Para/Cc/Asunto/Etiqueta"
 
-#: src/gtk/quicksearch.c:715 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Recursivo"
 
-#: src/gtk/quicksearch.c:724
+#: src/gtk/quicksearch.c:722
 msgid "Sticky"
 msgstr "Pegajoso"
 
-#: src/gtk/quicksearch.c:734
+#: src/gtk/quicksearch.c:732
 msgid "Type-ahead"
 msgstr "Mientras teclea"
 
-#: src/gtk/quicksearch.c:746
+#: src/gtk/quicksearch.c:744
 msgid "Run on select"
 msgstr "Ejecutar sobre la selección"
 
-#: src/gtk/quicksearch.c:788
+#: src/gtk/quicksearch.c:780
 msgid "Clear the current search"
 msgstr "Limpiar la búsqueda actual"
 
-#: src/gtk/quicksearch.c:798 src/summary_search.c:472
+#: src/gtk/quicksearch.c:790 src/summary_search.c:412
 msgid "Edit search criteria"
 msgstr "Editar el criterio de búsqueda"
 
-#: src/gtk/quicksearch.c:807
+#: src/gtk/quicksearch.c:799
 msgid "Information about extended symbols"
 msgstr "Información sobre los símbolos extendidos"
 
-#: src/gtk/quicksearch.c:845 src/gtk/quicksearch.c:869
+#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
 msgid "_Information"
 msgstr "_Información"
 
-#: src/gtk/quicksearch.c:846 src/gtk/quicksearch.c:870
+#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
 msgid "E_dit"
 msgstr "E_ditar"
 
-#: src/gtk/quicksearch.c:847 src/gtk/quicksearch.c:871 src/prefs_actions.c:347
-#: src/prefs_filtering.c:495 src/prefs_template.c:330
+#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:348
+#: src/prefs_filtering.c:495 src/prefs_template.c:329
 msgid "C_lear"
 msgstr "_Limpiar"
 
-#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348
-#: src/gtk/sslcertwindow.c:398 src/gtk/sslcertwindow.c:462
-msgid "Correct"
+#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:300
+#, fuzzy, c-format
+msgid "Correct%s"
 msgstr "Correcto"
 
-#: src/gtk/sslcertwindow.c:162
+#: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
+#: src/ssl_manager.c:300 src/ssl_manager.c:304
+msgid " (expired)"
+msgstr ""
+
+#: src/gtk/sslcertwindow.c:188
 msgid "Owner"
 msgstr "Propietario"
 
-#: src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:189
 msgid "Signer"
 msgstr "Firmante"
 
-#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:952
+#: src/gtk/sslcertwindow.c:196 src/gtk/sslcertwindow.c:220
 msgid "Name: "
 msgstr "Nombre: "
 
-#: src/gtk/sslcertwindow.c:178 src/gtk/sslcertwindow.c:202
+#: src/gtk/sslcertwindow.c:204 src/gtk/sslcertwindow.c:228
 msgid "Organization: "
 msgstr "Organización: "
 
-#: src/gtk/sslcertwindow.c:186 src/gtk/sslcertwindow.c:210
+#: src/gtk/sslcertwindow.c:212 src/gtk/sslcertwindow.c:236
 msgid "Location: "
 msgstr "Localización: "
 
-#: src/gtk/sslcertwindow.c:218
+#: src/gtk/sslcertwindow.c:244
 msgid "Fingerprint: \n"
 msgstr "Huella: \n"
 
-#: src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:254
 msgid "Signature status: "
 msgstr "Estado de la firma: "
 
-#: src/gtk/sslcertwindow.c:235
+#: src/gtk/sslcertwindow.c:261
+#, fuzzy
+msgid "Expired on: "
+msgstr "Caduca en: "
+
+#: src/gtk/sslcertwindow.c:261
 msgid "Expires on: "
 msgstr "Caduca en: "
 
-#: src/gtk/sslcertwindow.c:302
+#: src/gtk/sslcertwindow.c:328
 #, c-format
 msgid "SSL/TLS certificate for %s"
 msgstr "Certificado SSL/TLS para %s"
 
-#: src/gtk/sslcertwindow.c:318
+#: src/gtk/sslcertwindow.c:344
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5423,7 +5460,7 @@ msgstr ""
 "El certificado es para %s, pero la conexión es con %s.\n"
 "Puede que esté conectando con un servidor fraudulento.\n"
 
-#: src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:364
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5432,34 +5469,39 @@ msgstr ""
 "El certificado de %s es desconocido.\n"
 "%s¿Quiere aceptarlo?"
 
-#: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
-#: src/gtk/sslcertwindow.c:464
+#: src/gtk/sslcertwindow.c:374 src/gtk/sslcertwindow.c:424
+#: src/gtk/sslcertwindow.c:488
+msgid "Correct"
+msgstr "Correcto"
+
+#: src/gtk/sslcertwindow.c:376 src/gtk/sslcertwindow.c:426
+#: src/gtk/sslcertwindow.c:490
 #, c-format
 msgid "Signature status: %s"
 msgstr "Estado de la firma: %s"
 
-#: src/gtk/sslcertwindow.c:358 src/gtk/sslcertwindow.c:408
+#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:434
 msgid "_View certificate"
 msgstr "_Mostrar certificado"
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:390
 msgid "SSL/TLS certificate is invalid"
 msgstr "Certificado SSL/TLS inválido"
 
-#: src/gtk/sslcertwindow.c:366
+#: src/gtk/sslcertwindow.c:392
 msgid "SSL/TLS certificate is unknown"
 msgstr "Certificado SSL/TLS desconocido"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
-#: src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:445
+#: src/gtk/sslcertwindow.c:507
 msgid "_Cancel connection"
 msgstr "_Cancelar conexión"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:507
 msgid "_Accept and save"
 msgstr "_Aceptar y guardar"
 
-#: src/gtk/sslcertwindow.c:387
+#: src/gtk/sslcertwindow.c:413
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5468,27 +5510,27 @@ msgstr ""
 "El certificado de %s está caducado.\n"
 "%s¿Quiere continuar?"
 
-#: src/gtk/sslcertwindow.c:414
+#: src/gtk/sslcertwindow.c:440
 msgid "SSL/TLS certificate is invalid and expired"
 msgstr "Certificado SSL/TLS inválido y caducado"
 
-#: src/gtk/sslcertwindow.c:416
+#: src/gtk/sslcertwindow.c:442
 msgid "SSL/TLS certificate is expired"
 msgstr "Certificado SSL/TLS caducado"
 
-#: src/gtk/sslcertwindow.c:419
+#: src/gtk/sslcertwindow.c:445
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: src/gtk/sslcertwindow.c:439
+#: src/gtk/sslcertwindow.c:465
 msgid "New certificate:"
 msgstr "Certificado nuevo:"
 
-#: src/gtk/sslcertwindow.c:444
+#: src/gtk/sslcertwindow.c:470
 msgid "Known certificate:"
 msgstr "Certificado conocido:"
 
-#: src/gtk/sslcertwindow.c:451
+#: src/gtk/sslcertwindow.c:477
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5497,15 +5539,15 @@ msgstr ""
 "El certificado de %s ha cambiado.\n"
 "%s¿Quiere aceptarlo?"
 
-#: src/gtk/sslcertwindow.c:472
+#: src/gtk/sslcertwindow.c:498
 msgid "_View certificates"
 msgstr "_Mostrar certificados"
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:503
 msgid "SSL/TLS certificate changed and is invalid"
 msgstr "Certificado SSL/TLS cambiado e inválido"
 
-#: src/gtk/sslcertwindow.c:479
+#: src/gtk/sslcertwindow.c:505
 msgid "SSL/TLS certificate changed"
 msgstr "Certificado SSL/TLS cambiado"
 
@@ -5515,223 +5557,223 @@ msgstr "Etiquetas:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3381
-#: src/summaryview.c:3399 src/summaryview.c:3420
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3519
+#: src/summaryview.c:3537 src/summaryview.c:3576
 msgid "(No From)"
 msgstr "(Sin remite)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3432
-#: src/summaryview.c:3435
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3588
+#: src/summaryview.c:3591
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/image_viewer.c:100
+#: src/image_viewer.c:127
 msgid "Error:"
 msgstr "Error:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2611
-#: src/plugins/att_remover/att_remover.c:301
-#: src/plugins/pdf_viewer/poppler_viewer.c:696
+#: src/image_viewer.c:310 src/mimeview.c:2657
+#: src/plugins/att_remover/att_remover.c:306
+#: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Nombre del fichero:"
 
-#: src/image_viewer.c:306
+#: src/image_viewer.c:317
 msgid "Filesize:"
 msgstr "Tamaño:"
 
-#: src/image_viewer.c:355
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "Cargar imagen"
 
-#: src/imap.c:576
+#: src/imap.c:577
 msgid "IMAP connection broken\n"
 msgstr "Conexión IMAP rota\n"
 
-#: src/imap.c:615 src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627
-#: src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:644
-#: src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c: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:738 src/imap.c:742
+#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
+#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
+#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
+#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
+#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
+#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
+#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
+#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
+#: src/imap.c:745 src/imap.c:749
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Error IMAP en %s:"
 
-#: src/imap.c:615
+#: src/imap.c:622
 msgid "authenticated"
 msgstr "autenticado"
 
-#: src/imap.c:618
+#: src/imap.c:625
 msgid "not authenticated"
 msgstr "sin autenticación"
 
-#: src/imap.c:621
+#: src/imap.c:628
 msgid "bad state"
 msgstr "estado incorrecto"
 
-#: src/imap.c:624
+#: src/imap.c:631
 msgid "stream error"
 msgstr "error del canal"
 
-#: src/imap.c:627
+#: src/imap.c:634
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "error interpretando (seguramente el servidor no cumple los RFC)"
 
-#: src/imap.c:631
+#: src/imap.c:638
 msgid "connection refused"
 msgstr "conexión rehusada"
 
-#: src/imap.c:634
+#: src/imap.c:641
 msgid "memory error"
 msgstr "error de memoria"
 
-#: src/imap.c:637
+#: src/imap.c:644
 msgid "fatal error"
 msgstr "error fatal"
 
-#: src/imap.c:640
+#: src/imap.c:647
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "error de protocolo (seguramente el servidor no cumple los RFC)"
 
-#: src/imap.c:644
+#: src/imap.c:651
 msgid "connection not accepted"
 msgstr "la conexión no fue aceptada"
 
-#: src/imap.c:647
+#: src/imap.c:654
 msgid "APPEND error"
 msgstr "error de APPEND"
 
-#: src/imap.c:650
+#: src/imap.c:657
 msgid "NOOP error"
 msgstr "error de NOOP"
 
-#: src/imap.c:653
+#: src/imap.c:660
 msgid "LOGOUT error"
 msgstr "error de LOGOUT"
 
-#: src/imap.c:656
+#: src/imap.c:663
 msgid "CAPABILITY error"
 msgstr "error de CAPABILITY"
 
-#: src/imap.c:659
+#: src/imap.c:666
 msgid "CHECK error"
 msgstr "error de CHECK"
 
-#: src/imap.c:662
+#: src/imap.c:669
 msgid "CLOSE error"
 msgstr "error de CLOSE"
 
-#: src/imap.c:665
+#: src/imap.c:672
 msgid "EXPUNGE error"
 msgstr "error de EXPUNGE"
 
-#: src/imap.c:668
+#: src/imap.c:675
 msgid "COPY error"
 msgstr "error de COPY"
 
-#: src/imap.c:671
+#: src/imap.c:678
 msgid "UID COPY error"
 msgstr "error de UID COPY"
 
-#: src/imap.c:674
+#: src/imap.c:681
 msgid "CREATE error"
 msgstr "error de CREATE"
 
-#: src/imap.c:677
+#: src/imap.c:684
 msgid "DELETE error"
 msgstr "error de DELETE"
 
-#: src/imap.c:680
+#: src/imap.c:687
 msgid "EXAMINE error"
 msgstr "error de EXAMINE"
 
-#: src/imap.c:683
+#: src/imap.c:690
 msgid "FETCH error"
 msgstr "error de FETCH"
 
-#: src/imap.c:686
+#: src/imap.c:693
 msgid "UID FETCH error"
 msgstr "error de UID FETCH"
 
-#: src/imap.c:689
+#: src/imap.c:696
 msgid "LIST error"
 msgstr "error de LIST"
 
-#: src/imap.c:692
+#: src/imap.c:699
 msgid "LOGIN error"
 msgstr "error de LOGIN"
 
-#: src/imap.c:695
+#: src/imap.c:702
 msgid "LSUB error"
 msgstr "error de LSUB"
 
-#: src/imap.c:698
+#: src/imap.c:705
 msgid "RENAME error"
 msgstr "error de RENAME"
 
-#: src/imap.c:701
+#: src/imap.c:708
 msgid "SEARCH error"
 msgstr "error de SEARCH"
 
-#: src/imap.c:704
+#: src/imap.c:711
 msgid "UID SEARCH error"
 msgstr "error de UID SEARCH"
 
-#: src/imap.c:707
+#: src/imap.c:714
 msgid "SELECT error"
 msgstr "error de SELECT"
 
-#: src/imap.c:710
+#: src/imap.c:717
 msgid "STATUS error"
 msgstr "error de STATUS"
 
-#: src/imap.c:713
+#: src/imap.c:720
 msgid "STORE error"
 msgstr "error de STORE"
 
-#: src/imap.c:716
+#: src/imap.c:723
 msgid "UID STORE error"
 msgstr "error de UID STORE"
 
-#: src/imap.c:719
+#: src/imap.c:726
 msgid "SUBSCRIBE error"
 msgstr "error de SUBSCRIBE"
 
-#: src/imap.c:722
+#: src/imap.c:729
 msgid "UNSUBSCRIBE error"
 msgstr "error de UNSUBSCRIBE"
 
-#: src/imap.c:725
+#: src/imap.c:732
 msgid "STARTTLS error"
 msgstr "error de STARTTLS"
 
-#: src/imap.c:728
+#: src/imap.c:735
 msgid "INVAL error"
 msgstr "error de INVAL"
 
-#: src/imap.c:731
+#: src/imap.c:738
 msgid "EXTENSION error"
 msgstr "error de EXTENSION"
 
-#: src/imap.c:734
+#: src/imap.c:741
 msgid "SASL error"
 msgstr "error de SASL"
 
-#: src/imap.c:738
+#: src/imap.c:745
 msgid "SSL/TLS error"
 msgstr "error de SSL/TLS"
 
-#: src/imap.c:742
+#: src/imap.c:749
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Error desconocido [%d]"
 
-#: src/imap.c:946
+#: src/imap.c:955
 msgid ""
 "\n"
 "\n"
@@ -5743,7 +5785,7 @@ msgstr ""
 "Las autenticaciones con CRAM-MD5 sólo funcionarán si libetpan ha sido "
 "compilada con soporte SASL y el módulo CRAM-MD5 de SASL está instalado."
 
-#: src/imap.c:952
+#: src/imap.c:961
 msgid ""
 "\n"
 "\n"
@@ -5755,7 +5797,7 @@ msgstr ""
 "Las autenticaciones con DIGEST-MD5 sólo funcionarán si libetpan ha sido "
 "compilada con soporte SASL y el módulo DIGEST-MD5 de SASL está instalado."
 
-#: src/imap.c:958
+#: src/imap.c:967
 msgid ""
 "\n"
 "\n"
@@ -5767,7 +5809,7 @@ msgstr ""
 "Las autenticaciones con SCRAM-SHA-1 sólo funcionarán si libetpan ha sido "
 "compilada con soporte SASL y el módulo SCRAM de SASL está instalado."
 
-#: src/imap.c:964
+#: src/imap.c:973
 msgid ""
 "\n"
 "\n"
@@ -5779,7 +5821,7 @@ msgstr ""
 "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:970
+#: src/imap.c:979
 msgid ""
 "\n"
 "\n"
@@ -5791,37 +5833,37 @@ msgstr ""
 "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:977
+#: src/imap.c:986
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Falló la conexión con %s: autenticación rechazada.%s"
 
-#: src/imap.c:981
+#: src/imap.c:990
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Falló la conexión con %s: autenticación rechazada.%s\n"
 
-#: src/imap.c:999
+#: src/imap.c:1008
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Falló la conexión con %s"
 
-#: src/imap.c:1006 src/imap.c:1009
+#: src/imap.c:1015 src/imap.c:1018
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP con %s se ha desconectado. Reconectando...\n"
 
-#: src/imap.c:1039 src/imap.c:3655 src/imap.c:4314 src/imap.c:4408
-#: src/imap.c:4586 src/imap.c:5397
+#: src/imap.c:1048 src/imap.c:3687 src/imap.c:4346 src/imap.c:4440
+#: src/imap.c:4618 src/imap.c:5429
 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."
 
-#: src/imap.c:1148 src/inc.c:811 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1158 src/inc.c:873 src/news.c:402 src/send_message.c:286
 msgid "Insecure connection"
 msgstr "Conexión insegura"
 
-#: src/imap.c:1149 src/inc.c:812 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1159 src/inc.c:874 src/news.c:403 src/send_message.c:287
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5834,104 +5876,109 @@ msgstr ""
 "\n"
 "¿Quiere seguir conectando con este servidor? La comunicación no sería segura."
 
-#: src/imap.c:1155 src/inc.c:818 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1165 src/inc.c:880 src/news.c:409 src/send_message.c:293
 msgid "Con_tinue connecting"
 msgstr "Seguir conec_tando"
 
-#: src/imap.c:1165
+#: src/imap.c:1174
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor IMAP: %s:%d..."
 
-#: src/imap.c:1213
+#: src/imap.c:1239
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "No se puede conectar al servidor IMAP: %s:%d"
 
-#: src/imap.c:1216
+#: src/imap.c:1242
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP: %s:%d\n"
 
-#: src/imap.c:1249 src/imap.c:4076
+#: src/imap.c:1274 src/imap.c:4108
 msgid "Can't start STARTTLS session.\n"
 msgstr "No se puede iniciar la sesión STARTTLS.\n"
 
-#: src/imap.c:1316
+#: src/imap.c:1343
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No se puede entrar al servidor IMAP %s.\n"
 
-#: src/imap.c:1319
+#: src/imap.c:1346
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No se puede entrar al servidor IMAP %s."
 
-#: src/imap.c:1746
+#: src/imap.c:1774
 msgid "Adding messages..."
 msgstr "Añadiendo mensajes..."
 
-#: src/imap.c:1951 src/mh.c:529
+#: src/imap.c:1979 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
-#: src/imap.c:2544
+#: src/imap.c:2501
+#, fuzzy
+msgid "Search failed due to server error."
+msgstr "Falló: error de la red."
+
+#: src/imap.c:2580
 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags «borrado»\n"
 
-#: src/imap.c:2551 src/imap.c:5027
+#: src/imap.c:2587 src/imap.c:5059
 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 
-#: src/imap.c:2902
+#: src/imap.c:2938
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 
-#: src/imap.c:2905
+#: src/imap.c:2941
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 
-#: src/imap.c:3195
+#: 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:3210
+#: src/imap.c:3242
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: src/imap.c:3341
+#: src/imap.c:3373
 #, 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:3454
+#: src/imap.c:3486
 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buzón\n"
 
-#: src/imap.c:3733
+#: src/imap.c:3765
 msgid "LIST failed\n"
 msgstr "LIST falló\n"
 
-#: src/imap.c:3818
+#: src/imap.c:3850
 msgid "Flagging messages..."
 msgstr "Etiquetando mensajes..."
 
-#: src/imap.c:3921
+#: src/imap.c:3953
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4073
+#: src/imap.c:4105
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "El servidor necesita STARTTLS para acceder a él.\n"
 
-#: src/imap.c:4083
+#: src/imap.c:4115
 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
-#: src/imap.c:4088
+#: src/imap.c:4120
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5940,20 +5987,20 @@ msgstr ""
 "La conexión con %s falló: el servidor necesita STARTTLS, pero Claws Mail ha "
 "sido compilado sin soporte para STARTTLS.\n"
 
-#: src/imap.c:4096
+#: src/imap.c:4128
 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor están deshabilitados.\n"
 
-#: src/imap.c:4319
+#: src/imap.c:4351
 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 
-#: src/imap.c:5020
+#: src/imap.c:5052
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no se pueden establecer los flags 'borrado': %d\n"
 
-#: src/imap.c:6055
+#: src/imap.c:6087
 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"
@@ -6004,7 +6051,7 @@ msgstr "S_uscripciones"
 msgid "_Subscribe..."
 msgstr "_Suscribir..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Unsubscribe..."
 msgstr "Des_uscribir..."
 
@@ -6036,25 +6083,26 @@ msgstr ""
 "sólo y no correo, añada «/» al final del nombre)"
 
 #: src/imap_gtk.c:198 src/mh_gtk.c:147
-msgid "Inherit properties from parent folder"
+#, fuzzy
+msgid "Inherit properties and processing rules from parent folder"
 msgstr "Heredar las propiedades de la carpeta padre"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:421 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2055
+#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
+#: src/plugins/vcalendar/vcal_folder.c:2060
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Introduzca el nuevo nombre para «%s»:"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
-#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2056
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
+#: src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2061
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:452 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2076
+#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:220
+#: src/plugins/vcalendar/vcal_folder.c:2081
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6062,21 +6110,17 @@ msgstr ""
 "No se puede renombrar la carpeta.\n"
 "El nuevo nombre no está permitido."
 
-#: src/imap_gtk.c:318 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:373
-#: src/summaryview.c:4626
-msgid "Select folder to move selected message to"
-msgid_plural "Select folder to move selected messages to"
-msgstr[0] "Seleccionar la carpeta a la que mover el mensaje seleccionado"
-msgstr[1] "Seleccionar la carpeta a la que mover los mensajes seleccionados"
+#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:372
+#, fuzzy, c-format
+msgid "Select folder to move folder '%s' to"
+msgstr "Seleccionar la carpeta a la que mover el mensaje seleccionado"
 
-#: src/imap_gtk.c:339 src/mh_gtk.c:329 src/plugins/mailmbox/plugin_gtk.c:394
-#: src/summaryview.c:4711
-msgid "Select folder to copy selected message to"
-msgid_plural "Select folder to copy selected messages to"
-msgstr[0] "Seleccionar la carpeta a la que copiar el mensaje seleccionado"
-msgstr[1] "Seleccionar la carpeta a la que copiar los mensajes seleccionados"
+#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:392
+#, fuzzy, c-format
+msgid "Select folder to copy folder '%s' to"
+msgstr "Seleccionar la carpeta a la que copiar el mensaje seleccionado"
 
-#: src/imap_gtk.c:367 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:153
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6089,44 +6133,44 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarlos?"
 
-#: src/imap_gtk.c:386 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:2009
+#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/plugins/rssyl/rssyl_cb_menu.c:172
+#: src/plugins/vcalendar/vcal_folder.c:2014
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
 
-#: src/imap_gtk.c:508
+#: src/imap_gtk.c:506
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "¿Quiere buscar subcarpetas no suscritas de «%s»?"
 
-#: src/imap_gtk.c:511
+#: src/imap_gtk.c:509
 msgid "Search recursively"
 msgstr "Buscar recursivamente"
 
-#: src/imap_gtk.c:516 src/imap_gtk.c:575
+#: src/imap_gtk.c:514 src/imap_gtk.c:573
 msgid "Subscriptions"
 msgstr "Suscripciones"
 
-#: src/imap_gtk.c:517
+#: src/imap_gtk.c:515
 msgid "_Search"
 msgstr "_Buscar"
 
-#: src/imap_gtk.c:527
+#: src/imap_gtk.c:525
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Elija una subcarpeta de %s a la que suscribirse: "
 
-#: src/imap_gtk.c:538 src/mainwindow.c:680
+#: src/imap_gtk.c:536 src/mainwindow.c:689
 msgid "Subscribe"
 msgstr "Suscribir"
 
-#: src/imap_gtk.c:540 src/imap_gtk.c:542
+#: src/imap_gtk.c:538 src/imap_gtk.c:540
 msgid "All of them"
 msgstr "Todas ellas"
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:556
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6138,29 +6182,29 @@ msgstr ""
 "Si hay nuevas carpetas, creadas y suscritas desde otro cliente, utilice "
 "«Comprobar si hay carpetas nuevas» en la raíz del buzón."
 
-#: src/imap_gtk.c:567
+#: src/imap_gtk.c:565
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "¿Quiere %s la carpeta «%s»?"
 
-#: src/imap_gtk.c:568
+#: src/imap_gtk.c:566
 msgid "subscribe"
 msgstr "suscribir"
 
-#: src/imap_gtk.c:568
+#: src/imap_gtk.c:566
 msgid "unsubscribe"
 msgstr "desuscribir"
 
-#: src/imap_gtk.c:570 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
-#: src/prefs_folder_item.c:1503
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1537 src/prefs_folder_item.c:1565
+#: src/prefs_folder_item.c:1593
 msgid "Apply to subfolders"
 msgstr "Aplicar a subcarpetas"
 
-#: src/imap_gtk.c:576
+#: src/imap_gtk.c:574
 msgid "_Subscribe"
 msgstr "_Suscribir"
 
-#: src/imap_gtk.c:577 src/news_gtk.c:252
+#: src/imap_gtk.c:574 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
@@ -6212,23 +6256,23 @@ msgstr "Seleccione y renombre los campos LDIF a importar."
 msgid "File imported."
 msgstr "Fichero importado."
 
-#: src/importldif.c:450 src/importmutt.c:122 src/importpine.c:121
+#: src/importldif.c:334 src/importmutt.c:122 src/importpine.c:121
 msgid "Please select a file."
 msgstr "Seleccione un fichero."
 
-#: src/importldif.c:456 src/importmutt.c:127 src/importpine.c:126
+#: src/importldif.c:340 src/importmutt.c:127 src/importpine.c:126
 msgid "Address book name must be supplied."
 msgstr "Debe proporcionar un nombre de agenda de direcciones."
 
-#: src/importldif.c:496
+#: src/importldif.c:380
 msgid "LDIF file imported successfully."
 msgstr "Fichero LDIF importado con éxito."
 
-#: src/importldif.c:581
+#: src/importldif.c:465
 msgid "Select LDIF File"
 msgstr "Seleccionar fichero LDIF"
 
-#: src/importldif.c:667
+#: src/importldif.c:551
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
@@ -6236,43 +6280,43 @@ msgstr ""
 "Especifique el nombre para la agenda que será creada a partir de los datos "
 "del fichero LDIF."
 
-#: src/importldif.c:672
+#: src/importldif.c:556
 msgid "File Name"
 msgstr "Nombre del fichero"
 
-#: src/importldif.c:682
+#: src/importldif.c:566
 msgid "The full file specification of the LDIF file to import."
 msgstr "La especificación completa del fichero LDIF a importar."
 
-#: src/importldif.c:689
+#: src/importldif.c:573
 msgid "Select the LDIF file to import."
 msgstr "Seleccione el fichero LDIF a importar."
 
-#: src/importldif.c:725
+#: src/importldif.c:705
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:726 src/summaryview.c:440
+#: src/importldif.c:710 src/summaryview.c:464
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:727
+#: src/importldif.c:716
 msgid "LDIF Field Name"
 msgstr "Nombre de campo LDIF"
 
-#: src/importldif.c:728
+#: src/importldif.c:721
 msgid "Attribute Name"
 msgstr "Nombre de atributo"
 
-#: src/importldif.c:783
+#: src/importldif.c:740
 msgid "LDIF Field"
 msgstr "Campo LDIF"
 
-#: src/importldif.c:795
+#: src/importldif.c:752
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/importldif.c:807
+#: src/importldif.c:764
 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 "
@@ -6290,35 +6334,35 @@ msgstr ""
 "debajo de la lista. Doble clic en cualquier parte de la fila y también será "
 "seleccionado el campo para importar."
 
-#: src/importldif.c:822
+#: src/importldif.c:779
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "El campo LDIF puede renombrarse al nombre del atributo de usuario."
 
-#: src/importldif.c:827
+#: src/importldif.c:784
 msgid "Select for Import"
 msgstr "Seleccionar para importar"
 
-#: src/importldif.c:832
+#: src/importldif.c:789
 msgid "Select the LDIF field for import into the address book."
 msgstr "Seleccionar el campo LDIF para importarlo a la agenda."
 
-#: src/importldif.c:834
+#: src/importldif.c:791
 msgid " Modify "
 msgstr " Modificar "
 
-#: src/importldif.c:839
+#: src/importldif.c:796
 msgid "This button will update the list above with the data supplied."
 msgstr "Este botón actualizará la lista superior con los datos proporcionados."
 
-#: src/importldif.c:911
+#: src/importldif.c:870
 msgid "Records Imported:"
 msgstr "Registros importados :"
 
-#: src/importldif.c:943
+#: src/importldif.c:902
 msgid "Import LDIF file into Address Book"
 msgstr "Importar fichero LDIF a la agenda"
 
-#: src/importldif.c:980
+#: src/importldif.c:939
 msgid "Proceed"
 msgstr "Proceder"
 
@@ -6350,142 +6394,142 @@ msgstr "Seleccionar fichero Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importar fichero Pine a la agenda"
 
-#: src/inc.c:186 src/inc.c:294 src/inc.c:321
+#: src/inc.c:191 src/inc.c:299 src/inc.c:325
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail necesita acceso a la red para poder obtener el correo."
 
-#: src/inc.c:343
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s falló\n"
 
-#: src/inc.c:416
+#: src/inc.c:476
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:474
+#: src/inc.c:534
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:615 src/inc.c:669
+#: src/inc.c:675 src/inc.c:729
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:626
+#: src/inc.c:686
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:635
+#: src/inc.c:695
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Hecho (%d mensaje (%s) recibido)"
 msgstr[1] "Hecho (%d mensajes (%s) recibidos)"
 
-#: src/inc.c:641
+#: src/inc.c:701
 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 
-#: src/inc.c:646
+#: src/inc.c:706
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:887
+#: src/inc.c:709 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:454
-#: src/prefs_summary_column.c:88 src/summaryview.c:2806 src/summaryview.c:6319
+#: src/inc.c:716 src/prefs_matcher.c:407 src/prefs_summaries.c:624
+#: src/prefs_summary_column.c:87 src/summaryview.c:2914 src/summaryview.c:6589
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:726 src/plugins/spamassassin/spamassassin_gtk.c:394
 msgid "Timeout"
 msgstr "Tiempo límite"
 
-#: src/inc.c:752
+#: src/inc.c:812
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Finalizado (%d mensaje nuevo)"
 msgstr[1] "Finalizado (%d mensajes nuevos)"
 
-#: src/inc.c:756
+#: src/inc.c:816
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:795
+#: src/inc.c:857
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:825
+#: src/inc.c:886
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor POP3: %s:%d..."
 
-#: src/inc.c:843
+#: src/inc.c:920
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "No se puede conectar al servidor POP3: %s:%d"
 
-#: src/inc.c:847
+#: src/inc.c:924
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
-#: src/send_message.c:496
+#: src/inc.c:1004 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:515
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:929
+#: src/inc.c:1006
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Obteniendo mensajes de %s (%s)..."
 
-#: src/inc.c:935
+#: src/inc.c:1012
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:939
+#: src/inc.c:1016
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:943
+#: src/inc.c:1020
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:947
+#: src/inc.c:1024
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de los mensajes (LIST)..."
 
-#: src/inc.c:954 src/send_message.c:514
+#: src/inc.c:1031 src/send_message.c:533
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:979
+#: src/inc.c:1056
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:992
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Recuperando (%d mensaje (%s) recibido)"
 msgstr[1] "Recuperando (%d mensajes (%s) recibidos)"
 
-#: src/inc.c:1151
+#: src/inc.c:1228
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Ha fallado la conexión con %s:%d."
 
-#: src/inc.c:1156
+#: src/inc.c:1233
 msgid "Error occurred while processing mail."
 msgstr "Ocurrió un error mientras se procesaba el correo."
 
-#: src/inc.c:1162
+#: src/inc.c:1239
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6494,37 +6538,37 @@ msgstr ""
 "Ocurrió un error mientras se procesaba el correo:\n"
 "%s"
 
-#: src/inc.c:1168
+#: src/inc.c:1245
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1173
+#: src/inc.c:1250
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1178
+#: src/inc.c:1255
 msgid "Socket error."
 msgstr "Error de conector."
 
-#: src/inc.c:1181
+#: src/inc.c:1258
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Error de conector conectando con %s:%d."
 
-#: src/inc.c:1186 src/send_message.c:425 src/send_message.c:688
+#: src/inc.c:1263 src/send_message.c:444 src/send_message.c:707
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1189
+#: src/inc.c:1266
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Conexión con %s:%d cerrada por la máquina remota."
 
-#: src/inc.c:1194
+#: src/inc.c:1271
 msgid "Mailbox is locked."
 msgstr "El buzón está bloqueado."
 
-#: src/inc.c:1198
+#: src/inc.c:1275
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6533,11 +6577,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1204 src/send_message.c:673
+#: src/inc.c:1281 src/send_message.c:692
 msgid "Authentication failed."
 msgstr "La autenticación falló."
 
-#: src/inc.c:1210 src/send_message.c:676
+#: src/inc.c:1287 src/send_message.c:695
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6546,7 +6590,7 @@ msgstr ""
 "La autenticación falló:\n"
 "%s"
 
-#: src/inc.c:1215 src/send_message.c:692
+#: src/inc.c:1292 src/send_message.c:711
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6554,38 +6598,85 @@ msgstr ""
 "La sesión ha expirado. Puede ser capaz de recuperarla incrementando el "
 "tiempo límite de la sesión en «Preferencias/Otras/Miscelánea»."
 
-#: src/inc.c:1220
+#: src/inc.c:1297
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "La conexión con %s:%d excedió el límite de tiempo."
 
-#: src/inc.c:1258
+#: src/inc.c:1335
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1523
-#, c-format
-msgid "%s%sYou're working offline. Override for %d minutes?"
+#: src/inc.c:1627 src/plugins/notification/notification_prefs.c:1072
+#: src/plugins/notification/notification_prefs.c:1367
+#: src/plugins/notification/notification_prefs.c:1673
+#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1789
+#: src/prefs_other.c:577 src/prefs_receive.c:203 src/prefs_summaries.c:530
+msgid "seconds"
+msgstr "segundos"
+
+#: src/inc.c:1637 src/inc.c:1647
+#, fuzzy
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minutos"
+msgstr[1] "minutos"
+
+#: src/inc.c:1640
+#, fuzzy
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "horas"
+msgstr[1] "horas"
+
+#: src/inc.c:1652
+#, fuzzy, c-format
+msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sEstá trabajando sin conexión. ¿Ignorarlo durante %d minutos?"
 
-#: src/inc.c:1529
+#: src/inc.c:1658
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sEstá trabajando sin conexión ¿Ignorar?"
 
-#: src/inc.c:1536
+#: src/inc.c:1665
 msgid "On_ly once"
 msgstr "Só_lo una vez"
 
-#: src/ldapupdate.c:1056
+#: src/ldapupdate.c:680
+#, c-format
+msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
+msgstr ""
+
+#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
+#: src/ldapupdate.c:1330
+#, c-format
+msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
+msgstr ""
+
+#: src/ldapupdate.c:1046
 msgid "Some SN"
 msgstr "Algún SN"
 
-#: src/ldif.c:758
+#: src/ldapupdate.c:1133
+#, c-format
+msgid "LDAP error (rename): from '%s' to '%s': %d (%s)\n"
+msgstr ""
+
+#: src/ldaputil.c:81 src/ldaputil.c:156
+msgid "LDAP (search): successful\n"
+msgstr ""
+
+#: src/ldaputil.c:112 src/ldaputil.c:200
+#, c-format
+msgid "LDAP error (search): %d (%s)\n"
+msgstr ""
+
+#: src/ldif.c:759
 msgid "Nick Name"
 msgstr "Apodo"
 
-#: src/main.c:246
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6594,7 +6685,7 @@ msgstr ""
 "El fichero «%s» ya existe.\n"
 "No se puede crear la carpeta."
 
-#: src/main.c:367
+#: src/main.c:375
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6603,7 +6694,7 @@ msgstr ""
 "Encontrada configuración para %s.\n"
 "¿Desea migrar esta configuración?"
 
-#: src/main.c:369
+#: src/main.c:377
 #, c-format
 msgid ""
 "\n"
@@ -6616,11 +6707,11 @@ msgstr ""
 "Sus reglas de filtrado de Sylpheed se pueden convertir\n"
 "con un script que encontrará en %s."
 
-#: src/main.c:381
+#: src/main.c:389
 msgid "Keep old configuration"
 msgstr "Conservar la configuración antigua"
 
-#: src/main.c:384
+#: src/main.c:392
 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 "
@@ -6630,31 +6721,31 @@ msgstr ""
 "pero puede tardar cierto tiempo si tiene datos de Noticias o IMAP cacheados "
 "y ocupará espacio adicional en el disco."
 
-#: src/main.c:392
+#: src/main.c:400
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:403
+#: src/main.c:411
 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando configuración... Esto puede tardar un rato..."
 
-#: src/main.c:412
+#: src/main.c:420
 msgid "Migration failed!"
 msgstr "¡La migración falló!"
 
-#: src/main.c:421
+#: src/main.c:429
 msgid "Migrating configuration..."
 msgstr "Migrando la configuración..."
 
-#: src/main.c:1128
+#: src/main.c:1141
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no está soportado por glib.\n"
 
-#: src/main.c:1148 src/main.c:1152 src/main.c:1156
+#: src/main.c:1161 src/main.c:1165 src/main.c:1169
 msgid "(or older)"
 msgstr "(o anterior)"
 
-#: src/main.c:1457
+#: src/main.c:1510
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6673,7 +6764,7 @@ msgstr[1] ""
 "de los módulos para más información:\n"
 "%s"
 
-#: src/main.c:1508
+#: src/main.c:1552
 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 "
@@ -6683,7 +6774,7 @@ msgstr ""
 "ser debido a una cuenta IMAP que esté fallando. Utilice «Reconstruir árbol "
 "de carpetas» en la carpeta padre del buzón para intentar arreglarlo."
 
-#: src/main.c:1514
+#: src/main.c:1558
 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 "
@@ -6693,36 +6784,36 @@ msgstr ""
 "probable que esté soportado por un módulo externo desactualizado. Por favor "
 "reinstale el módulo e inténtelo de nuevo."
 
-#: src/main.c:1759
+#: src/main.c:1798
 msgid "Missing filename\n"
 msgstr "Falta el nombre de fichero\n"
 
-#: src/main.c:1766
+#: src/main.c:1805
 msgid "Cannot open filename for reading\n"
 msgstr "No se puede abrir el fichero para lectura\n"
 
-#: src/main.c:1777
+#: src/main.c:1816
 msgid "Malformed header\n"
 msgstr "Cabecera mal formada\n"
 
-#: src/main.c:1784
+#: src/main.c:1823
 msgid "Duplicated 'To:' header\n"
 msgstr "Cabecera «To:» duplicada\n"
 
-#: src/main.c:1795
+#: src/main.c:1834
 msgid "Missing required 'To:' header\n"
 msgstr "Falta la cabecera «To:» obligatoria\n"
 
-#: src/main.c:1938
+#: src/main.c:1979
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:1940
+#: src/main.c:1981
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de edición"
 
-#: src/main.c:1941
+#: src/main.c:1982
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6740,11 +6831,11 @@ msgstr ""
 "vacía,\n"
 "                         después el cuerpo hasta fin de fichero."
 
-#: src/main.c:1946
+#: src/main.c:1987
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      suscribirse a la URI dada si es posible"
 
-#: src/main.c:1947
+#: src/main.c:1988
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6754,23 +6845,34 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:1950
+#: src/main.c:1991
+#, fuzzy
+msgid ""
+"  --insert file1 [file2]...\n"
+"                         open composition window with specified files\n"
+"                         inserted"
+msgstr ""
+"  --attach fich1 [fich2]...\n"
+"                         abre la ventana de composición con los ficheros\n"
+"                         especificados como adjuntos"
+
+#: src/main.c:1994
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe los mensajes nuevos"
 
-#: src/main.c:1951
+#: src/main.c:1995
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe mensajes nuevos de todas las cuentas"
 
-#: src/main.c:1952
+#: src/main.c:1996
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     cancela la recepción de mensajes en curso"
 
-#: src/main.c:1953
+#: src/main.c:1997
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       cancela el envío de mensajes en curso"
 
-#: src/main.c:1954
+#: src/main.c:1998
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6790,15 +6892,15 @@ msgstr ""
 "                         recursivo: falso si parám. empieza por: 0, n, N, f "
 "o F"
 
-#: src/main.c:1961
+#: src/main.c:2005
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:1962
+#: src/main.c:2006
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:1963
+#: src/main.c:2007
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6806,15 +6908,15 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:1965
+#: src/main.c:2009
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           muestra las estadísticas de la sesión"
 
-#: src/main.c:1966
+#: src/main.c:2010
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     reinicializa las estadísticas de la sesión"
 
-#: src/main.c:1967
+#: src/main.c:2011
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6822,35 +6924,35 @@ msgstr ""
 "  --select carpt[/mnsj]  va a la carpeta/mensaje especificados\n"
 "                         carpt es un identificador como «carpeta/subcarpeta»"
 
-#: src/main.c:1969
+#: src/main.c:2013
 msgid "  --online               switch to online mode"
 msgstr "  --online               cambiar a modo de trabajo con conexión"
 
-#: src/main.c:1970
+#: src/main.c:2014
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              cambiar a modo de trabajo sin conexión"
 
-#: src/main.c:1971
+#: src/main.c:2015
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       salir de Claws Mail"
 
-#: src/main.c:1972
+#: src/main.c:2016
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:1973
+#: src/main.c:2017
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         activa o desactiva el modo de depuración"
 
-#: src/main.c:1974
+#: src/main.c:2018
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              presenta esta ayuda y finaliza"
 
-#: src/main.c:1975
+#: src/main.c:2019
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           informa de la versión y finaliza"
 
-#: src/main.c:1976
+#: src/main.c:2020
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6858,11 +6960,11 @@ msgstr ""
 "  --version-full -V      informa de la versión y características incluidas y "
 "finaliza"
 
-#: src/main.c:1977
+#: src/main.c:2021
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           muestra el directorio del configuración"
 
-#: src/main.c:1978
+#: src/main.c:2022
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6870,7 +6972,7 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         usa el directorio del configuración especificado"
 
-#: src/main.c:1980
+#: src/main.c:2024
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6878,867 +6980,878 @@ msgstr ""
 "  --geometry -geometry ANxAL+X+Y\n"
 "                         establece la geometría de la ventana principal"
 
-#: src/main.c:2033
-msgid "Unknown option\n"
-msgstr "Error desconocido\n"
+#: src/main.c:2077
+msgid "Unknown option. Try -h or --help for usage.\n"
+msgstr ""
 
-#: src/main.c:2051
+#: src/main.c:2095
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Procesando (%s)..."
 
-#: src/main.c:2054
+#: src/main.c:2098
 msgid "top level folder"
 msgstr "carpeta superior"
 
-#: src/main.c:2137
+#: src/main.c:2180
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:2138
+#: src/main.c:2181
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:2880
+#: src/main.c:2939
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: la red está conectada.\n"
 
-#: src/main.c:2886
+#: src/main.c:2945
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la red está desconectada.\n"
 
-#: src/mainwindow.c:513 src/messageview.c:208
+#: src/mainwindow.c:522 src/messageview.c:211
 msgid "_File"
 msgstr "_Fichero"
 
-#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:435
+#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:445
 msgid "_View"
 msgstr "_Ver"
 
-#: src/mainwindow.c:518
+#: src/mainwindow.c:527
 msgid "_Configuration"
 msgstr "_Configuración"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:531
 msgid "_Add mailbox"
 msgstr "_Añadir buzón"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:532
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:535
 msgid "Change mailbox order..."
 msgstr "Reorganizar buzones..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:538
 msgid "_Import mbox file..."
 msgstr "_Importar fichero mbox..."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:539
 msgid "_Export to mbox file..."
 msgstr "_Exportar a fichero mbox..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:540
 msgid "_Export selected to mbox file..."
 msgstr "_Exportar la selección a un fichero mbox..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:542
 msgid "Empty all _Trash folders"
 msgstr "Vaciar _todas las papeleras"
 
-#: src/mainwindow.c:536 src/messageview.c:217
+#: src/mainwindow.c:545 src/messageview.c:220
 msgid "_Save email as..."
 msgstr "_Guardar mensaje como..."
 
-#: src/mainwindow.c:537 src/messageview.c:218
+#: src/mainwindow.c:546 src/messageview.c:221
 msgid "_Save part as..."
 msgstr "_Guardar parte como..."
 
-#: src/mainwindow.c:540 src/messageview.c:219
+#: src/mainwindow.c:549 src/messageview.c:222
 msgid "Page setup..."
 msgstr "Configurar página..."
 
-#: src/mainwindow.c:541 src/messageview.c:220
+#: src/mainwindow.c:550 src/messageview.c:223
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:552
 msgid "Synchronise folders"
 msgstr "Sincronizar carpetas"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:554
 msgid "E_xit"
 msgstr "_Salir"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:559
 msgid "Select _thread"
 msgstr "Seleccionar _hilo"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:561
 msgid "_Find in current message..."
 msgstr "_Buscar en el mensaje actual..."
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:563
 msgid "_Quick search"
 msgstr "Búsqueda _rápida"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:566
 msgid "Show or hi_de"
 msgstr "Mostrar u o_cultar"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:567
 msgid "_Toolbar"
 msgstr "_Barra de herramientas"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:569
 msgid "Set displayed _columns"
 msgstr "Establecer _columnas visibles"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:570
 msgid "In _folder list..."
 msgstr "En la lista de _carpetas..."
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:571
 msgid "In _message list..."
 msgstr "En la lista de _mensajes..."
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:576
 msgid "La_yout"
 msgstr "_Aspecto"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:578
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:580
 msgid "_Attract by subject"
 msgstr "_Atraer por asunto"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:582
 msgid "E_xpand all threads"
 msgstr "E_xpandir todos los hilos"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:583
 msgid "Co_llapse all threads"
 msgstr "Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:576 src/messageview.c:231
+#: src/mainwindow.c:585 src/messageview.c:234
 msgid "_Go to"
 msgstr "_Ir a"
 
-#: src/mainwindow.c:577 src/messageview.c:232
+#: src/mainwindow.c:586 src/messageview.c:235
 msgid "_Previous message"
 msgstr "Mensaje _anterior"
 
-#: src/mainwindow.c:578 src/messageview.c:233
+#: src/mainwindow.c:587 src/messageview.c:236
 msgid "_Next message"
 msgstr "Mensaje _siguiente"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:589 src/messageview.c:238
 msgid "P_revious unread message"
 msgstr "Mensaje a_nterior no leído"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:590 src/messageview.c:239
 msgid "N_ext unread message"
 msgstr "Mensaje s_iguiente no leído"
 
-#: src/mainwindow.c:583 src/messageview.c:238
+#: src/mainwindow.c:592 src/messageview.c:241
 msgid "Previous ne_w message"
 msgstr "Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:593 src/messageview.c:242
 msgid "Ne_xt new message"
 msgstr "Mensaje nuev_o siguiente"
 
-#: src/mainwindow.c:586 src/messageview.c:241
+#: src/mainwindow.c:595 src/messageview.c:244
 msgid "Previous _marked message"
 msgstr "Mensaje _marcado anterior"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:596 src/messageview.c:245
 msgid "Next m_arked message"
 msgstr "Mensaje m_arcado siguiente"
 
-#: src/mainwindow.c:589 src/messageview.c:244
+#: src/mainwindow.c:598 src/messageview.c:247
 msgid "Previous _labeled message"
 msgstr "Mensaje _etiquetado anterior"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:599 src/messageview.c:248
 msgid "Next la_beled message"
 msgstr "Mensaje e_tiquetado siguiente"
 
-#: src/mainwindow.c:592 src/messageview.c:247
+#: src/mainwindow.c:601 src/messageview.c:250
 msgid "Previous opened message"
 msgstr "Mensaje abierto anterior"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:602 src/messageview.c:251
 msgid "Next opened message"
 msgstr "Mensaje abierto siguiente"
 
-#: src/mainwindow.c:595 src/messageview.c:250
+#: src/mainwindow.c:604 src/messageview.c:253
 msgid "Parent message"
 msgstr "Mensaje padre"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:606 src/messageview.c:255
 msgid "Next unread _folder"
 msgstr "Siguiente _carpeta sin leer"
 
-#: src/mainwindow.c:598 src/messageview.c:253
+#: src/mainwindow.c:607 src/messageview.c:256
 msgid "F_older..."
 msgstr "_Carpeta..."
 
-#: src/mainwindow.c:600 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:229
 msgid "Next part"
 msgstr "Parte siguiente"
 
-#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:230
 msgid "Previous part"
 msgstr "Parte anterior"
 
-#: src/mainwindow.c:604 src/messageview.c:257
+#: src/mainwindow.c:613 src/messageview.c:260
 msgid "Message scroll"
 msgstr "Desplazamiento del mensaje"
 
-#: src/mainwindow.c:605 src/messageview.c:258
+#: src/mainwindow.c:614 src/messageview.c:261
 msgid "Previous line"
 msgstr "Línea anterior"
 
-#: src/mainwindow.c:606 src/messageview.c:259
+#: src/mainwindow.c:615 src/messageview.c:262
 msgid "Next line"
 msgstr "Línea siguiente"
 
-#: src/mainwindow.c:607 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:475
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:481
 msgid "Next page"
 msgstr "Página siguiente"
 
-#: src/mainwindow.c:626 src/messageview.c:279
+#: src/mainwindow.c:635 src/messageview.c:282
 msgid "Decode"
 msgstr "Decodificar"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:642
 msgid "Open in new _window"
 msgstr "Abrir en ventana _nueva"
 
-#: src/mainwindow.c:634 src/messageview.c:286
+#: src/mainwindow.c:643 src/messageview.c:289
 msgid "Mess_age source"
 msgstr "Fuente del mens_aje"
 
-#: src/mainwindow.c:636 src/messageview.c:287
+#: src/mainwindow.c:645 src/messageview.c:290
 msgid "Message part"
 msgstr "Parte del mensaje"
 
-#: src/mainwindow.c:637 src/messageview.c:288
+#: src/mainwindow.c:646 src/messageview.c:291
 msgid "View as text"
 msgstr "Mostrar como texto"
 
-#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:491
+#: src/mainwindow.c:647 src/messageview.c:292 src/toolbar.c:494
 msgid "Open"
 msgstr "Abrir"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:649 src/messageview.c:294
 msgid "Open with..."
 msgstr "Abrir con..."
 
-#: src/mainwindow.c:644 src/messageview.c:294
+#: src/mainwindow.c:653 src/messageview.c:297
 msgid "Quotes"
 msgstr "Citas"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "_Update summary"
 msgstr "_Actualizar resumen"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "Recei_ve"
 msgstr "Reci_bir"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "Get from _current account"
 msgstr "De la cuenta _actual"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:660
 msgid "Get from _all accounts"
 msgstr "De _todas las cuentas"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "Cancel receivin_g"
 msgstr "Cancelar re_cepción"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:664
 msgid "_Send queued messages"
 msgstr "_Enviar mensajes en la cola"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:669
 msgid "Compose a_n email message"
 msgstr "Compo_ner un mensaje de correo"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:670
 msgid "Compose a news message"
 msgstr "Componer un mensaje de noticias"
 
-#: src/mainwindow.c:663 src/messageview.c:300
-#: src/plugins/notification/notification_banner.c:95
+#: src/mainwindow.c:672 src/messageview.c:303
+#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:429
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:427
+#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:430
 msgid "Repl_y to"
 msgstr "Respon_der a"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:433
 msgid "Mailing _list"
 msgstr "_Lista-Correo"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:677
 msgid "Follow-up and reply to"
 msgstr "Seguir y responder a"
 
-#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2368
+#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:435
+#: src/toolbar.c:2449
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2369
+#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:436
+#: src/toolbar.c:2450
 msgid "For_ward as attachment"
 msgstr "Reen_viar como adjunto"
 
-#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2370
+#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:437
+#: src/toolbar.c:2451
 msgid "Redirec_t"
 msgstr "Redirigi_r"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "Mailing-_List"
 msgstr "Lista-Correo"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:685
 msgid "Post"
 msgstr "Postear"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "Help"
 msgstr "_Ayuda"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "Unsubscribe"
 msgstr "Desuscribir"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "View archive"
 msgstr "Ver archivo"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:695
 msgid "Contact owner"
 msgstr "Contactar proprietario"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:699
 msgid "M_ove..."
 msgstr "M_over..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:700
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "Move to _trash"
 msgstr "Mover a la p_apelera"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "_Delete..."
 msgstr "_Borrar..."
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:703
 msgid "Move thread to tr_ash"
 msgstr "Mover hilo a la p_apelera"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "Delete t_hread"
 msgstr "Borrar _hilo"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "Cancel a news message"
 msgstr "Cancelar una noticia"
 
-#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:428
+#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:438
 msgid "_Mark"
 msgstr "_Marcar"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:710
 msgid "_Unmark"
 msgstr "_Desmarcar"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:713
 msgid "Mark as rea_d"
 msgstr "Marcar como _leído"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:714
 msgid "Mark as unr_ead"
 msgstr "Marcar como _no leído"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:716
 msgid "Mark all read"
 msgstr "Marcar todos como leídos"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "Mark all unread"
 msgstr "Marcar todos como no leídos"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:199 src/toolbar.c:242
-#: src/toolbar.c:500
+#: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
+#: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr "Ignorar hilo"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:720
 msgid "Unignore thread"
 msgstr "Dejar de ignorar hilo"
 
-#: src/mainwindow.c:712 src/prefs_filtering_action.c:200 src/toolbar.c:243
-#: src/toolbar.c:501
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:194 src/toolbar.c:243
+#: src/toolbar.c:504
 msgid "Watch thread"
 msgstr "Observar hilo"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:722
 msgid "Unwatch thread"
 msgstr "Dejar de observar hilo"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "Mark as _spam"
 msgstr "Marcar como ba_sura"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "Mark as _ham"
 msgstr "Marcar como _bueno"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:504
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:177 src/toolbar.c:507
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:505
+#: src/mainwindow.c:730 src/prefs_filtering_action.c:178 src/toolbar.c:508
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: src/mainwindow.c:723 src/summaryview.c:429
+#: src/mainwindow.c:732 src/summaryview.c:439
 msgid "Color la_bel"
 msgstr "Etiqueta de co_lor"
 
-#: src/mainwindow.c:724 src/summaryview.c:430
+#: src/mainwindow.c:733 src/summaryview.c:440
 msgid "Ta_gs"
 msgstr "Eti_quetas"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "Re-_edit"
 msgstr "Re_editar"
 
-#: src/mainwindow.c:730 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1047
 msgid "Check signature"
 msgstr "Verificar firma"
 
-#: src/mainwindow.c:735 src/messageview.c:314
+#: src/mainwindow.c:744 src/messageview.c:317
 msgid "Add sender to address boo_k"
 msgstr "Añadir _remitente a la agenda"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "C_ollect addresses"
 msgstr "Rec_olectar direcciones"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "From current _folder..."
 msgstr "De la _carpeta actual..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "From selected _messages..."
 msgstr "De los _mensajes seleccionados..."
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "_Filter all messages in folder"
 msgstr "_Filtrar todos los mensajes en la carpeta"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "Filter _selected messages"
 msgstr "_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:753
 msgid "Run folder pr_ocessing rules"
 msgstr "Ejecutar reglas de procesamiento de la carpeta"
 
-#: src/mainwindow.c:746 src/messageview.c:317
+#: src/mainwindow.c:755 src/messageview.c:320
 msgid "_Create filter rule"
 msgstr "Crear regla de f_iltrado"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:756 src/mainwindow.c:762 src/messageview.c:321
+#: src/messageview.c:327
 msgid "_Automatically"
 msgstr "_Automático"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:860
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:757 src/mainwindow.c:763 src/mainwindow.c:870
+#: src/messageview.c:322 src/messageview.c:328
 msgid "By _From"
 msgstr "Por el _Desde"
 
-#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:861
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:758 src/mainwindow.c:764 src/mainwindow.c:871
+#: src/messageview.c:323 src/messageview.c:329
 msgid "By _To"
 msgstr "Por el _Para"
 
-#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:759 src/mainwindow.c:765 src/messageview.c:324
+#: src/messageview.c:330
 msgid "By _Subject"
 msgstr "Por el A_sunto"
 
-#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:433
+#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:443
 msgid "Create processing rule"
 msgstr "Crear regla de procesamiento"
 
-#: src/mainwindow.c:759 src/messageview.c:330
+#: src/mainwindow.c:768 src/messageview.c:333
 msgid "List _URLs..."
 msgstr "Listar _URLs..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:775
 msgid "Ch_eck for new messages in all folders"
 msgstr "Comprobar m_ensajes nuevos en todas las carpetas"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:776
 msgid "Delete du_plicated messages"
 msgstr "Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:777
 msgid "In selected folder"
 msgstr "En la carpeta seleccionada"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:778
 msgid "In all folders"
 msgstr "En todas las carpetas"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:781
 msgid "E_xecute"
 msgstr "E_jecutar"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:782
 msgid "Exp_unge"
 msgstr "P_urgar"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:785
 msgid "SSL/TLS cer_tificates"
 msgstr "Cer_tificados SSL/TLS"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:788
 msgid "Filtering Lo_g"
 msgstr "Traza de f_iltrado"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:789
 msgid "Network _Log"
 msgstr "Tra_za de red"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:791
+#, fuzzy
+msgid "Debug _Log"
+msgstr "Traza de depuración"
+
+#: src/mainwindow.c:794
 msgid "_Forget all session passwords"
 msgstr "_Olvidar todas las contraseñas de sesión"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:796
 msgid "Forget _master passphrase"
 msgstr "Olvidar la contraseña _maestra"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:800
 msgid "C_hange current account"
 msgstr "_Cambiar cuenta actual"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:802
 msgid "_Preferences for current account..."
 msgstr "_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:803
 msgid "Create _new account..."
 msgstr "Crear _nueva cuenta..."
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:804
 msgid "_Edit accounts..."
 msgstr "_Editar cuentas..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:807
 msgid "P_references..."
 msgstr "P_referencias..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:808
 msgid "Pre-pr_ocessing..."
 msgstr "Pre-pr_ocesamiento..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:809
 msgid "Post-pro_cessing..."
 msgstr "Post-pro_cesamiento..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:810
 msgid "_Filtering..."
 msgstr "_Filtrado..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:811
 msgid "_Templates..."
 msgstr "_Plantillas..."
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:812
 msgid "_Actions..."
 msgstr "_Acciones..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:813
 msgid "Tag_s..."
 msgstr "Etiqueta_s..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:815
 msgid "Plu_gins..."
 msgstr "_Módulos..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:818
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:819
 msgid "_Online User-contributed FAQ"
 msgstr "P_F de usuarios en línea (FAQ)"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:820
 msgid "Icon _Legend"
 msgstr "_Leyenda de iconos"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:822
 msgid "Set as default client"
 msgstr "Establecer como cliente predeterminado"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:829
 msgid "Offline _mode"
 msgstr "_Modo sin conexión"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:830
 msgid "Men_ubar"
 msgstr "Barra de men_u"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:831
 msgid "_Message view"
 msgstr "Vista de _mensaje"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:833
 msgid "Status _bar"
 msgstr "_Barra de estado"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:835
 msgid "Column headers"
 msgstr "Cabeceras de columna"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:836
 msgid "Th_read view"
 msgstr "_Vista jerárquica"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:837 src/prefs_summaries.c:646
 msgid "Hide read threads"
 msgstr "Ocultar los hilos leídos"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:838
 msgid "_Hide read messages"
 msgstr "_Ocultar los mensajes leídos"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:839 src/prefs_summaries.c:652
 msgid "Hide deleted messages"
 msgstr "Ocultar los mensajes borrados"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:840
 msgid "_Fullscreen"
 msgstr "Pantalla _completa"
 
-#: src/mainwindow.c:831 src/messageview.c:342
+#: src/mainwindow.c:841 src/messageview.c:345
 msgid "Show all _headers"
 msgstr "Mostrar todas las ca_beceras"
 
-#: src/mainwindow.c:832 src/messageview.c:343
+#: src/mainwindow.c:842 src/messageview.c:346
 msgid "_Collapse all"
 msgstr "Co_lapsar todos"
 
-#: src/mainwindow.c:833 src/messageview.c:344
+#: src/mainwindow.c:843 src/messageview.c:347
 msgid "Collapse from level _2"
 msgstr "Colapsar desde el nivel _2"
 
-#: src/mainwindow.c:834 src/messageview.c:345
+#: src/mainwindow.c:844 src/messageview.c:348
 msgid "Collapse from level _3"
 msgstr "Colapsar desde el nivel _3"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:848
 msgid "Text _below icons"
 msgstr "Texto _bajo los iconos"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:849
 msgid "Text be_side icons"
 msgstr "Texto _junto a los iconos"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:850
 msgid "_Icons only"
 msgstr "Sólo _iconos"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:851
 msgid "_Text only"
 msgstr "Sólo _texto"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:858
 msgid "_Standard"
 msgstr "_Estándar"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:859
 msgid "_Three columns"
 msgstr "_Tres columnas"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:860
 msgid "_Wide message"
 msgstr "Mensaje _ancho"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:861
 msgid "W_ide message list"
 msgstr "L_ista de mensajes ancha"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:862
 msgid "S_mall screen"
 msgstr "_Pantalla pequeña"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:866
 msgid "By _number"
 msgstr "Por _número"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:867
 msgid "By s_ize"
 msgstr "Por _tamaño"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:868
 msgid "By _date"
 msgstr "Por _fecha"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:869
 msgid "By thread date"
 msgstr "Por fecha del hilo"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:872
 msgid "By s_ubject"
 msgstr "Por el as_unto"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:873
 msgid "By _color label"
 msgstr "Por el _color"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:874
 msgid "By tag"
 msgstr "Por la etiqueta"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:875
 msgid "By _mark"
 msgstr "Por _marca"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:876
 msgid "By _status"
 msgstr "Por e_stado"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:877
 msgid "By a_ttachment"
 msgstr "Por adjun_to"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:878
 msgid "By score"
 msgstr "Por puntuación"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:879
 msgid "By locked"
 msgstr "Por bloqueado"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:880
 msgid "D_on't sort"
 msgstr "N_o ordenar"
 
-#: src/mainwindow.c:874 src/prefs_summaries.c:463
+#: src/mainwindow.c:884 src/prefs_summaries.c:633
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: src/mainwindow.c:875 src/prefs_summaries.c:464
+#: src/mainwindow.c:885 src/prefs_summaries.c:634
 msgid "Descending"
 msgstr "Descendente"
 
-#: src/mainwindow.c:917 src/messageview.c:387
+#: src/mainwindow.c:927 src/messageview.c:390
 msgid "_Auto detect"
 msgstr "_Auto detectar"
 
-#: src/mainwindow.c:1314 src/summaryview.c:6245
+#: src/mainwindow.c:1305 src/summaryview.c:6515
 msgid "Apply tags..."
 msgstr "Aplicar etiquetas..."
 
-#: src/mainwindow.c:1962
+#: src/mainwindow.c:1961
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Ocurrió algún error. Pulse aquí para ver la traza registrada."
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1976
 msgid "You are online. Click the icon to go offline"
 msgstr "Esta conectado. Pulse en el icono para desconectarse"
 
-#: src/mainwindow.c:1980
+#: src/mainwindow.c:1979
 msgid "You are offline. Click the icon to go online"
 msgstr "Esta desconectado. Pulse en el icono para conectarse"
 
-#: src/mainwindow.c:1994
+#: src/mainwindow.c:1993
 msgid "Select account"
 msgstr "Seleccionar cuenta"
 
-#: src/mainwindow.c:2021 src/prefs_logging.c:140
+#: src/mainwindow.c:2020 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Traza del protocolo"
 
-#: src/mainwindow.c:2025
+#: src/mainwindow.c:2024
 msgid "Filtering/Processing debug log"
 msgstr "Traza de depuración de filtrado/procesamiento"
 
-#: src/mainwindow.c:2044 src/prefs_logging.c:392
+#: src/mainwindow.c:2043 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "traza de filtrado activada\n"
 
-#: src/mainwindow.c:2046 src/prefs_logging.c:394
+#: src/mainwindow.c:2045 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "traza de filtrado desactivada\n"
 
-#: src/mainwindow.c:2489 src/mainwindow.c:2496 src/mainwindow.c:2539
-#: src/mainwindow.c:2572 src/mainwindow.c:2604 src/mainwindow.c:2649
+#: src/mainwindow.c:2479 src/mainwindow.c:2486 src/mainwindow.c:2529
+#: src/mainwindow.c:2562 src/mainwindow.c:2594 src/mainwindow.c:2639
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1077
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1087
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:2650 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2640 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:2907 src/mainwindow.c:2911
+#: src/mainwindow.c:2897 src/mainwindow.c:2902
 msgid "Delete all messages in trash folders?"
 msgstr "¿Borrar todos los mensajes de las papeleras?"
 
-#: src/mainwindow.c:2908
+#: src/mainwindow.c:2898
 msgid "Don't quit"
 msgstr "No salir"
 
-#: src/mainwindow.c:2937 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:2938
+#: src/mainwindow.c:2930
+#, fuzzy
 msgid ""
-"Input the location of mailbox.\n"
-"If an existing mailbox is specified, it will be\n"
+"Input the location of the mailbox.\n"
+"The location can be either the full path or relative to the \n"
+"home directory.\n"
+"If the location of an existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
 "Introduzca la ubicación del buzón.\n"
 "Si especifica un buzón existente será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:2944 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2938 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:2949 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:740
+#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:742
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:2954 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2948 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 "
@@ -7748,54 +7861,54 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:3423
+#: src/mainwindow.c:3430
 msgid "No posting allowed"
 msgstr "No esta permitido enviar"
 
-#: src/mainwindow.c:4006
+#: src/mainwindow.c:4012
 msgid "Mbox import has failed."
 msgstr "La importación de mbox ha fallado."
 
-#: src/mainwindow.c:4015 src/mainwindow.c:4024
+#: src/mainwindow.c:4021 src/mainwindow.c:4030
 msgid "Export to mbox has failed."
 msgstr "La exportación a mbox ha fallado."
 
-#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4071 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4071 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "¿Salir de Claws Mail?"
 
-#: src/mainwindow.c:4256
+#: src/mainwindow.c:4272
 msgid "Folder synchronisation"
 msgstr "Sincronización de carpeta"
 
-#: src/mainwindow.c:4257
+#: src/mainwindow.c:4273
 msgid "Do you want to synchronise your folders now?"
 msgstr "¿Quiere sincronizar sus carpetas ahora?"
 
-#: src/mainwindow.c:4258
+#: src/mainwindow.c:4274
 msgid "_Synchronise"
 msgstr "_Sincronizar"
 
-#: src/mainwindow.c:4706
+#: src/mainwindow.c:4747
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/mainwindow.c:4716
+#: src/mainwindow.c:4757
 msgid "No duplicate message found in selected folder.\n"
 msgstr "No se encontró ningún mensaje duplicado en la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4722
+#: src/mainwindow.c:4763
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "Borrado %d mensaje repetido en la carpeta seleccionada.\n"
 msgstr[1] "Borrados %d mensajes repetidos en la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4767
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
@@ -7804,117 +7917,117 @@ msgstr[0] ""
 msgstr[1] ""
 "Marcados para borrar %d mensajes duplicados en la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4764
+#: src/mainwindow.c:4805
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Borrando los mensajes duplicados en todas las carpetas..."
 
-#: src/mainwindow.c:4770
+#: src/mainwindow.c:4811
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Borrado %d mensaje repetido en %d carpetas.\n"
 msgstr[1] "Borrados %d mensajes repetidos en %d carpetas.\n"
 
-#: src/mainwindow.c:4775
+#: src/mainwindow.c:4816
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "No se encontró ningún mensaje duplicado en %d carpetas.\n"
 
-#: src/mainwindow.c:4937 src/messageview.c:2657
+#: src/mainwindow.c:4978 src/messageview.c:2622
 msgid "Select folder to go to"
 msgstr "Seleccionar la carpeta a la que ir"
 
-#: src/mainwindow.c:5038 src/summaryview.c:5736
+#: src/mainwindow.c:5079 src/summaryview.c:5958
 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 
-#: src/mainwindow.c:5046
+#: src/mainwindow.c:5087
 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
 
-#: src/mainwindow.c:5054 src/summaryview.c:5747
+#: src/mainwindow.c:5095 src/summaryview.c:5969
 msgid "Filtering configuration"
 msgstr "Configuración de filtrado"
 
-#: src/mainwindow.c:5169
+#: src/mainwindow.c:5210
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "No se puede registrar como cliente predeterminado: imposible obtener la ruta "
 "al ejecutable."
 
-#: src/mainwindow.c:5228
+#: src/mainwindow.c:5269
 msgid "Claws Mail has been registered as default client."
 msgstr "Se ha registrado Claws Mail como cliente predeterminado."
 
-#: src/mainwindow.c:5230
+#: src/mainwindow.c:5271
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "No se puede registrar como cliente predeterminado: imposible escribir en el "
 "registro."
 
-#: src/mainwindow.c:5244 src/setup.c:91
+#: src/mainwindow.c:5285 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Revisando carpeta %s%c%s..."
 
-#: src/mainwindow.c:5388
+#: src/mainwindow.c:5429
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "Olvidada %d contraseña en %d cuentas.\n"
 msgstr[1] "Olvidadas %d contraseñas en %d cuentas.\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
+#: src/matcher.c:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
+#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
 #, c-format
 msgid "%s header"
 msgstr "cabecera %s"
 
-#: src/matcher.c:222
+#: src/matcher.c:225
 msgid "header"
 msgstr "cabecera"
 
-#: src/matcher.c:223
+#: src/matcher.c:226
 msgid "header line"
 msgstr "línea de cabecera"
 
-#: src/matcher.c:224
+#: src/matcher.c:227
 msgid "body line"
 msgstr "línea de cuerpo"
 
-#: src/matcher.c:225
+#: src/matcher.c:228
 msgid "tag"
 msgstr "etiqueta"
 
-#: 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:743 src/summary_search.c:514
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/message_search.c:214 src/prefs_matcher.c:748 src/summary_search.c:454
 msgid "Case sensitive"
 msgstr "Sensible a mayús./minús."
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
 msgid "Case insensitive"
 msgstr "Ignorar mayús./minús."
 
-#: src/matcher.c:1862
+#: src/matcher.c:1903
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "comprobando si el mensaje coincide [ %s ]\n"
 
-#: src/matcher.c:1933 src/matcher.c:1952 src/matcher.c:1965
+#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
 msgid "message matches\n"
 msgstr "el mensaje coincide\n"
 
-#: src/matcher.c:1940 src/matcher.c:1958 src/matcher.c:1967
+#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
 msgid "message does not match\n"
 msgstr "el mensaje no coincide\n"
 
-#: src/matcher.c:2230 src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233
-#: src/matcher.c:2234 src/matcher.c:2235 src/matcher.c:2236 src/matcher.c:2237
+#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
+#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
 msgid "(none)"
 msgstr "(ninguna)"
 
-#: src/mbox.c:107
+#: src/mbox.c:97
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
@@ -7923,27 +8036,26 @@ msgstr ""
 "No se puede abrir el fichero mbox:\n"
 "%s\n"
 
-#: src/mbox.c:144
+#: src/mbox.c:134
 #, c-format
 msgid "Importing from mbox... (%d mail imported)"
 msgid_plural "Importing from mbox... (%d mails imported)"
 msgstr[0] "Importando desde mbox... (%d correo importado)"
 msgstr[1] "Importando desde mbox... (%d correos importados)"
 
-#: src/mbox.c:549
+#: src/mbox.c:539
 msgid "Overwrite mbox file"
 msgstr "Sobreescribir fichero mbox"
 
-#: src/mbox.c:550
+#: src/mbox.c:540
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Este fichero ya existe. ¿Desea sobreescribir su contenido?"
 
-#: src/mbox.c:551 src/messageview.c:1864 src/mimeview.c:1843
-#: src/prefs_themes.c:561 src/textview.c:3086
+#: src/mbox.c:541 src/mimeview.c:1888 src/prefs_themes.c:596
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: src/mbox.c:560
+#: src/mbox.c:550
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -7952,51 +8064,51 @@ msgstr ""
 "No se puede crear el fichero mbox:\n"
 "%s\n"
 
-#: src/mbox.c:568
+#: src/mbox.c:554
 msgid "Exporting to mbox..."
 msgstr "Exportar a mbox..."
 
-#: src/message_search.c:162
+#: src/message_search.c:173
 msgid "Find in current message"
 msgstr "Buscar en el mensaje actual"
 
-#: src/message_search.c:180
+#: src/message_search.c:191
 msgid "Find text:"
 msgstr "Buscar texto:"
 
-#: src/message_search.c:328 src/summary_search.c:838
+#: src/message_search.c:317 src/summary_search.c:778
 msgid "Search failed"
 msgstr "Búsqueda fallida"
 
-#: src/message_search.c:329 src/summary_search.c:839
+#: src/message_search.c:318 src/summary_search.c:779
 msgid "Search string not found."
 msgstr "Cadena no encontrada."
 
-#: src/message_search.c:338
+#: src/message_search.c:327
 msgid "Beginning of message reached; continue from end?"
 msgstr "Se llegó al principio del mensaje. ¿Seguir desde el final?"
 
-#: src/message_search.c:341
+#: src/message_search.c:330
 msgid "End of message reached; continue from beginning?"
 msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
 
-#: src/message_search.c:344 src/summary_search.c:850
+#: src/message_search.c:333 src/summary_search.c:790
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:297 src/textview.c:252
+#: src/messageview.c:300 src/textview.c:249
 msgid "Compose _new message"
 msgstr "Componer un mensaje _nuevo"
 
-#: src/messageview.c:712 src/messageview.c:1455 src/messageview.c:1606
+#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista de mensaje"
 
-#: src/messageview.c:842
+#: src/messageview.c:845
 msgid "<No Return-Path found>"
 msgstr "<No se encontró Return-Path>"
 
-#: src/messageview.c:849
+#: src/messageview.c:852
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8011,65 +8123,35 @@ msgstr ""
 "Dirección de retorno: %s\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:856 src/messageview.c:884
+#: src/messageview.c:859
 msgid "_Don't Send"
 msgstr "_No enviar"
 
-#: src/messageview.c:875
-#, c-format
-msgctxt "'%s' stands for 'To' then 'Cc'"
-msgid ""
-"This message is asking for a return receipt notification\n"
-"but according to its '%s' and '%s' headers it was not\n"
-"officially addressed to you.\n"
-"It is advised to not send the return receipt."
-msgstr ""
-"Este mensaje solicita una notificación de acuse de recibo\n"
-"pero de acuerdo con sus cabeceras «%s» y «%s» no fue\n"
-"oficialmente dirigido a usted.\n"
-"Se recomienda no enviar el acuse de recibo."
-
-#: src/messageview.c:1385
+#: src/messageview.c:1366
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Recuperando mensaje (%s)..."
 
-#: src/messageview.c:1421 src/procmime.c:1008
+#: src/messageview.c:1402 src/procmime.c:957
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No se puede descifrar: %s"
 
-#: src/messageview.c:1502 src/messageview.c:1510
+#: src/messageview.c:1483 src/messageview.c:1491
 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:1856 src/messageview.c:1859 src/mimeview.c:2048
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4840
-#: src/summaryview.c:4843 src/textview.c:3074
-msgid "Save as"
-msgstr "Guardar como"
-
-#: src/messageview.c:1865
-msgid "Overwrite existing file?"
-msgstr "¿Sobreescribir el fichero existente?"
-
-#: src/messageview.c:1873 src/summaryview.c:4860 src/summaryview.c:4863
-#: src/summaryview.c:4878
-#, c-format
-msgid "Couldn't save the file '%s'."
-msgstr "No se pudo guardar el fichero «%s»."
-
-#: src/messageview.c:1926
+#: src/messageview.c:1868
 #, c-format
 msgid "Show all %s."
 msgstr "Mostrar todo %s."
 
-#: src/messageview.c:1928
+#: src/messageview.c:1870
 msgid "Only the first megabyte of text is shown."
 msgstr "Mostrar sólo el primer megabyte de texto."
 
-#: src/messageview.c:1959
+#: src/messageview.c:1901
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8077,19 +8159,19 @@ msgstr ""
 "Recibió un acuse de recibo en este mensaje: éste ha sido visualizado por el "
 "destinatario."
 
-#: src/messageview.c:1962
+#: src/messageview.c:1904
 msgid "You asked for a return receipt in this message."
 msgstr "Usted solicitó acuse de recibo en este mensaje."
 
-#: src/messageview.c:1968
+#: src/messageview.c:1910
 msgid "This message asks for a return receipt."
 msgstr "Este mensaje solicita acuse de recibo."
 
-#: src/messageview.c:1969
+#: src/messageview.c:1911
 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 
-#: src/messageview.c:2012
+#: src/messageview.c:1954
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8097,7 +8179,7 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente,\n"
 "y ha sido eliminado del servidor."
 
-#: src/messageview.c:2018
+#: src/messageview.c:1960
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8106,15 +8188,15 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s."
 
-#: src/messageview.c:2022 src/messageview.c:2044
+#: src/messageview.c:1964 src/messageview.c:1986
 msgid "Mark for download"
 msgstr "Marcar para descargar"
 
-#: src/messageview.c:2023 src/messageview.c:2035
+#: src/messageview.c:1965 src/messageview.c:1977
 msgid "Mark for deletion"
 msgstr "Marcar para eliminar"
 
-#: src/messageview.c:2028
+#: src/messageview.c:1970
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8123,12 +8205,12 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será descargado."
 
-#: src/messageview.c:2033 src/messageview.c:2046
-#: src/prefs_filtering_action.c:180 src/toolbar.c:503
+#: src/messageview.c:1975 src/messageview.c:1988
+#: src/prefs_filtering_action.c:176 src/toolbar.c:506
 msgid "Unmark"
 msgstr "Desmarca"
 
-#: src/messageview.c:2039
+#: src/messageview.c:1981
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8137,13 +8219,36 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será eliminado."
 
-#: src/messageview.c:2112
+#: src/messageview.c:2058
+#, c-format
+msgctxt "'%s' stands for 'To' then 'Cc'"
+msgid ""
+"This message is asking for a return receipt notification\n"
+"but according to its '%s' and '%s' headers it was not\n"
+"officially addressed to you.\n"
+"It is advised to not send the return receipt."
+msgstr ""
+"Este mensaje solicita una notificación de acuse de recibo\n"
+"pero de acuerdo con sus cabeceras «%s» y «%s» no fue\n"
+"oficialmente dirigido a usted.\n"
+"Se recomienda no enviar el acuse de recibo."
+
+#: src/messageview.c:2066 src/messageview.c:2074
 msgid "Return Receipt Notification"
 msgstr "Notificación de acuse de recibo"
 
-#: src/messageview.c:2113
-msgid ""
-"More than one of your accounts uses the address that this message was sent "
+#: src/messageview.c:2068 src/messageview.c:2079
+#: src/plugins/rssyl/rssyl_feed_props.c:496
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: src/messageview.c:2068 src/messageview.c:2079
+msgid "_Send Notification"
+msgstr "_Enviar notificación"
+
+#: src/messageview.c:2075
+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:"
@@ -8153,19 +8258,11 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 
-#: src/messageview.c:2117 src/plugins/rssyl/rssyl_feed_props.c:506
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: src/messageview.c:2117
-msgid "_Send Notification"
-msgstr "_Enviar notificación"
-
-#: src/messageview.c:2206
+#: src/messageview.c:2171
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No se puede imprimir: el mensaje no contiene texto."
 
-#: src/messageview.c:2967
+#: src/messageview.c:2932
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8173,7 +8270,7 @@ msgstr ""
 "\n"
 "  No hay mensajes en esta carpeta"
 
-#: src/messageview.c:2975
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8181,7 +8278,7 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado"
 
-#: src/messageview.c:2976
+#: src/messageview.c:2941
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8189,16 +8286,16 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado o movido a otra carpeta"
 
-#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4253
-#: src/summaryview.c:7012
+#: src/messageview.c:2974 src/messageview.c:2980 src/summaryview.c:4440
+#: src/summaryview.c:7320
 msgid "An error happened while learning.\n"
 msgstr "Ocurrió un error mientras se aprendía.\n"
 
-#: src/mh.c:527
+#: src/mh.c:528
 msgid "Moving messages..."
 msgstr "Moviendo mensajes..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:838
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Borrando mensajes..."
 
@@ -8217,7 +8314,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:298
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8226,63 +8323,67 @@ msgstr ""
 "¿Eliminar realmente el buzón «%s»?\n"
 "(Los mensajes NO serán borrados del disco)"
 
-#: src/mh_gtk.c:376 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr "Eliminar buzón"
 
-#: src/mimeview.c:192
+#: src/mimeview.c:220
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/mimeview.c:194
+#: src/mimeview.c:222
 msgid "Open _with..."
 msgstr "Abrir _con..."
 
-#: src/mimeview.c:196
+#: src/mimeview.c:224 src/prefs_filtering_action.c:172
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/mimeview.c:225
 msgid "Send to..."
 msgstr "Enviar a..."
 
-#: src/mimeview.c:197
+#: src/mimeview.c:226
 msgid "_Display as text"
 msgstr "_Mostrar como texto"
 
-#: src/mimeview.c:198
+#: src/mimeview.c:227
 msgid "_Save as..."
 msgstr "_Guardar como..."
 
-#: src/mimeview.c:199
+#: src/mimeview.c:228
 msgid "Save _all..."
 msgstr "Gu_ardar todo..."
 
-#: src/mimeview.c:272
+#: src/mimeview.c:301
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036
-#: src/mimeview.c:1041
+#: src/mimeview.c:1052 src/mimeview.c:1057 src/mimeview.c:1062
+#: src/mimeview.c:1067
 msgid "View full information"
 msgstr "Ver la información completa"
 
-#: src/mimeview.c:1047
+#: src/mimeview.c:1073
 msgid "Check again"
 msgstr "Verificar de nuevo"
 
-#: src/mimeview.c:1059
+#: src/mimeview.c:1085
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Pulse en el icono para comprobarla."
 
-#: src/mimeview.c:1061
+#: src/mimeview.c:1087
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Pulse en el icono o la tecla «%s» para comprobarla."
 
-#: src/mimeview.c:1071
+#: src/mimeview.c:1097
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Expiró el tiempo comprobando la firma. Pulse en el icono para reintentarlo."
 
-#: src/mimeview.c:1073
+#: src/mimeview.c:1099
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8290,26 +8391,26 @@ msgstr ""
 "Expiró el tiempo comprobando la firma. Pulse en el icono o la tecla «%s» "
 "para reintentarlo."
 
-#: src/mimeview.c:1313
+#: src/mimeview.c:1344
 msgid "Checking signature..."
 msgstr "Verificando firma..."
 
-#: src/mimeview.c:1354
+#: src/mimeview.c:1385
 msgid "Go back to email"
 msgstr "Volver al correo"
 
-#: src/mimeview.c:1761 src/mimeview.c:1853 src/mimeview.c:2095
-#: src/mimeview.c:2131 src/mimeview.c:2243 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:1806 src/mimeview.c:1898 src/mimeview.c:2140
+#: src/mimeview.c:2176 src/mimeview.c:2288 src/plugins/fancy/fancy_viewer.c:440
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No se pudo guardar la parte del mensaje multipartes: %s"
 
-#: src/mimeview.c:1840 src/textview.c:3084
+#: src/mimeview.c:1885
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "¿Sobreescribir el fichero existente «%s»?"
 
-#: src/mimeview.c:1864
+#: src/mimeview.c:1909
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8318,54 +8419,59 @@ msgstr ""
 "Ha ocurrido un error al guardar la parte del mensaje n.º %d. ¿Desea cancelar "
 "la operación o ignorar el error y continuar?"
 
-#: src/mimeview.c:1867
+#: src/mimeview.c:1912
 msgid "Error saving all message parts"
 msgstr "Error guardando todas las partes del mensaje"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1913
 msgid "Skip"
 msgstr "Ignorar"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1913
 msgid "Skip all"
 msgstr "Ignorar todos"
 
-#: src/mimeview.c:1878
+#: src/mimeview.c:1923
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d fichero guardado con éxito."
 msgstr[1] "%d ficheros guardados con éxito."
 
-#: src/mimeview.c:1886
+#: src/mimeview.c:1931
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d fichero guardado con éxito"
 msgstr[1] "%d ficheros guardados con éxito"
 
-#: src/mimeview.c:1891
+#: src/mimeview.c:1936
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d fichero falló."
 msgstr[1] "%s, %d ficheros fallaron."
 
-#: src/mimeview.c:1924 src/plugins/archive/archiver_prefs.c:142
-#: src/prefs_filtering_action.c:1297
+#: src/mimeview.c:1969 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1262
 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destino"
 
-#: src/mimeview.c:1931 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1976 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "«%s» no es un directorio."
 
-#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3001
+#: src/mimeview.c:2093 src/plugins/fancy/fancy_viewer.c:693
+#: src/summaryview.c:5052
+msgid "Save as"
+msgstr "Guardar como"
+
+#: src/mimeview.c:2223 src/mimeview.c:2230
 msgid "Open with"
 msgstr "Abrir con"
 
-#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3002
+#: src/mimeview.c:2224 src/mimeview.c:2231
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8374,7 +8480,7 @@ msgstr ""
 "Teclee la orden para abrir el fichero:\n"
 "(«%s» será sustituido por el fichero)"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2326
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8385,14 +8491,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2289
+#: src/mimeview.c:2334
 msgid "Execute untrusted binary?"
 msgstr "¿Ejecutar binario no fiable?"
 
-#: src/mimeview.c:2290
+#: src/mimeview.c:2335
+#, fuzzy
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
-"dangerous and could probably lead to compromission of your computer.\n"
+"dangerous and could compromise your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
@@ -8401,99 +8508,99 @@ msgstr ""
 "\n"
 "¿Desea ejecutar este fichero?"
 
-#: src/mimeview.c:2294
+#: src/mimeview.c:2339
 msgid "Run binary"
 msgstr "Ejecutar binario"
 
-#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:299
+#: src/mimeview.c:2642 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2700
+#: src/mimeview.c:2643 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2808
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: src/mimeview.c:2611 src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
+#: src/mimeview.c:2657 src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 msgid "Description:"
 msgstr "Descripción:"
 
-#: src/news.c:303
+#: src/news.c:300
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "La conexión NNTP con %s:%d se ha desconectado.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Cuenta «%s»: Conectando al servidor NNTP: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:372
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Error entrando en %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:451
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan no soporta el código de retorno 480 por ahora, escogemos continuar\n"
 
-#: src/news.c:447
+#: src/news.c:460
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Falló el modo «reader», se continúa sin embargo\n"
 
-#: src/news.c:451
+#: src/news.c:464
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Error creando sesión con %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:479
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Error autenticándose en %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:504
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder acceder al servidor de "
 "noticias."
 
-#: src/news.c:862
+#: src/news.c:875
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "no se pudo seleccionar el grupo: %s\n"
 
-#: src/news.c:1054 src/news.c:1224
+#: src/news.c:1067 src/news.c:1253
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "no se pudo establecer el grupo: %s\n"
 
-#: src/news.c:1063
+#: src/news.c:1076
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos inválido: %d - %d\n"
 
-#: src/news.c:1133 src/news.c:1157 src/news.c:1181
+#: src/news.c:1154 src/news.c:1181 src/news.c:1208
 msgid "couldn't get xhdr\n"
 msgstr "no se pudo obtener xhdr\n"
 
-#: src/news.c:1217
+#: src/news.c:1246
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: src/news.c:1232
+#: src/news.c:1261
 msgid "couldn't get xover\n"
 msgstr "no se pudo obtener xover\n"
 
-#: src/news.c:1247
+#: src/news.c:1278
 msgid "invalid xover line\n"
 msgstr "línea xover inválida\n"
 
-#: src/news.c:1449
+#: src/news.c:1480
 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"
@@ -8568,11 +8675,11 @@ msgstr "Contraseña nueva:"
 msgid "Confirm passphrase:"
 msgstr "Confirmar contraseña:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:51
+#: src/plugins/acpi_notifier/acpi_notifier.c:53
 msgid "Acpi Notifier"
 msgstr "Notificador ACPI"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:67
+#: src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -8580,7 +8687,7 @@ msgstr ""
 "Asegúrese de que el módulo del núcleo «acerhk» está cargado.\n"
 "Puede obtenerlo de http://www.cakey.de/acerhk/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -8588,19 +8695,19 @@ msgstr ""
 "Asegúrese de que el módulo del núcleo «acer_acpi» está cargado.\n"
 "Puede obtenerlo de http://code.google.com/p/aceracpi/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr "Asegúrese de que el módulo del núcleo «asus_laptop» está cargado."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:72
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr "Asegúrese de que el módulo del núcleo «asus_acpi» está cargado."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr "Asegúrese de que el módulo del núcleo «ibm_acpi» está cargado."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -8608,78 +8715,78 @@ msgstr ""
 "Asegúrese de que tiene apanelc instalado.\n"
 "Puede obtenerlo de http://apanel.sourceforge.net/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:207
-#: src/plugins/acpi_notifier/acpi_notifier.c:213
-#: src/plugins/acpi_notifier/acpi_notifier.c:425
+#: src/plugins/acpi_notifier/acpi_notifier.c:209
+#: src/plugins/acpi_notifier/acpi_notifier.c:215
+#: src/plugins/acpi_notifier/acpi_notifier.c:427
 msgid "Control file doesn't exist."
 msgstr "El fichero de control no existe."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:305
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
 msgid " : no new or unread mail"
 msgstr " : no hay correo nuevo o sin leer"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
 msgid " : unread mail"
 msgstr " : mensajes sin leer"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:309
 msgid " : new mail"
 msgstr " : mensajes nuevos"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
-#: src/plugins/acpi_notifier/acpi_notifier.c:315
-#: src/plugins/acpi_notifier/acpi_notifier.c:321
-msgid "off"
-msgstr "apagado"
-
 #: src/plugins/acpi_notifier/acpi_notifier.c:311
 #: src/plugins/acpi_notifier/acpi_notifier.c:317
 #: src/plugins/acpi_notifier/acpi_notifier.c:323
-msgid "blinking"
-msgstr "parpadeante"
+msgid "off"
+msgstr "apagado"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:313
 #: src/plugins/acpi_notifier/acpi_notifier.c:319
 #: src/plugins/acpi_notifier/acpi_notifier.c:325
+msgid "blinking"
+msgstr "parpadeante"
+
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
+#: src/plugins/acpi_notifier/acpi_notifier.c:321
+#: src/plugins/acpi_notifier/acpi_notifier.c:327
 msgid "on"
 msgstr "encendido"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:347
-#: src/plugins/acpi_notifier/acpi_notifier.c:356
-#: src/plugins/acpi_notifier/acpi_notifier.c:371
+#: src/plugins/acpi_notifier/acpi_notifier.c:349
+#: src/plugins/acpi_notifier/acpi_notifier.c:358
+#: src/plugins/acpi_notifier/acpi_notifier.c:373
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:386
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI type: "
 msgstr "Tipo de ACPI: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:395
+#: src/plugins/acpi_notifier/acpi_notifier.c:397
 msgid "ACPI file: "
 msgstr "Fichero ACPI: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:406
+#: src/plugins/acpi_notifier/acpi_notifier.c:408
 msgid "values - On: "
 msgstr "valores - Encendido: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:411
+#: src/plugins/acpi_notifier/acpi_notifier.c:413
 msgid " - Off: "
 msgstr " - Apagado: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:433
+#: src/plugins/acpi_notifier/acpi_notifier.c:435
 msgid "Blink when user interaction is required"
 msgstr "Parpadear cuando sea necesaria la intervención del usuario"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:867
+#: src/plugins/acpi_notifier/acpi_notifier.c:869
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr "Este módulo controla algunos LEDs de notificación de correo ACPI."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:888
+#: src/plugins/acpi_notifier/acpi_notifier.c:890
 msgid "Laptop LED"
 msgstr "LED del portátil"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:257
+#: src/plugins/attachwarner/attachwarner.c:252
 msgid "Failed to register check before send hook"
 msgstr "Falló el registro de la función de comprobar antes de enviar"
 
@@ -8707,11 +8814,11 @@ msgid "Address book path where addresses are kept"
 msgstr "Ruta en la agenda donde se guardarán las direcciones"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:123
-#: src/plugins/bogofilter/bogofilter_gtk.c:278
+#: src/plugins/bogofilter/bogofilter_gtk.c:262
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:447
-#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
-#: src/prefs_matcher.c:679
+#: src/plugins/spamassassin/spamassassin_gtk.c:463
+#: src/prefs_filtering_action.c:545 src/prefs_filtering_action.c:552
+#: src/prefs_matcher.c:686
 msgid "Select..."
 msgstr "Seleccionar..."
 
@@ -8791,19 +8898,19 @@ msgstr ""
 msgid "Archiver"
 msgstr "Archivador"
 
-#: src/plugins/archive/archiver_gtk.c:107
+#: src/plugins/archive/archiver_gtk.c:108
 msgid "Archiving"
 msgstr "Archivando"
 
-#: src/plugins/archive/archiver_gtk.c:125
+#: src/plugins/archive/archiver_gtk.c:127
 msgid "Press Cancel button to stop archiving"
 msgstr "Pulse el botón Cancelar para detener el archivado"
 
-#: src/plugins/archive/archiver_gtk.c:141
+#: src/plugins/archive/archiver_gtk.c:143
 msgid "Archiving:"
 msgstr "Archivando:"
 
-#: src/plugins/archive/archiver_gtk.c:525
+#: src/plugins/archive/archiver_gtk.c:527
 #, c-format
 msgid ""
 "Some uninitialized data prevents from starting\n"
@@ -8814,7 +8921,7 @@ msgstr ""
 "debido a algunos datos no inicializados:\n"
 "%s%s"
 
-#: src/plugins/archive/archiver_gtk.c:528
+#: src/plugins/archive/archiver_gtk.c:530
 msgid ""
 "\n"
 "- the folder to archive is not set"
@@ -8822,7 +8929,7 @@ msgstr ""
 "\n"
 "• no se estableció la carpeta a archivar"
 
-#: src/plugins/archive/archiver_gtk.c:529
+#: src/plugins/archive/archiver_gtk.c:531
 msgid ""
 "\n"
 "- the name for archive is not set"
@@ -8830,37 +8937,37 @@ msgstr ""
 "\n"
 "• no se estableció el nombre del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:552
+#: src/plugins/archive/archiver_gtk.c:554
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s : ya existe. ¿Continuar de todas formas?"
 
-#: src/plugins/archive/archiver_gtk.c:555
+#: src/plugins/archive/archiver_gtk.c:557
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: es un enlace. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:558
+#: src/plugins/archive/archiver_gtk.c:560
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: es un directorio. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:561
+#: src/plugins/archive/archiver_gtk.c:563
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: no hay permisos. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:564
+#: src/plugins/archive/archiver_gtk.c:566
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: error desconocido. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:572
-#: src/plugins/archive/archiver_gtk.c:619
+#: src/plugins/archive/archiver_gtk.c:574
+#: src/plugins/archive/archiver_gtk.c:621
 msgid "Creating archive"
 msgstr "Creando archivo"
 
-#: src/plugins/archive/archiver_gtk.c:585
+#: src/plugins/archive/archiver_gtk.c:587
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8869,7 +8976,7 @@ msgstr ""
 "Nombre de fichero inválido:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:590
+#: src/plugins/archive/archiver_gtk.c:592
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8878,7 +8985,7 @@ msgstr ""
 "Nombre de carpeta de Claws Mail inválida:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:614
+#: src/plugins/archive/archiver_gtk.c:616
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8893,7 +9000,7 @@ msgstr ""
 "\n"
 "¿Continuar de todas formas?"
 
-#: src/plugins/archive/archiver_gtk.c:631
+#: src/plugins/archive/archiver_gtk.c:633
 #, c-format
 msgid ""
 "Archive creation error:\n"
@@ -8902,176 +9009,178 @@ msgstr ""
 "Error creando el archivo:\n"
 "%s"
 
-#: src/plugins/archive/archiver_gtk.c:743
+#: src/plugins/archive/archiver_gtk.c:746
 msgid "Archive result"
 msgstr "Resultado del archivado"
 
-#: src/plugins/archive/archiver_gtk.c:773
+#: src/plugins/archive/archiver_gtk.c:776
 msgid "Values"
 msgstr "Valores"
 
-#: src/plugins/archive/archiver_gtk.c:782
+#: src/plugins/archive/archiver_gtk.c:786
 msgid "Archive"
 msgstr "Archivo"
 
-#: src/plugins/archive/archiver_gtk.c:788
+#: src/plugins/archive/archiver_gtk.c:792
 msgid "Archive format"
 msgstr "Formato de archivo"
 
-#: src/plugins/archive/archiver_gtk.c:795
+#: src/plugins/archive/archiver_gtk.c:799
 msgid "Compression method"
 msgstr "Método de compresión"
 
-#: src/plugins/archive/archiver_gtk.c:803
+#: src/plugins/archive/archiver_gtk.c:807
 msgid "Number of files"
 msgstr "Número de ficheros"
 
-#: src/plugins/archive/archiver_gtk.c:811
+#: src/plugins/archive/archiver_gtk.c:815
 msgid "Archive Size"
 msgstr "Tamaño del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:819
+#: src/plugins/archive/archiver_gtk.c:823
 msgid "Folder Size"
 msgstr "Tamaño de la carpeta"
 
-#: src/plugins/archive/archiver_gtk.c:828
+#: src/plugins/archive/archiver_gtk.c:832
 msgid "Compression level"
 msgstr "Nivel de compresión"
 
-#: src/plugins/archive/archiver_gtk.c:833
-#: src/plugins/archive/archiver_gtk.c:841
-#: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:716 src/prefs_folder_item.c:522
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:525
+#: src/prefs_folder_item.c:1200 src/prefs_folder_item.c:1232
 msgid "Yes"
 msgstr "Sí"
 
-#: src/plugins/archive/archiver_gtk.c:833
-#: src/plugins/archive/archiver_gtk.c:841
-#: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:521
-#: src/prefs_summaries.c:380
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:724 src/prefs_folder_item.c:524
+#: src/prefs_folder_item.c:1199 src/prefs_folder_item.c:1231
+#: src/prefs_summaries.c:406
 msgid "No"
 msgstr "No"
 
-#: src/plugins/archive/archiver_gtk.c:836
+#: src/plugins/archive/archiver_gtk.c:840
 msgid "MD5 checksum"
 msgstr "Suma de control MD5"
 
-#: src/plugins/archive/archiver_gtk.c:844
+#: src/plugins/archive/archiver_gtk.c:848
 msgid "Descriptive names"
 msgstr "Nombres descriptivos"
 
-#: src/plugins/archive/archiver_gtk.c:852
+#: src/plugins/archive/archiver_gtk.c:856
 msgid "Delete selected files"
 msgstr "Borrar los ficheros seleccionados"
 
-#: src/plugins/archive/archiver_gtk.c:861
-#: src/plugins/archive/archiver_gtk.c:1324
+#: src/plugins/archive/archiver_gtk.c:865
+#: src/plugins/archive/archiver_gtk.c:1330
 msgid "Select mails before"
 msgstr "Seleccionar correos antes de"
 
-#: src/plugins/archive/archiver_gtk.c:917
+#: src/plugins/archive/archiver_gtk.c:921
 msgid "Select folder to archive"
 msgstr "Seleccionar carpeta a archivar"
 
-#: src/plugins/archive/archiver_gtk.c:938
+#: src/plugins/archive/archiver_gtk.c:942
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Seleccione un nombre para el archivo (el sufijo debería reflejar el tipo, p."
 "ej.: .tgz)"
 
-#: src/plugins/archive/archiver_gtk.c:986
+#: src/plugins/archive/archiver_gtk.c:990
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld de %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1038
+#: src/plugins/archive/archiver_gtk.c:1043
 msgid "Create Archive"
 msgstr "Crear un archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1053
+#: src/plugins/archive/archiver_gtk.c:1058
 msgid "Enter Archiver arguments"
 msgstr "Parámetros de archivado"
 
-#: src/plugins/archive/archiver_gtk.c:1066
+#: src/plugins/archive/archiver_gtk.c:1072
 msgid "Folder to archive"
 msgstr "Carpeta a archivar"
 
-#: src/plugins/archive/archiver_gtk.c:1073
+#: src/plugins/archive/archiver_gtk.c:1079
 msgid "Folder which is the root of the archive"
 msgstr "Carpeta raíz del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1078
+#: src/plugins/archive/archiver_gtk.c:1084
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Pulse este botón para seleccionar la carpeta que será la raíz del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1084
+#: src/plugins/archive/archiver_gtk.c:1090
 msgid "Name for archive"
 msgstr "Nombre del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1090
+#: src/plugins/archive/archiver_gtk.c:1096
 msgid "Archive location and name"
 msgstr "Ubicación y nombre del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1092
+#: src/plugins/archive/archiver_gtk.c:1098
 #: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:421
+#: src/plugins/pgpcore/select-keys.c:493
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1101
 msgid "Click this button to select a name and location for the archive"
 msgstr "Pulse este botón para seleccionar el nombre y ubicación del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1097
+#: src/plugins/archive/archiver_gtk.c:1103
 msgid "Choose compression"
 msgstr "Elija la compresión"
 
-#: src/plugins/archive/archiver_gtk.c:1109
 #: src/plugins/archive/archiver_gtk.c:1115
 #: src/plugins/archive/archiver_gtk.c:1121
-#: src/plugins/archive/archiver_gtk.c:1128
+#: src/plugins/archive/archiver_gtk.c:1127
 #: src/plugins/archive/archiver_gtk.c:1134
-#: src/plugins/archive/archiver_gtk.c:1142
-#: src/plugins/archive/archiver_gtk.c:1150
+#: src/plugins/archive/archiver_gtk.c:1140
+#: src/plugins/archive/archiver_gtk.c:1148
 #: src/plugins/archive/archiver_gtk.c:1156
 #: src/plugins/archive/archiver_gtk.c:1162
-#: src/plugins/archive/archiver_gtk.c:1170
-#: src/plugins/archive/archiver_gtk.c:1177
+#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1176
+#: src/plugins/archive/archiver_gtk.c:1183
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Elija esta opción para usar la compresión %s en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1226
+#: src/plugins/archive/archiver_gtk.c:1232
 msgid "Choose format"
 msgstr "Elegir formato"
 
-#: src/plugins/archive/archiver_gtk.c:1238
 #: src/plugins/archive/archiver_gtk.c:1244
 #: src/plugins/archive/archiver_gtk.c:1250
 #: src/plugins/archive/archiver_gtk.c:1256
+#: src/plugins/archive/archiver_gtk.c:1262
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Elija esto para usar el formato %s en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1276
+#: src/plugins/archive/archiver_gtk.c:1282
 msgid "Miscellaneous options"
 msgstr "Opciones adicionales"
 
-#: src/plugins/archive/archiver_gtk.c:1285
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "_Recursive"
 msgstr "_Recursivo"
 
-#: src/plugins/archive/archiver_gtk.c:1289
+#: src/plugins/archive/archiver_gtk.c:1295
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Incluir las subcarpetas en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1291
+#: src/plugins/archive/archiver_gtk.c:1297
 msgid "_MD5sum"
 msgstr "Suma de control _MD5"
 
-#: src/plugins/archive/archiver_gtk.c:1295
+#: src/plugins/archive/archiver_gtk.c:1301
 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"
@@ -9081,11 +9190,11 @@ msgstr ""
 "Cuidado: esta opción incrementa dramáticamente el tiempo que se tardará\n"
 "en crear el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1299
+#: src/plugins/archive/archiver_gtk.c:1305
 msgid "R_ename"
 msgstr "R_enombrar"
 
-#: src/plugins/archive/archiver_gtk.c:1303
+#: src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/archive/archiver_prefs.c:427
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9096,7 +9205,7 @@ msgstr ""
 "El esquema de nombrado es: fecha_desde at para@asunto.\n"
 "Los nombres se truncarán a un máximo de 96 caracteres."
 
-#: src/plugins/archive/archiver_gtk.c:1311
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9104,11 +9213,11 @@ msgstr ""
 "Borrar los correos después del archivado.\n"
 "Actualmente sólo soporta IMAP4, mbox local y POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1315
+#: src/plugins/archive/archiver_gtk.c:1321
 msgid "Selection options"
 msgstr "Opciones de selección"
 
-#: src/plugins/archive/archiver_gtk.c:1331
+#: src/plugins/archive/archiver_gtk.c:1337
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9182,7 +9291,7 @@ msgstr ""
 "necesario para crear los archivos"
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:761
+#: src/plugins/managesieve/sieve_manager.c:770
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -9190,25 +9299,25 @@ msgstr "Renombrar"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Borrar los correos después de realizar el archivado"
 
-#: src/plugins/att_remover/att_remover.c:332
+#: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Eliminar adjuntos"
 
-#: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1060
+#: src/plugins/att_remover/att_remover.c:362
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
 msgid "Remove"
 msgstr "Eliminar"
 
-#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:452
-#: src/prefs_summary_column.c:80 src/summaryview.c:2794
+#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:622
+#: src/prefs_summary_column.c:79 src/summaryview.c:2902
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: src/plugins/att_remover/att_remover.c:417
+#: src/plugins/att_remover/att_remover.c:424
 msgid "Destroy attachments"
 msgstr "Destruir adjuntos"
 
-#: src/plugins/att_remover/att_remover.c:418
+#: src/plugins/att_remover/att_remover.c:425
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
@@ -9219,20 +9328,35 @@ msgstr ""
 "\n"
 "Los datos borrados no se podrán recuperar."
 
-#: src/plugins/att_remover/att_remover.c:479
+#: src/plugins/att_remover/att_remover.c:468
+#, fuzzy
+msgid "The selected messages don't have any attachments."
+msgstr "Este mensaje no tiene ningún adjunto"
+
+#: src/plugins/att_remover/att_remover.c:471
+#, c-format
+msgid "Attachments removed from %d of the %d selected messages."
+msgstr ""
+
+#: src/plugins/att_remover/att_remover.c:474
+#, fuzzy, c-format
+msgid "Attachments removed from all %d selected messages."
+msgstr "Recopilar direcciones de correo de los mensajes seleccionados"
+
+#: src/plugins/att_remover/att_remover.c:503
 msgid "This message doesn't have any attachments."
 msgstr "Este mensaje no tiene ningún adjunto"
 
-#: src/plugins/att_remover/att_remover.c:494
+#: src/plugins/att_remover/att_remover.c:516
 msgid "Remove attachments..."
 msgstr "Eliminar adjuntos..."
 
-#: src/plugins/att_remover/att_remover.c:506
-#: src/plugins/att_remover/att_remover.c:566
+#: src/plugins/att_remover/att_remover.c:528
+#: src/plugins/att_remover/att_remover.c:588
 msgid "AttRemover"
 msgstr "Eliminador de adjuntos"
 
-#: src/plugins/att_remover/att_remover.c:571
+#: src/plugins/att_remover/att_remover.c:593
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9244,11 +9368,11 @@ msgstr ""
 "Aviso: esta operación es completamente irreversible y los adjuntos borrados "
 "se perderán para siempre jamás."
 
-#: src/plugins/att_remover/att_remover.c:595
+#: src/plugins/att_remover/att_remover.c:617
 msgid "Attachment handling"
 msgstr "Gestión de adjuntos"
 
-#: src/plugins/attachwarner/attachwarner.c:217
+#: src/plugins/attachwarner/attachwarner.c:210
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -9262,17 +9386,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/attachwarner/attachwarner.c:223
+#: src/plugins/attachwarner/attachwarner.c:216
 msgid "Attachment warning"
 msgstr "Aviso de adjuntos"
 
-#: src/plugins/attachwarner/attachwarner.c:250
-#: src/plugins/attachwarner/attachwarner.c:287
-#: src/plugins/attachwarner/attachwarner.c:339
+#: src/plugins/attachwarner/attachwarner.c:245
+#: src/plugins/attachwarner/attachwarner.c:282
+#: src/plugins/attachwarner/attachwarner.c:334
 msgid "Attach warner"
 msgstr "Aviso de adjuntos"
 
-#: src/plugins/attachwarner/attachwarner.c:297
+#: src/plugins/attachwarner/attachwarner.c:292
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -9322,7 +9446,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:308
 msgid "Signatures"
 msgstr "Firmas"
 
@@ -9346,20 +9470,37 @@ msgstr "Excluyendo"
 msgid "Attach Warner"
 msgstr "Aviso de adjuntos"
 
-#: src/plugins/bogofilter/bogofilter.c:81
-#: src/plugins/bogofilter/bogofilter_gtk.c:499
+#: src/plugins/bogofilter/bogofilter.c:82
+#: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:108
+#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:331
+#: src/plugins/bogofilter/bogofilter_gtk.c:408
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
+#: src/plugins/bsfilter/bsfilter_gtk.c:266
+#: src/plugins/bsfilter/bsfilter_gtk.c:326
+#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin_gtk.c:459
+#: src/plugins/spamassassin/spamassassin_gtk.c:508
+#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:682
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1657 src/prefs_matcher.c:1664
+#: src/prefs_matcher.c:1672 src/prefs_matcher.c:1674 src/prefs_matcher.c:2582
+#: src/prefs_matcher.c:2586
+msgid "Any"
+msgstr "Cualquiera"
+
+#: src/plugins/bogofilter/bogofilter.c:457
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: recuperando cuerpos..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:470
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrando mensajes..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:586
 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"
@@ -9371,7 +9512,7 @@ msgstr ""
 "Utilice «/Marcar/Marcar como correo basura» y «/Marcar/Marcar como bueno» "
 "para entrenar a Bogofilter con unos pocos cientos de mensajes de ambos tipos."
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:593
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9380,21 +9521,21 @@ msgstr ""
 "El módulo Bogofilter no pudo filtrar un mensaje. La orden «%s %s %s» no se "
 "pudo ejecutar."
 
-#: src/plugins/bogofilter/bogofilter.c:739
+#: src/plugins/bogofilter/bogofilter.c:740
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: aprendiendo del mensaje..."
 
-#: src/plugins/bogofilter/bogofilter.c:752
-#: src/plugins/bogofilter/bogofilter.c:799 src/plugins/bsfilter/bsfilter.c:486
+#: src/plugins/bogofilter/bogofilter.c:753
+#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:486
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Aprendizaje fallido; «%s» devolvió el estado %d."
 
-#: src/plugins/bogofilter/bogofilter.c:767
+#: src/plugins/bogofilter/bogofilter.c:768
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: aprendiendo de los mensajes..."
 
-#: src/plugins/bogofilter/bogofilter.c:855
+#: src/plugins/bogofilter/bogofilter.c:856
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -9403,7 +9544,7 @@ msgstr ""
 "Aprendizaje fallido; «%s %s %s» devolvió el error:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:983
+#: src/plugins/bogofilter/bogofilter.c:984
 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 "
@@ -9433,73 +9574,73 @@ msgstr ""
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/"
 "Bogofilter»"
 
-#: src/plugins/bogofilter/bogofilter.c:1016 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:624
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:643
 msgid "Spam detection"
 msgstr "Detección de correo basura"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:625
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
+#: src/plugins/spamassassin/spamassassin.c:644
 msgid "Spam learning"
 msgstr "Aprendizaje de correo basura"
 
 #: 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:416
 msgid "Process messages on receiving"
 msgstr "Procesar mensajes al recibir"
 
 #: 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:374
 msgid "Maximum size"
 msgstr "Tamaño máximo"
 
 #: 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:383
 msgid "Messages larger than this will not be checked"
 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:370 src/prefs_account.c:1511
+#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1639
 msgid "KB"
 msgstr "kB"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:200
+#: src/plugins/bogofilter/bogofilter_gtk.c:192
 msgid "Delete spam"
 msgstr "Borrar basura"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:207
+#: src/plugins/bogofilter/bogofilter_gtk.c:195
 msgid "Save spam in..."
 msgstr "Guardar correo basura en..."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:214
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
 msgid "Only mark as spam"
 msgstr "Solo marcar como basura"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:227
+#: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:432
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "Carpeta para almacenar el correo basura identificado. Déjelo vacío para usar "
 "la Papelera."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:233
+#: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:422
+#: src/plugins/spamassassin/spamassassin_gtk.c:438
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 "Pulse este botón para seleccionar una carpeta donde guardar el correo basura"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:242
+#: src/plugins/bogofilter/bogofilter_gtk.c:226
 msgid "When unsure, move to"
 msgstr "Si es dudoso, mover a"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:250
+#: src/plugins/bogofilter/bogofilter_gtk.c:234
 msgid ""
 "Folder for storing mail for which spam status is Unsure. Leave empty to use "
 "the Inbox folder."
@@ -9507,29 +9648,29 @@ msgstr ""
 "Carpeta para almacenar el correo cuya identificación como basura no es "
 "segura. Déjelo vacío para usar la carpeta de Entrada."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:240
 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr ""
 "Pulse este botón para seleccionar una carpeta donde guardar los correos cuya "
 "identificación como basura no es segura."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:242
 msgid "Insert X-Bogosity header"
 msgstr "Insertar la cabecera «X-Bogosity»"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:262
+#: src/plugins/bogofilter/bogofilter_gtk.c:246
 msgid "Only done for messages in MH folders"
 msgstr "Sólo se realiza para mensajes en carpetas MH"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:268
+#: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:437
+#: src/plugins/spamassassin/spamassassin_gtk.c:453
 msgid "Whitelist senders found in address book/folder"
 msgstr "Permitir los remitentes presentes en la agenda/carpeta"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:272
+#: src/plugins/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:441
+#: src/plugins/spamassassin/spamassassin_gtk.c:457
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9537,20 +9678,20 @@ msgstr ""
 "Los mensajes que vengan de los contactos de su agenda de direcciones serán "
 "recibidos en la carpeta normal aunque se detecten como correo basura"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:451
+#: src/plugins/spamassassin/spamassassin_gtk.c:467
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Pulse este botón para seleccionar una agenda o carpeta de la agenda de "
 "direcciones"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:284
+#: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:207
 msgid "Learn whitelisted emails as ham"
 msgstr "Aprender como buenos los correos en la lista blanca"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:286
+#: src/plugins/bogofilter/bogofilter_gtk.c:270
 msgid ""
 "If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
@@ -9558,17 +9699,17 @@ msgstr ""
 "Si Bogofilter cree que un correo es basura o no está seguro pero esta en la "
 "lista blanca se aprende como bueno."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:295
+#: src/plugins/bogofilter/bogofilter_gtk.c:279
 msgid "Bogofilter call"
 msgstr "Llamada a Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:303
+#: src/plugins/bogofilter/bogofilter_gtk.c:287
 msgid "Path to bogofilter executable"
 msgstr "Ruta al ejecutable bogofilter"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:309
+#: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:445
 msgid "Mark spam as read"
 msgstr "Marcar correo basura como leído"
 
@@ -9639,7 +9780,7 @@ msgstr ""
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/Bsfilter»"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:408
+#: src/plugins/spamassassin/spamassassin_gtk.c:424
 msgid "Save spam in"
 msgstr "Guardar correo basura en"
 
@@ -9660,7 +9801,7 @@ msgid "Path to bsfilter executable"
 msgstr "Ruta al ejecutable bsfilter"
 
 #: src/plugins/clamd/clamav_plugin.c:47
-#: src/plugins/clamd/clamav_plugin_gtk.c:550
+#: src/plugins/clamd/clamav_plugin_gtk.c:538
 msgid "Clam AntiVirus"
 msgstr "Antivirus Clam"
 
@@ -9782,56 +9923,56 @@ msgstr "Detección de virus"
 msgid "Select folder to store infected messages in"
 msgstr "Seleccionar la carpeta en la que almacenar los mensajes infectados"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:250
+#: src/plugins/clamd/clamav_plugin_gtk.c:248
 msgid "Enable virus scanning"
 msgstr "Activar la verificación de virus"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:260
+#: src/plugins/clamd/clamav_plugin_gtk.c:258
 msgid "Maximum attachment size"
 msgstr "Tamaño máximo del adjunto"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:271
+#: src/plugins/clamd/clamav_plugin_gtk.c:269
 msgid "Message attachments larger than this will not be scanned"
 msgstr "Los adjuntos mayores de este tamaño no se verificarán"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:275
+#: src/plugins/clamd/clamav_plugin_gtk.c:272
 msgid "MB"
 msgstr "MB"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:284
+#: src/plugins/clamd/clamav_plugin_gtk.c:281
 msgid "Save infected mail in"
 msgstr "Guardar el correo infectado en"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:288
+#: src/plugins/clamd/clamav_plugin_gtk.c:285
 msgid "Save mail that contains viruses"
 msgstr "Guardar el correo que contiene virus"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:296
+#: src/plugins/clamd/clamav_plugin_gtk.c:292
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr ""
 "Carpeta para almacenar el correo infectado. Déjela vacía para usar la "
 "papelera predeterminada"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:304
+#: src/plugins/clamd/clamav_plugin_gtk.c:299
 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 "Pulse este botón para seleccionar una carpeta donde almacenar el correo "
 "infectado"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:312
+#: src/plugins/clamd/clamav_plugin_gtk.c:306
 msgid "Automatic configuration"
 msgstr "Configuración automática"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:317
+#: src/plugins/clamd/clamav_plugin_gtk.c:311
 msgid "Should configuration be done automatic or manual"
 msgstr "Realizar la configuración automática o manual"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:325
+#: src/plugins/clamd/clamav_plugin_gtk.c:318
 msgid "Where is clamd.conf"
 msgstr "¿Dónde está «clamd.conf»?"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:333
+#: src/plugins/clamd/clamav_plugin_gtk.c:326
 msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
@@ -9839,36 +9980,36 @@ msgstr ""
 "Ruta completa a «clamd.conf». Si este campo no está vacío entonces el módulo "
 "fue capaz de encontrar el fichero automáticamente"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:337
+#: src/plugins/clamd/clamav_plugin_gtk.c:329
 msgid "Br_owse"
 msgstr "_Examinar"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:341
+#: src/plugins/clamd/clamav_plugin_gtk.c:333
 msgid "Click this button to select full path to clamd.conf"
 msgstr "Pulse este botón para seleccionar la ruta completa a «clamd.conf»"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:349
+#: src/plugins/clamd/clamav_plugin_gtk.c:340
 msgid "Check permission for folders and adjust if necessary"
 msgstr "Compruebe los permisos de las carpetas y ajústelos si es necesario"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:362
+#: src/plugins/clamd/clamav_plugin_gtk.c:353
 msgid "Click this button to check and adjust folder permissions"
 msgstr "Pulse este botón para comprobar y ajustar los permisos de las carpetas"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:370
+#: src/plugins/clamd/clamav_plugin_gtk.c:360
 msgid "Remote Host"
 msgstr "Anfitrión remoto"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:378
+#: src/plugins/clamd/clamav_plugin_gtk.c:368
 msgid "Hostname or IP for remote host running clamav daemon"
 msgstr ""
 "Nombre o dirección IP de la máquina que está ejecutando el demonio clamav"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:398
+#: src/plugins/clamd/clamav_plugin_gtk.c:387
 msgid "Port number where clamav daemon is listening"
 msgstr "Número de puerto donde escucha el demonio clamav"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:525
+#: src/plugins/clamd/clamav_plugin_gtk.c:513
 msgid ""
 "New config\n"
 "No socket information.\n"
@@ -9878,7 +10019,7 @@ msgstr ""
 "No hay información de conector.\n"
 "Antivirus desactivado."
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:529
+#: src/plugins/clamd/clamav_plugin_gtk.c:517
 msgid ""
 "New config\n"
 "Clamd does not respond to ping.\n"
@@ -9888,7 +10029,7 @@ msgstr ""
 "Clamd no responde al ping.\n"
 "¿Está ejecutándose clamd?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:121
+#: src/plugins/clamd/libclamd/clamd-plugin.c:122
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -9897,7 +10038,7 @@ msgstr ""
 "%s: No se puede abrir\n"
 "Se desactivará clamd"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:216
+#: src/plugins/clamd/libclamd/clamd-plugin.c:217
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -9906,30 +10047,30 @@ msgstr ""
 "%s: No se puede encontrar la información requerida\n"
 "Se desactivará clamd"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:250
+#: src/plugins/clamd/libclamd/clamd-plugin.c:251
 msgid "Could not create socket"
 msgstr "No se pudo crear el conector"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:437
+#: src/plugins/clamd/libclamd/clamd-plugin.c:442
 msgid ": File does not exist"
 msgstr ": El fichero no existe"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:450
+#: src/plugins/clamd/libclamd/clamd-plugin.c:455
 msgid ": Unable to open"
 msgstr ": No se puede abrir"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:470
-#: src/plugins/clamd/libclamd/clamd-plugin.c:475
-#: src/plugins/clamd/libclamd/clamd-plugin.c:489
+#: src/plugins/clamd/libclamd/clamd-plugin.c:474
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket write error"
 msgstr "Error de escritura en el conector"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:482
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Error leyendo"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:496
+#: src/plugins/clamd/libclamd/clamd-plugin.c:500
 msgid "Socket read error"
 msgstr "Error de lectura en el conector"
 
@@ -9954,63 +10095,65 @@ msgstr ""
 "\n"
 "No es realmente útil."
 
-#: src/plugins/fancy/fancy_prefs.c:146
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Display images"
 msgstr "Mostrar imágenes"
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Display embedded images"
 msgstr "Mostrar imágenes incrustadas"
 
-#: src/plugins/fancy/fancy_prefs.c:151
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute javascript"
 msgstr "Ejecutar JavaScript"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Execute embedded javascript"
 msgstr "Ejecutar JavaScript incrustado"
 
-#: src/plugins/fancy/fancy_prefs.c:156
+#: src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute Java applets"
 msgstr "Ejecutar applets de Java"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:158
 msgid "Execute embedded Java applets"
 msgstr "Ejecutar applets de Java incrustadas"
 
-#: src/plugins/fancy/fancy_prefs.c:161
+#: src/plugins/fancy/fancy_prefs.c:162
 msgid "Render objects using plugins"
 msgstr "Dibujar objetos que usan extensiones"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Render embedded objects using plugins"
 msgstr "Dibujar objetos incrustados que usan extensiones"
 
-#: src/plugins/fancy/fancy_prefs.c:169
-msgid "Open in viewer (remote content is enabled)"
+#: src/plugins/fancy/fancy_prefs.c:170
+#, fuzzy
+msgid "Open in Viewer (remote content is enabled)"
 msgstr "Abrir en el visor (contenidos remotos activados)"
 
-#: src/plugins/fancy/fancy_prefs.c:172
+#: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "No hacer nada (contenidos remotos desactivados)"
 
-#: src/plugins/fancy/fancy_prefs.c:209
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3947
+#: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/plugins/fancy/fancy_prefs.c:211
+#: src/plugins/fancy/fancy_prefs.c:212
 msgid "Use GNOME's proxy settings"
 msgstr "Utilizar la configuración del proxy de GNOME"
 
-#: src/plugins/fancy/fancy_prefs.c:219
+#: src/plugins/fancy/fancy_prefs.c:220
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: src/plugins/fancy/fancy_prefs.c:237
+#: src/plugins/fancy/fancy_prefs.c:238
 msgid "Remote resources"
 msgstr "Recursos remotos"
 
-#: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/fancy/fancy_prefs.c:239
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10024,121 +10167,118 @@ msgstr ""
 "objetos que requieren extensiones aún se puede activar para el contenido\n"
 "adjunto al correo."
 
-#: src/plugins/fancy/fancy_prefs.c:244
+#: src/plugins/fancy/fancy_prefs.c:245
 msgid "Enable loading of remote content"
 msgstr "Permitir la carga de contenidos remotos"
 
-#: src/plugins/fancy/fancy_prefs.c:276
+#: src/plugins/fancy/fancy_prefs.c:277
 msgid "When clicking on a link, by default"
 msgstr "Al pulsar en un enlace, de manera predeterminada"
 
-#: src/plugins/fancy/fancy_prefs.c:284
-msgid "Open in external browser"
+#: src/plugins/fancy/fancy_prefs.c:285
+#, fuzzy
+msgid "Open in External Browser"
 msgstr "Abrir con el navegador externo"
 
-#: src/plugins/fancy/fancy_prefs.c:298
+#: src/plugins/fancy/fancy_prefs.c:299
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "Las CSS en este fichero se aplicarán a todas las partes HTML"
 
-#: src/plugins/fancy/fancy_prefs.c:308
+#: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
-#: 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
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
+#: src/prefs_account.c:1573 src/prefs_account.c:1662 src/prefs_account.c:2213
+#: src/prefs_customheader.c:235
 msgid "Bro_wse"
 msgstr "E_xplorar"
 
-#: src/plugins/fancy/fancy_prefs.c:350
+#: src/plugins/fancy/fancy_prefs.c:351
 msgid "Select stylesheet"
 msgstr "Seleccionar estilos"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:409
 msgid "Remote content loading is disabled."
 msgstr "Carga de contenidos remotos desactivada."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:488
 msgid "Load images"
 msgstr "Cargar imágenes"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:490
 msgid "Enable remote content"
 msgstr "Activar contenidos remotos"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:492
 msgid "Enable Javascript"
 msgstr "Activar Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:494
 msgid "Enable Plugins"
 msgstr "Activar módulos"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:496
 msgid "Enable Java"
 msgstr "Activar Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:498
 msgid "Open links with external browser"
 msgstr "Abrir enlaces con el navegador externo"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:673
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocurrió un error: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:733
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s es un canal mal formado o no soportado"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:744
 msgid "Search the Web"
 msgstr "Buscar en la web"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Open in Viewer"
 msgstr "Abrir en el visor"
 
-#: src/plugins/fancy/fancy_viewer.c:724
-msgid "Open in Viewer (enable remote content)"
-msgstr "Abrir en el visor (activar contenidos remotos)"
-
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Open in Browser"
 msgstr "Abrir con el navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:774
 msgid "Open Image"
 msgstr "Abrir imagen"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Link"
 msgstr "Copiar enlace"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:787
 msgid "Download Link"
 msgstr "Descargar enlace"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Save Image As"
 msgstr "Guardar imagen como"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:808
 msgid "Copy Image"
 msgstr "Copiar imagen"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:848
 msgid "Import feed"
 msgstr "Importar canal"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1130
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1158
 msgid "Fancy HTML Viewer"
 msgstr "Visor HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1163
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10318,17 +10458,17 @@ msgstr "Módulo GData: Error de autorización: %s\n"
 msgid "GData plugin: Authorization successful\n"
 msgstr "Módulo GData: Autorización realizada con éxito\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:464
+#: src/plugins/gdata/cm_gdata_contacts.c:474
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Módulo GData: Iniciando la autorización interactiva\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:474
+#: src/plugins/gdata/cm_gdata_contacts.c:481
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 "Módulo GData: Consiguió el código de autorización, solicitando la "
 "autorización\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:481
+#: src/plugins/gdata/cm_gdata_contacts.c:488
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10336,16 +10476,25 @@ msgstr ""
 "Módulo GData: No se recibió el código de autorización, cancelada la "
 "solicitud de la autorización\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:497
+#: src/plugins/gdata/cm_gdata_contacts.c:494
+#, fuzzy
+msgid ""
+"GData plugin: Interactive authorization still running, no additional session "
+"started\n"
+msgstr ""
+"Módulo GData: Consiguió el código de autorización, solicitando la "
+"autorización\n"
+
+#: src/plugins/gdata/cm_gdata_contacts.c:511
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Módulo GData: Error de actualización de autorización: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:506
+#: src/plugins/gdata/cm_gdata_contacts.c:535
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Módulo GData: Actualización de autorización correcta\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:566
+#: src/plugins/gdata/cm_gdata_contacts.c:595
 #, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
@@ -10353,17 +10502,17 @@ msgstr ""
 "Módulo GData: tiempo transcurrido desde el último refresco: %d minutos, "
 "refrescando ahora\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:574
+#: src/plugins/gdata/cm_gdata_contacts.c:603
 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:1752
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1944
 msgid "Authentication"
 msgstr "Autenticación"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1560
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
 msgid "Username:"
 msgstr "Usuario:"
 
@@ -10410,32 +10559,32 @@ msgstr ""
 msgid "GData integration"
 msgstr "Integración con GData"
 
-#: src/plugins/libravatar/libravatar.c:338
-#: src/plugins/libravatar/libravatar.c:403
-#: src/plugins/libravatar/libravatar.c:463
+#: src/plugins/libravatar/libravatar.c:332
+#: src/plugins/libravatar/libravatar.c:397
+#: src/plugins/libravatar/libravatar.c:457
 #: src/plugins/libravatar/libravatar_prefs.c:546
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: src/plugins/libravatar/libravatar.c:345
+#: src/plugins/libravatar/libravatar.c:339
 msgid "Failed to register avatar header update hook"
 msgstr ""
 "Falló el registro de la función de actualización de cabeceras de avatar"
 
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:348
 msgid "Failed to register avatar image render hook"
 msgstr ""
 "Falló el registro de la función de representación de imágenes de avatar"
 
-#: src/plugins/libravatar/libravatar.c:360
+#: src/plugins/libravatar/libravatar.c:354
 msgid "Failed to create avatar image cache directory"
 msgstr "Fallo al crear el directorio de caché de imágenes"
 
-#: src/plugins/libravatar/libravatar.c:370
+#: src/plugins/libravatar/libravatar.c:364
 msgid "Failed to load missing items cache"
 msgstr "Fallo al cargar la caché de elementos ausentes"
 
-#: src/plugins/libravatar/libravatar.c:413
+#: src/plugins/libravatar/libravatar.c:407
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10540,8 +10689,8 @@ msgid "Cache refresh interval"
 msgstr "Intervalo de refresco de la caché"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1490
-#: src/prefs_matcher.c:336 src/prefs_receive.c:177
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1618
+#: src/prefs_account.c:1775 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "horas"
 
@@ -10686,71 +10835,71 @@ msgstr ""
 "Se borrarán todas las carpetas y mensajes bajo «%s».\n"
 "¿Está seguro de que quiere borrarlos?"
 
-#: src/plugins/managesieve/managesieve.c:435
+#: src/plugins/managesieve/managesieve.c:436
 msgid "No Sieve auth method available\n"
 msgstr "Ningún método de autenticación Sieve disponible\n"
 
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:440
 msgid "Selected Sieve auth method not available\n"
 msgstr ""
 "El método para la autenticación Sieve seleccionado no está disponible\n"
 
-#: src/plugins/managesieve/managesieve.c:672
+#: src/plugins/managesieve/managesieve.c:673
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:677
 #, c-format
 msgid "Disconnected: %s"
 msgstr "Desconectado: %s"
 
-#: src/plugins/managesieve/managesieve.c:725
-#: src/plugins/managesieve/managesieve.c:870
+#: src/plugins/managesieve/managesieve.c:726
+#: src/plugins/managesieve/managesieve.c:871
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "mensaje desconocido en la sesión de Sieve: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:732
+#: src/plugins/managesieve/managesieve.c:733
 msgid "STARTTLS failed"
 msgstr "STARTTLS falló"
 
-#: src/plugins/managesieve/managesieve.c:797
-#: src/plugins/managesieve/managesieve.c:813
-#: src/plugins/managesieve/managesieve.c:840
-#: src/plugins/managesieve/managesieve.c:922
-#: src/plugins/managesieve/managesieve.c:940
+#: src/plugins/managesieve/managesieve.c:798
+#: src/plugins/managesieve/managesieve.c:814
+#: src/plugins/managesieve/managesieve.c:841
+#: src/plugins/managesieve/managesieve.c:923
+#: src/plugins/managesieve/managesieve.c:941
 msgid "error occurred on SIEVE session\n"
 msgstr "hubo un error en la sesión Sieve\n"
 
-#: src/plugins/managesieve/managesieve.c:866
+#: src/plugins/managesieve/managesieve.c:867
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "hubo un error en la sesión Sieve. data: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:875
+#: src/plugins/managesieve/managesieve.c:876
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "mensaje desconocido en la sesión de Sieve: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1132
+#: src/plugins/managesieve/managesieve.c:1153
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: reintentar autenticación\n"
 
-#: src/plugins/managesieve/managesieve.c:1134
+#: src/plugins/managesieve/managesieve.c:1155
 msgid "Auth method not available"
 msgstr "Método de autenticación no disponible"
 
-#: src/plugins/managesieve/managesieve.c:1151
+#: src/plugins/managesieve/managesieve.c:1172
 #, c-format
 msgid "sending error on Sieve session: %s\n"
 msgstr "enviando error en la sesión de Sieve: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5634
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5850
 msgid "_Filter"
 msgstr "_Filtrar"
 
 #: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:630
+#: src/plugins/managesieve/sieve_editor.c:632
 msgid "Chec_k Syntax"
 msgstr "Comprobar sinta_xis"
 
@@ -10759,8 +10908,8 @@ msgid "Re_vert"
 msgstr "Re_vertir"
 
 #: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:722
-#: src/plugins/managesieve/sieve_manager.c:182
+#: src/plugins/managesieve/sieve_editor.c:724
+#: src/plugins/managesieve/sieve_manager.c:183
 msgid "Unable to get script contents"
 msgstr "No se puede obtener el contenido del script"
 
@@ -10792,67 +10941,67 @@ msgstr "Guardando..."
 msgid "Checking syntax..."
 msgstr "Comprobando la sintaxis..."
 
-#: src/plugins/managesieve/sieve_editor.c:432
+#: src/plugins/managesieve/sieve_editor.c:433
 msgid "This script has been modified. Save the latest changes?"
 msgstr "Este script ha sido modificado. ¿Guardar los últimos cambios?"
 
-#: src/plugins/managesieve/sieve_editor.c:693
+#: src/plugins/managesieve/sieve_editor.c:695
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve Filtro%s"
 
-#: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1272
+#: src/plugins/managesieve/sieve_editor.c:744
+#: src/plugins/pdf_viewer/poppler_viewer.c:1315
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: src/plugins/managesieve/sieve_manager.c:159
-#: src/plugins/managesieve/sieve_manager.c:241
+#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:246
 msgid "Add Sieve script"
 msgstr "Añadir script Sieve"
 
-#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:161
 msgid "Enter name for a new Sieve filter script."
 msgstr "Introduzca un nombre para el nuevo script Sieve."
 
-#: src/plugins/managesieve/sieve_manager.c:242
+#: src/plugins/managesieve/sieve_manager.c:247
 msgid "Enter new name for the script."
 msgstr "Introduzca un nombre para el script."
 
-#: src/plugins/managesieve/sieve_manager.c:323
+#: src/plugins/managesieve/sieve_manager.c:328
 #, c-format
 msgid "Do you really want to delete the filter '%s'?"
 msgstr "¿Realmente desea eliminar el filtro «%s»?"
 
-#: src/plugins/managesieve/sieve_manager.c:324
+#: src/plugins/managesieve/sieve_manager.c:329
 msgid "Delete filter"
 msgstr "Eliminar filtro"
 
-#: src/plugins/managesieve/sieve_manager.c:478
+#: src/plugins/managesieve/sieve_manager.c:483
 msgid "Active"
 msgstr "Activo"
 
-#: src/plugins/managesieve/sieve_manager.c:489
+#: src/plugins/managesieve/sieve_manager.c:494
 msgid "An account can only have one active script at a time."
 msgstr "Una cuenta sólo puede tener un script activo a la vez."
 
-#: src/plugins/managesieve/sieve_manager.c:576
+#: src/plugins/managesieve/sieve_manager.c:581
 msgid "Unable to connect"
 msgstr "No se ha podido conectar"
 
-#: src/plugins/managesieve/sieve_manager.c:620
+#: src/plugins/managesieve/sieve_manager.c:628
 msgid "Listing scripts..."
 msgstr "Listando scripts..."
 
-#: src/plugins/managesieve/sieve_manager.c:623
+#: src/plugins/managesieve/sieve_manager.c:631
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/plugins/managesieve/sieve_manager.c:655
+#: src/plugins/managesieve/sieve_manager.c:663
 msgid "Manage Sieve Filters"
 msgstr "Gestionar filtros Sieve"
 
-#: src/plugins/managesieve/sieve_manager.c:796
+#: src/plugins/managesieve/sieve_manager.c:805
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "Para usar el Sieve, habilitarlo en las preferencias de la cuenta."
 
@@ -10875,109 +11024,110 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Activar Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1090
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
 msgid "Server information"
 msgstr "Información del servidor"
 
-#: src/plugins/managesieve/sieve_prefs.c:165
+#: src/plugins/managesieve/sieve_prefs.c:163
 msgid "Server name"
 msgstr "Nombre del servidor"
 
-#: src/plugins/managesieve/sieve_prefs.c:174
+#: src/plugins/managesieve/sieve_prefs.c:172
 msgid "Connect to this host instead of the host used for receiving mail"
 msgstr ""
 "Conectar a este servidor en lugar del servidor utilizado para recibir correo"
 
-#: src/plugins/managesieve/sieve_prefs.c:178
+#: src/plugins/managesieve/sieve_prefs.c:176
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#: src/plugins/managesieve/sieve_prefs.c:185
+#: src/plugins/managesieve/sieve_prefs.c:183
 msgid "Connect to this port instead of the default"
 msgstr "Conectar a este puerto en lugar del predeterminado"
 
-#: src/plugins/managesieve/sieve_prefs.c:189
+#: src/plugins/managesieve/sieve_prefs.c:187
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: src/plugins/managesieve/sieve_prefs.c:194
+#: src/plugins/managesieve/sieve_prefs.c:190
 msgid "No encryption"
 msgstr "Sin cifrado"
 
-#: src/plugins/managesieve/sieve_prefs.c:196
+#: src/plugins/managesieve/sieve_prefs.c:192
 msgid "Use STARTTLS when available"
 msgstr "Usar STARTTLS si está disponible"
 
-#: src/plugins/managesieve/sieve_prefs.c:198
+#: src/plugins/managesieve/sieve_prefs.c:194
 msgid "Require STARTTLS"
 msgstr "Requerir STARTTLS"
 
-#: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:262
+#: src/plugins/managesieve/sieve_prefs.c:202
+#: src/plugins/rssyl/rssyl_feed_props.c:268
 msgid "No authentication"
 msgstr "Sin autenticación"
 
-#: src/plugins/managesieve/sieve_prefs.c:208
+#: src/plugins/managesieve/sieve_prefs.c:204
 msgid "Use same authentication as for receiving mail"
 msgstr "Utilizar la misma autenticación que para la recepción de correo"
 
-#: src/plugins/managesieve/sieve_prefs.c:210
+#: src/plugins/managesieve/sieve_prefs.c:206
 msgid "Specify authentication"
 msgstr "Especificar autenticación"
 
-#: src/plugins/managesieve/sieve_prefs.c:240
+#: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1275
-#: src/prefs_account.c:1798
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1388
+#: src/prefs_account.c:1990
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:393
+#: src/plugins/managesieve/sieve_prefs.c:246
+#: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1281
-#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
-#: src/wizard.c:1214 src/wizard.c:1634
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1394
+#: src/prefs_account.c:2013 src/prefs_account.c:2741 src/prefs_account.c:2769
+#: src/prefs_account.c:2966 src/prefs_proxy.c:134 src/wizard.c:1216
+#: src/wizard.c:1636
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
-#: src/prefs_account.c:1770
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1701
+#: src/prefs_account.c:1962
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
-#: 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
-#: src/prefs_themes.c:1075
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1711
+#: src/prefs_account.c:1971 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/prefs_themes.c:1114
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/plugins/managesieve/sieve_prefs.c:391
+#: src/plugins/managesieve/sieve_prefs.c:390
 msgid "Sieve server must not contain a space."
 msgstr "El servidor de Sieve no debe contener un espacio."
 
-#: src/plugins/managesieve/sieve_prefs.c:397
+#: src/plugins/managesieve/sieve_prefs.c:396
 msgid "Sieve server is not entered."
 msgstr "No se especificó el servidor Sieve."
 
-#: src/plugins/managesieve/sieve_prefs.c:425
+#: src/plugins/managesieve/sieve_prefs.c:424
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:106 src/plugins/newmail/newmail.c:149
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "Registro de correo nuevo"
 
-#: src/plugins/newmail/newmail.c:111
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Falló el registro de la función de registro de correo nuevo"
 
-#: src/plugins/newmail/newmail.c:128
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "No se puede abrir el fichero de registro %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:141
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -10994,11 +11144,11 @@ msgstr ""
 "\n"
 "El registro actual esta en %s"
 
-#: src/plugins/newmail/newmail.c:175
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Fichero de registro"
 
-#: src/plugins/notification/notification_banner.c:356
+#: src/plugins/notification/notification_banner.c:357
 msgid "Folder:"
 msgstr "Carpeta:"
 
@@ -11199,8 +11349,8 @@ msgstr "Panel"
 msgid "Popup"
 msgstr "Emergente"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:263
-#: src/prefs_receive.c:152
+#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:264
+#: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Orden"
 
@@ -11267,13 +11417,13 @@ msgid "Show banner"
 msgstr "Mostrar panel"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
+#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nunca"
 
 #: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
-#: src/prefs_summaries.c:494 src/prefs_summaries.c:504
+#: src/prefs_summaries.c:502 src/prefs_summaries.c:555
 msgid "Always"
 msgstr "Siempre"
 
@@ -11348,8 +11498,8 @@ msgstr "Color de primer plano"
 
 #: src/plugins/notification/notification_prefs.c:927
 #: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:281 src/prefs_msg_colors.c:302
-#: src/prefs_msg_colors.c:323
+#: src/prefs_msg_colors.c:258 src/prefs_msg_colors.c:271
+#: src/prefs_msg_colors.c:284
 msgid "Background"
 msgstr "Fondo"
 
@@ -11368,14 +11518,6 @@ msgstr "Activar emergente"
 msgid "Popup timeout"
 msgstr "Tiempo límite del emergente"
 
-#: src/plugins/notification/notification_prefs.c:1072
-#: src/plugins/notification/notification_prefs.c:1367
-#: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:575
-#: src/prefs_receive.c:203 src/prefs_summaries.c:544
-msgid "seconds"
-msgstr "segundos"
-
 #: src/plugins/notification/notification_prefs.c:1101
 msgid "Make popup sticky"
 msgstr "Hacer el emergente persistente"
@@ -11409,7 +11551,7 @@ msgstr "Selecciona orden"
 msgid "Enable command"
 msgstr "Activar orden"
 
-#: src/plugins/notification/notification_prefs.c:1339
+#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "Orden a ejecutar"
 
@@ -11558,124 +11700,129 @@ msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "recibido %d artículo de canal RSS nuevo"
 msgstr[1] "recibidos %d artículos de canal RSS nuevos"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:699
+#: src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Title:"
 msgstr "Título:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Author:"
 msgstr "Autor:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Creator:"
 msgstr "Creador:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/plugins/pdf_viewer/poppler_viewer.c:709
 msgid "Producer:"
 msgstr "Productor:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:707
+#: src/plugins/pdf_viewer/poppler_viewer.c:712
 msgid "Created:"
 msgstr "Creado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:711
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:714
+#: src/plugins/pdf_viewer/poppler_viewer.c:719
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
-#: src/plugins/pdf_viewer/poppler_viewer.c:719
+#: src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/plugins/pdf_viewer/poppler_viewer.c:724
 msgid "Optimized:"
 msgstr "Optimizado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1177
+#: src/plugins/pdf_viewer/poppler_viewer.c:1217
 msgid "PDF properties"
 msgstr "Propiedades del PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1323
+#: src/plugins/pdf_viewer/poppler_viewer.c:1366
 msgid "Enter password"
 msgstr "Introducir contraseña"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1324
+#: src/plugins/pdf_viewer/poppler_viewer.c:1367
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr "Este documento está bloqueado y necesita una contraseña para abrirlo."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1339
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 #, c-format
 msgid "%s Document"
 msgstr "%s documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1345
+#: src/plugins/pdf_viewer/poppler_viewer.c:1388
 #, c-format
 msgid "of %d"
 msgstr "de %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1361
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 msgid "PDF rendering failed for an unknown reason."
 msgstr "La presentación del PDF falló por razones desconocidas."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1725
-#: src/plugins/pdf_viewer/poppler_viewer.c:1934
+#: src/plugins/pdf_viewer/poppler_viewer.c:1776
+#: src/plugins/pdf_viewer/poppler_viewer.c:1993
 msgid "Document Index"
 msgstr "Índice del documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1902
+#: src/plugins/pdf_viewer/poppler_viewer.c:1958
 msgid "First Page"
 msgstr "Primera página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1905
+#: src/plugins/pdf_viewer/poppler_viewer.c:1961
 msgid "Previous Page"
 msgstr "Página anterior"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1908
+#: src/plugins/pdf_viewer/poppler_viewer.c:1964
 msgid "Next Page"
 msgstr "Página siguiente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1911
+#: src/plugins/pdf_viewer/poppler_viewer.c:1967
 msgid "Last Page"
 msgstr "Última página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1914
+#: src/plugins/pdf_viewer/poppler_viewer.c:1970
 msgid "Zoom In"
 msgstr "Aumentar"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Zoom Out"
 msgstr "Disminuir"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Fit Page"
 msgstr "Ajustar página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1922
+#: src/plugins/pdf_viewer/poppler_viewer.c:1978
 msgid "Fit Page Width"
 msgstr "Ajustar ancho"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1925
+#: src/plugins/pdf_viewer/poppler_viewer.c:1981
 msgid "Rotate Left"
 msgstr "Rotar izquierda"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1928
+#: src/plugins/pdf_viewer/poppler_viewer.c:1984
 msgid "Rotate Right"
 msgstr "Rotar derecha"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1931
+#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#, fuzzy
+msgid "Print Document"
+msgstr "%s documento"
+
+#: src/plugins/pdf_viewer/poppler_viewer.c:1990
 msgid "Document Info"
 msgstr "Información del documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Page Number"
 msgstr "Número de página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1938
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Zoom Factor"
 msgstr "Factor de aumento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2043
+#: src/plugins/pdf_viewer/poppler_viewer.c:2108
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11688,13 +11835,13 @@ msgstr ""
 "\n"
 "Cualquier comentario será bienvenido: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2049
-#: src/plugins/pdf_viewer/poppler_viewer.c:2057
-#: src/plugins/pdf_viewer/poppler_viewer.c:2077
+#: src/plugins/pdf_viewer/poppler_viewer.c:2114
+#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2142
 msgid "PDF Viewer"
 msgstr "Visor PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2053
+#: src/plugins/pdf_viewer/poppler_viewer.c:2118
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11717,7 +11864,7 @@ msgstr "Editar reglas de filtrado perl (ext)..."
 msgid "Failed to register PGP address autocompletion hook"
 msgstr "Falló registrando el hook de completar direcciones en el módulo PGP"
 
-#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:127
+#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:147
 msgid "Passphrase"
 msgstr "Frase contraseña"
 
@@ -11821,7 +11968,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:283
+#: src/plugins/pgpcore/pgp_viewer.c:289
 msgid "   This key is in your keyring.\n"
 msgstr "   Esta clave está en su anillo de claves.\n"
 
@@ -11856,49 +12003,49 @@ msgstr ""
 msgid "Core operations"
 msgstr "Operaciones principales"
 
-#: src/plugins/pgpcore/prefs_gpg.c:122
+#: src/plugins/pgpcore/prefs_gpg.c:142
 msgid "Automatically check signatures"
 msgstr "Verificar firmas automáticamente"
 
-#: src/plugins/pgpcore/prefs_gpg.c:125
+#: src/plugins/pgpcore/prefs_gpg.c:145
 msgid "Use keyring for address autocompletion"
 msgstr "Usar el anillo de claves para autocompletar direcciones"
 
-#: src/plugins/pgpcore/prefs_gpg.c:130
+#: src/plugins/pgpcore/prefs_gpg.c:150
 msgid "Use gpg-agent to manage passwords"
 msgstr "Usar gpg-agent para gestionar las contraseñas"
 
-#: src/plugins/pgpcore/prefs_gpg.c:135
+#: src/plugins/pgpcore/prefs_gpg.c:155
 msgid "Store passphrase in memory"
 msgstr "Almacenar la contraseña en memoria"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145
+#: src/plugins/pgpcore/prefs_gpg.c:165
 msgid "Expire after"
 msgstr "Caduca después de"
 
-#: src/plugins/pgpcore/prefs_gpg.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:178
 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:474
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
-#: src/prefs_receive.c:187
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1782
+#: src/prefs_account.c:2079 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minutos"
 
-#: src/plugins/pgpcore/prefs_gpg.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:192
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada al introducir la contraseña"
 
-#: src/plugins/pgpcore/prefs_gpg.c:180
+#: src/plugins/pgpcore/prefs_gpg.c:199
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Mostrar un aviso al inicio si GnuPG no funciona"
 
-#: src/plugins/pgpcore/prefs_gpg.c:183
+#: src/plugins/pgpcore/prefs_gpg.c:202
 msgid "Path to GnuPG executable"
 msgstr "Ruta al ejecutable de GnuPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:188
+#: src/plugins/pgpcore/prefs_gpg.c:207
 msgid ""
 "If left blank the location of the GnuPG executable will be automatically "
 "determined."
@@ -11906,107 +12053,112 @@ msgstr ""
 "Si está en blanco la ubicación del ejecutable de GnuPG se determinará de "
 "manera automática."
 
-#: src/plugins/pgpcore/prefs_gpg.c:229
+#: src/plugins/pgpcore/prefs_gpg.c:248
 msgid "Select GnuPG executable"
 msgstr "Seleccionar ejecutable de GnuPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:356
+#: src/plugins/pgpcore/prefs_gpg.c:358
 msgid "Sign key"
 msgstr "Clave para firmar"
 
-#: src/plugins/pgpcore/prefs_gpg.c:364
+#: src/plugins/pgpcore/prefs_gpg.c:366
 msgid "Use default GnuPG key"
 msgstr "Usar la clave GnuPG predeterminada"
 
-#: src/plugins/pgpcore/prefs_gpg.c:375
+#: src/plugins/pgpcore/prefs_gpg.c:377
 msgid "Select key by your email address"
 msgstr "Seleccionar clave en base a la dirección de correo"
 
-#: src/plugins/pgpcore/prefs_gpg.c:386
+#: src/plugins/pgpcore/prefs_gpg.c:388
 msgid "Specify key manually"
 msgstr "Especificar la clave manualmente"
 
-#: src/plugins/pgpcore/prefs_gpg.c:396
+#: src/plugins/pgpcore/prefs_gpg.c:398
 msgid "User or key ID:"
 msgstr "Usuario o ID de clave:"
 
-#: src/plugins/pgpcore/prefs_gpg.c:437
+#: src/plugins/pgpcore/prefs_gpg.c:442
 msgid "No secret key found."
 msgstr "No se encontró ninguna clave secreta."
 
-#: src/plugins/pgpcore/prefs_gpg.c:440
+#: src/plugins/pgpcore/prefs_gpg.c:445
 msgid "Generate a new key pair"
 msgstr "Generar un nuevo par de claves"
 
-#: src/plugins/pgpcore/prefs_gpg.c:618
+#: src/plugins/pgpcore/prefs_gpg.c:688
 msgid "GPG"
 msgstr "GPG"
 
-#: src/plugins/pgpcore/select-keys.c:94
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
+#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:920
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: src/plugins/pgpcore/select-keys.c:98
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "No hay coincidencia exacta para «%s», por favor seleccione la clave."
 
-#: src/plugins/pgpcore/select-keys.c:97
+#: src/plugins/pgpcore/select-keys.c:101
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Recogiendo información para «%s» ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:146
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:149
-#: src/plugins/pgpcore/sgpgme.c:165
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/sgpgme.c:166
 msgid "Marginal"
 msgstr "Marginal"
 
-#: src/plugins/pgpcore/select-keys.c:246 src/plugins/pgpcore/sgpgme.c:153
-#: src/plugins/pgpcore/sgpgme.c:169
+#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
+#: src/plugins/pgpcore/sgpgme.c:170
 msgid "Ultimate"
 msgstr "Absoluta"
 
-#: src/plugins/pgpcore/select-keys.c:367
+#: src/plugins/pgpcore/select-keys.c:408
 msgid "Select Keys"
 msgstr "Seleccione claves"
 
-#: src/plugins/pgpcore/select-keys.c:394
+#: src/plugins/pgpcore/select-keys.c:457
 msgid "Key ID"
 msgstr "ID de clave"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:475
 msgid "Trust"
 msgstr "Confianza"
 
-#: src/plugins/pgpcore/select-keys.c:422
+#: src/plugins/pgpcore/select-keys.c:494
 msgid "_Other"
 msgstr "_Otras"
 
-#: src/plugins/pgpcore/select-keys.c:423
+#: src/plugins/pgpcore/select-keys.c:495
 msgid "Do_n't encrypt"
 msgstr "_No cifrar"
 
-#: src/plugins/pgpcore/select-keys.c:582
+#: src/plugins/pgpcore/select-keys.c:676
 msgid "Add key"
 msgstr "Añadir clave"
 
-#: src/plugins/pgpcore/select-keys.c:583
+#: src/plugins/pgpcore/select-keys.c:677
 msgid "Enter another user or key ID:"
 msgstr "Teclee otro usuario o ID-clave:"
 
-#: src/plugins/pgpcore/select-keys.c:605
+#: src/plugins/pgpcore/select-keys.c:699
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Cifrar para %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:606
-#, c-format
+#: src/plugins/pgpcore/select-keys.c:700
+#, 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 ""
@@ -12018,181 +12170,181 @@ msgstr ""
 "\n"
 "¿Es suficientemente fiable como para usarla de todas maneras?"
 
-#: src/plugins/pgpcore/sgpgme.c:83 src/privacy.c:249 src/privacy.c:253
+#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
 #: src/privacy.c:270 src/privacy.c:274
 msgid "No signature found"
 msgstr "No se encontró firma"
 
-#: src/plugins/pgpcore/sgpgme.c:163
+#: src/plugins/pgpcore/sgpgme.c:164
 msgid "Untrusted"
 msgstr "No fiable"
 
-#: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
+#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "La firma no se puede comprobar - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:241 src/plugins/pgpcore/sgpgme.c:245
+#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
 msgid "The signature has not been checked."
 msgstr "La firma no ha sido comprobada."
 
-#: src/plugins/pgpcore/sgpgme.c:251
+#: src/plugins/pgpcore/sgpgme.c:252
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 "Núcleo PGP: no se puede obtener la clave - gpg-agent no está ejecutándose."
 
-#: src/plugins/pgpcore/sgpgme.c:269
+#: src/plugins/pgpcore/sgpgme.c:270
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Firma válida de \"%s\" [ultimate]"
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:273
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Firma válida de \"%s\" [full]"
 
-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:276
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Firma válida de \"%s\" [marginal]"
 
-#: src/plugins/pgpcore/sgpgme.c:282
+#: src/plugins/pgpcore/sgpgme.c:283
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma válida de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:305
+#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr "La clave 0x%s no está disponible para verificar esta firma"
 
-#: src/plugins/pgpcore/sgpgme.c:292
+#: src/plugins/pgpcore/sgpgme.c:291
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:295
+#: src/plugins/pgpcore/sgpgme.c:294
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Firma válida de \"%s\", pero la clave ha expirado."
 
-#: src/plugins/pgpcore/sgpgme.c:298
+#: src/plugins/pgpcore/sgpgme.c:297
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Firma válida de \"%s\", pero la clave ha sido revocada."
 
-#: src/plugins/pgpcore/sgpgme.c:301
+#: src/plugins/pgpcore/sgpgme.c:300
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Firma inválida de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:310
+#: src/plugins/pgpcore/sgpgme.c:307
 msgid "The signature has not been checked"
 msgstr "La firma no ha sido comprobada"
 
-#: src/plugins/pgpcore/sgpgme.c:329
+#: src/plugins/pgpcore/sgpgme.c:330
 msgid "Error checking signature: no status\n"
 msgstr "Error verificando la firma digital: no hay estado\n"
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:348
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Error verificando la firma digital: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:365
+#: src/plugins/pgpcore/sgpgme.c:366
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Firma digital realizada el %s usando %s ID de clave %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:371
+#: src/plugins/pgpcore/sgpgme.c:372
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Firma válida del UID «%s» (Validez: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "UID de clave caducado «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:381
+#: src/plugins/pgpcore/sgpgme.c:382
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Firma caducada del UID «%s» (Validez: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:386
+#: src/plugins/pgpcore/sgpgme.c:387
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "UID de clave revocado «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:391
+#: src/plugins/pgpcore/sgpgme.c:392
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Firma INVÁLIDA de «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:404
+#: src/plugins/pgpcore/sgpgme.c:405
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "UID «%s» (Validez: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:406
+#: src/plugins/pgpcore/sgpgme.c:407
 msgid "Revoked"
 msgstr "Revocado"
 
-#: src/plugins/pgpcore/sgpgme.c:411
+#: src/plugins/pgpcore/sgpgme.c:412
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Confianza del propietario: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:412
+#: src/plugins/pgpcore/sgpgme.c:413
 msgid "No key!"
 msgstr "¡No hay clave!"
 
-#: src/plugins/pgpcore/sgpgme.c:414
+#: src/plugins/pgpcore/sgpgme.c:415
 msgid "Primary key fingerprint:"
 msgstr "Huella de clave primaria:"
 
-#: src/plugins/pgpcore/sgpgme.c:432
+#: src/plugins/pgpcore/sgpgme.c:433
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "AVISO: la dirección del firmante «%s» no coincide con la entrada DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:438
+#: src/plugins/pgpcore/sgpgme.c:439
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "La dirección verificada del firmante es «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:472
+#: src/plugins/pgpcore/sgpgme.c:473
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "No se puede obtener datos del mensaje, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:488
+#: src/plugins/pgpcore/sgpgme.c:489
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "No se puede inicializar datos, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:643
+#: src/plugins/pgpcore/sgpgme.c:666
 msgid "Secret key specification is ambiguous"
 msgstr "La especificación de clave secreta es ambigua"
 
-#: src/plugins/pgpcore/sgpgme.c:653
+#: src/plugins/pgpcore/sgpgme.c:676
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Clave secreta no encontrada (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:666
+#: src/plugins/pgpcore/sgpgme.c:689
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Error estableciendo clave secreta: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:759
+#: src/plugins/pgpcore/sgpgme.c:782
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "El protocolo «%s» de Gpgme no es utilizable: el motor «%s» no esta instalado "
 "apropiadamente."
 
-#: src/plugins/pgpcore/sgpgme.c:765
+#: src/plugins/pgpcore/sgpgme.c:788
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12201,12 +12353,12 @@ msgstr ""
 "El protocolo «%s» de Gpgme no es utilizable: el motor «%s» versión %s está "
 "instalado pero es necesaria la versión %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:773
+#: src/plugins/pgpcore/sgpgme.c:796
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "El protocolo «%s» de Gpgme no es utilizable: (problema desconocido)"
 
-#: src/plugins/pgpcore/sgpgme.c:789
+#: src/plugins/pgpcore/sgpgme.c:812
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12214,7 +12366,7 @@ msgstr ""
 "GnuPG no esta adecuadamente instalado o necesita actualizarse.\n"
 "Soporte de OpenPGP deshabilitado."
 
-#: src/plugins/pgpcore/sgpgme.c:866
+#: src/plugins/pgpcore/sgpgme.c:889
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12222,11 +12374,11 @@ msgstr ""
 "Tiene que guardar la información de la cuenta con «Aceptar» antes de poder "
 "generar un par de claves.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:871
+#: src/plugins/pgpcore/sgpgme.c:894
 msgid "No PGP key found"
 msgstr "No se encontró ninguna clave PGP"
 
-#: src/plugins/pgpcore/sgpgme.c:872
+#: src/plugins/pgpcore/sgpgme.c:895
 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"
@@ -12236,12 +12388,12 @@ msgstr ""
 "capaz de firmar correos o recibir correos cifrados.\n"
 "¿Quiere crear un nuevo par de claves ahora?"
 
-#: src/plugins/pgpcore/sgpgme.c:961 src/plugins/pgpcore/sgpgme.c:983
+#: src/plugins/pgpcore/sgpgme.c:984 src/plugins/pgpcore/sgpgme.c:1006
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "No se puede generar el nuevo par de claves: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:994
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12249,11 +12401,11 @@ msgstr ""
 "Generando su nuevo par de claves... Por favor mueva el ratón para ayudar a "
 "generar entropía..."
 
-#: src/plugins/pgpcore/sgpgme.c:989
+#: src/plugins/pgpcore/sgpgme.c:1012
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "No se puede generar el nuevo par de claves: error desconocido"
 
-#: src/plugins/pgpcore/sgpgme.c:993
+#: src/plugins/pgpcore/sgpgme.c:1016
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12266,62 +12418,62 @@ msgstr ""
 "\n"
 "¿Desea exportarla a un servidor de claves?"
 
-#: src/plugins/pgpcore/sgpgme.c:997
+#: src/plugins/pgpcore/sgpgme.c:1020
 msgid "Key generated"
 msgstr "Clave generada"
 
-#: src/plugins/pgpcore/sgpgme.c:1073
+#: src/plugins/pgpcore/sgpgme.c:1096
 msgid "Key exported."
 msgstr "Clave exportada."
 
-#: src/plugins/pgpcore/sgpgme.c:1075
+#: src/plugins/pgpcore/sgpgme.c:1098
 msgid "Couldn't export key."
 msgstr "No se pudo exportar la clave."
 
-#: src/plugins/pgpinline/pgpinline.c:155
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "Parte incorrecta"
 
-#: src/plugins/pgpinline/pgpinline.c:159
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "No es una parte de texto"
 
-#: src/plugins/pgpinline/pgpinline.c:170 src/plugins/pgpinline/pgpinline.c:322
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "No se puede obtener el texto."
 
-#: src/plugins/pgpinline/pgpinline.c:188
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "No se puede convertir el texto a un conjunto de caracteres válido."
 
-#: 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:510 src/plugins/pgpmime/pgpmime.c:653
-#: src/plugins/smime/smime.c:413
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
+#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
+#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
+#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:656
+#: src/plugins/smime/smime.c:418
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "No se pudo inicializar el contexto GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:315
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "No se puede procesar la parte mime."
 
-#: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "No se puede abrir el fichero descifrado %s"
 
-#: 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
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "No se puede escribir al fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:376 src/plugins/pgpinline/pgpinline.c:377
-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12329,53 +12481,53 @@ msgstr ""
 "\n"
 "--- Inicio de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:394 src/plugins/pgpinline/pgpinline.c:395
-#: src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Fin de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "No se puede cerrar el fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:427
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "No se puede escanear el fichero descifrado."
 
-#: src/plugins/pgpinline/pgpinline.c:435
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "No se pueden escanear las partes del fichero descifrado ."
 
-#: src/plugins/pgpinline/pgpinline.c:492 src/plugins/pgpinline/pgpinline.c:684
+#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
 msgid "Malformed message"
 msgstr "Mensaje mal formado"
 
-#: src/plugins/pgpinline/pgpinline.c:503 src/plugins/pgpinline/pgpinline.c:695
-#: src/plugins/pgpmime/pgpmime.c:693
+#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
+#: src/plugins/pgpmime/pgpmime.c:696
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "No se puede crear el fichero temporal, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:537
+#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Falló la firma de los datos, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:564
+#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "La firma de los datos falló debido a un firmante inválido: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:573
+#: src/plugins/pgpinline/pgpinline.c:570 src/plugins/pgpmime/pgpmime.c:575
 msgid "Data signing failed, no results."
 msgstr "Falló la firma de los datos, no hay resultados."
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:584
+#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
 msgid "Data signing failed, no contents."
 msgstr "Falló la firma de los datos, no hay contenido."
 
-#: src/plugins/pgpinline/pgpinline.c:623
+#: src/plugins/pgpinline/pgpinline.c:624
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -12383,17 +12535,17 @@ msgstr ""
 "Por favor, tenga en cuenta que los adjuntos no serán cifrados por el sistema "
 "PGP/Inline, ni tampoco las cabeceras de correo, como el Asunto."
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:663
+#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:666
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "No se pudo añadir la clave GPG %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:720
+#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:724
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falló el cifrado, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:795
+#: src/plugins/pgpinline/pgpinline.c:796
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -12427,28 +12579,28 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:203
+#: src/plugins/pgpmime/pgpmime.c:204
 msgid "Signature boundary not found."
 msgstr "No se encontró el delimitador de la firma."
 
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:499
 msgid "Couldn't parse decrypted file."
 msgstr "No se puede interpretar el fichero descifrado."
 
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:501
+#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:506
 msgid "Couldn't parse decrypted file parts."
 msgstr "No se pueden interpretar las partes del fichero."
 
-#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
+#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "No se puede crear el fichero temporal: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:597
+#: src/plugins/pgpmime/pgpmime.c:599
 msgid "OpenPGP digital signature"
 msgstr "Firma digital OpenPGP"
 
-#: src/plugins/pgpmime/pgpmime.c:619
+#: src/plugins/pgpmime/pgpmime.c:622
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -12456,7 +12608,7 @@ msgstr ""
 "Por favor, tenga en cuenta que las cabeceras de correo, como el Asunto, no "
 "serán cifradas por el sistema PGP/MIME."
 
-#: src/plugins/pgpmime/pgpmime.c:792
+#: src/plugins/pgpmime/pgpmime.c:798
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12488,36 +12640,36 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por 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:379
+#: src/plugins/python/python_plugin.c:523
 msgid "Python scripts"
 msgstr "Scripts Python"
 
-#: src/plugins/python/python_plugin.c:497
+#: src/plugins/python/python_plugin.c:518
 msgid "Show Python console..."
 msgstr "Mostrar la consola de Python..."
 
-#: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:481
+#: src/plugins/python/python_plugin.c:524
+#: src/plugins/rssyl/rssyl_feed_props.c:471
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: 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:1204
-#: src/wizard.c:1624
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:2730
+#: src/prefs_account.c:2758 src/prefs_account.c:3195 src/wizard.c:1206
+#: src/wizard.c:1626
 msgid "Browse"
 msgstr "Explorar"
 
-#: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:735
+#: src/plugins/python/python_plugin.c:672
+#: src/plugins/python/python_plugin.c:762
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:657
+#: src/plugins/python/python_plugin.c:681
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Error al registrar el «compose create hook» en el módulo Python"
 
-#: src/plugins/python/python_plugin.c:740
+#: src/plugins/python/python_plugin.c:767
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12606,7 +12758,7 @@ msgstr ""
 "\n"
 "Comentarios para <berndth at gmx.de> serán bienvenidos."
 
-#: src/plugins/python/python_plugin.c:791
+#: src/plugins/python/python_plugin.c:818
 msgid "Python integration"
 msgstr "Integración con Python"
 
@@ -12619,24 +12771,24 @@ msgstr ""
 "No se pudo leer el contenido del fichero antiguo «feeds.xml»:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:110
+#: src/plugins/rssyl/opml_export.c:111
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr "RSSyl: error escribiendo «%s» a la lista de exportación de canales.\n"
 
-#: src/plugins/rssyl/opml_export.c:131
+#: src/plugins/rssyl/opml_export.c:132
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: no se pudo borrar el antiguo fichero OPML: «%s»: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:141
+#: src/plugins/rssyl/opml_export.c:142
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 "RSSyl: no se pudo abrir el fichero «%s» para exportar la lista de canales: "
 "%s\n"
 
-#: src/plugins/rssyl/opml_export.c:182
+#: src/plugins/rssyl/opml_export.c:183
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: error escribiendo el fichero de exportación de canales.\n"
 
@@ -12671,44 +12823,45 @@ msgstr ""
 msgid "RSS feed"
 msgstr "Canal RSS"
 
-#: src/plugins/rssyl/rssyl_add_item.c:296
+#: src/plugins/rssyl/rssyl_add_item.c:304
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(vacío)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:167
+#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
 msgid "Refresh all feeds"
 msgstr "Refrescar todos los canales"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:65
+#: src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "Suscribir canal"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Introduzca la URL del canal de información al que suscribirse:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:98
+#: src/plugins/rssyl/rssyl_cb_menu.c:99
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "No se puede usar «%c» en el nombre de la carpeta."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/rssyl/rssyl_cb_menu.c:248 src/plugins/rssyl/rssyl_cb_menu.c:295
+#: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail necesita acceso a la red para actualizar el canal."
 msgstr[1] "Claws Mail necesita acceso a la red para actualizar los canales."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:314
+#: src/plugins/rssyl/rssyl_cb_menu.c:321
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "¿Quiere realmente eliminar el árbol de canales «%s»?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:315
+#: src/plugins/rssyl/rssyl_cb_menu.c:322
 msgid "Remove feed tree"
 msgstr "Eliminar árbol de canales"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:349
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
 msgid "Select an OPML file"
 msgstr "Seleccionar un fichero OPML"
 
@@ -12754,51 +12907,51 @@ msgstr ""
 "RSSyl: La aplicación está finalizando, no se pudo finalizar la actualización "
 "del canal en «%s»\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:268
+#: src/plugins/rssyl/rssyl_feed_props.c:270
 msgid "HTTP Basic authentication"
 msgstr "Usar autenticación HTTP básica"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:289
+#: src/plugins/rssyl/rssyl_feed_props.c:292
 msgid "Use default refresh interval"
 msgstr "Usar el intervalo de refresco predeterminado"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:301
+#: src/plugins/rssyl/rssyl_feed_props.c:304
 msgid "Keep old items"
 msgstr "Guardar elementos antiguos"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:307
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "_Trim"
 msgstr "Recor_tar"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:312
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "Actualizar canal, borrando elementos que no se encuentren en la fuente"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:312
+#: src/plugins/rssyl/rssyl_feed_props.c:315
 msgid "Fetch comments if possible"
 msgstr "Recuperar los comentarios si es posible"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:335
 msgid "Always mark it as new"
 msgstr "Marcarlo siempre como nuevo"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:337
 msgid "Only mark it as new if its text has changed"
 msgstr "Sólo marcarlo como nuevo si su texto ha cambiado"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:349
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Never mark it as new"
 msgstr "Nunca marcarlo como nuevo"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:354
+#: src/plugins/rssyl/rssyl_feed_props.c:344
 msgid "Add item title to the top of message"
 msgstr "Añadir el título del elemento en la parte superior del mensaje"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:361
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid "Ignore title rename"
 msgstr "Ignorar el renombrado del título"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:366
+#: src/plugins/rssyl/rssyl_feed_props.c:356
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -12806,54 +12959,54 @@ msgstr ""
 "Activar esto para mantener el nombre actual de la capeta incluso si el autor "
 "del canal cambia el título del mismo."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:370
+#: src/plugins/rssyl/rssyl_feed_props.c:360
 #: src/plugins/vcalendar/vcal_prefs.c:593
 msgid "Verify SSL/TLS certificate validity"
 msgstr "Verificar la validez del certificado SSL/TLS"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:390
+#: src/plugins/rssyl/rssyl_feed_props.c:380
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:403
+#: src/plugins/rssyl/rssyl_feed_props.c:393
 msgid "Source URL"
 msgstr "URL de origen"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:416
+#: src/plugins/rssyl/rssyl_feed_props.c:406
 msgid "Fetch comments on posts aged less than"
 msgstr "Recuperar los comentarios de elementos con una antiguedad inferior a"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:424
-#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1480 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
+#: src/prefs_account.c:1608 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "días"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:425
+#: src/plugins/rssyl/rssyl_feed_props.c:415
 msgid "Set to -1 to fetch all comments"
 msgstr "Establecer a -1 para recuperarlos todos"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:449
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "If an item changes"
 msgstr "Si un elemento cambia"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:454
+#: src/plugins/rssyl/rssyl_feed_props.c:444
 msgid "Items"
 msgstr "Elementos"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:467
+#: src/plugins/rssyl/rssyl_feed_props.c:457
 msgid "Refresh interval"
 msgstr "Intervalo de refresco"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/rssyl/rssyl_feed_props.c:465
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Establecer a 0 para desactivar el refresco automático de este canal"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:527
+#: src/plugins/rssyl/rssyl_feed_props.c:517
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:535
+#: src/plugins/rssyl/rssyl_feed_props.c:525
 msgid "Set feed properties"
 msgstr "Establecer las propiedades del canal"
 
@@ -12974,27 +13127,27 @@ msgstr "_Editar propiedades del canal después de suscribirse"
 msgid "Updating comments for '%s'..."
 msgstr "Actualizando comentarios para «%s»..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/rssyl/rssyl_update_feed.c:107
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Se requiere autorización)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "403 (Unauthorised)"
 msgstr "403 (No autorizado)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:113
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (No encontrado)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:114
+#: src/plugins/rssyl/rssyl_update_feed.c:116
 #, c-format
 msgid "Error %d"
 msgstr "Error %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:127
+#: src/plugins/rssyl/rssyl_update_feed.c:129
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -13008,7 +13161,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:140
+#: src/plugins/rssyl/rssyl_update_feed.c:142
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -13017,21 +13170,21 @@ msgstr ""
 "Canal no válido encontrado en\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:152
+#: src/plugins/rssyl/rssyl_update_feed.c:154
 msgid "Untitled feed"
 msgstr "Canal sin título"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:156
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: Posible canal inválido sin título en «%s»\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:231
+#: src/plugins/rssyl/rssyl_update_feed.c:233
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "Actualizando canal «%s»..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:258
+#: src/plugins/rssyl/rssyl_update_feed.c:270
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13044,11 +13197,11 @@ msgstr ""
 "\n"
 "Por favor contacte con los desarrolladores, esto no debería suceder."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:342
+#: src/plugins/rssyl/rssyl_update_feed.c:356
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail necesita acceso a la red para actualizar los canales."
 
-#: src/plugins/rssyl/rssyl_update_format.c:127
+#: src/plugins/rssyl/rssyl_update_format.c:128
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13057,11 +13210,6 @@ msgstr ""
 "suceder. Por favor informe de esto, con la información de depuración "
 "adjunta.\n"
 
-#: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:913
-msgid "S/MIME"
-msgstr "S/MIME"
-
 #: src/plugins/smime/plugin.c:59
 msgid ""
 "This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
@@ -13098,24 +13246,24 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:421
+#: src/plugins/smime/smime.c:426
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "No se pudo establecer el protocolo GPG, %s"
 
-#: src/plugins/smime/smime.c:449
+#: src/plugins/smime/smime.c:454
 msgid "Couldn't open temporary file"
 msgstr "No se pudo abrir el fichero temporal"
 
-#: src/plugins/smime/smime.c:460 src/plugins/smime/smime.c:475
+#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
 msgid "Couldn't write to temporary file"
 msgstr "No se pudo escribir en el fichero temporal"
 
-#: src/plugins/smime/smime.c:486
+#: src/plugins/smime/smime.c:491
 msgid "Couldn't close temporary file"
 msgstr "No se pudo cerrar el fichero temporal"
 
-#: src/plugins/smime/smime.c:708
+#: src/plugins/smime/smime.c:714
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -13123,21 +13271,21 @@ msgstr ""
 "Por favor, tenga en cuenta que las cabeceras de correo, como el Asunto, no "
 "serán cifradas por el sistema S/MIME."
 
-#: src/plugins/spam_report/spam_report.c:301
+#: src/plugins/spam_report/spam_report.c:307
 msgid "Reporting spam..."
 msgstr "Informando de correo basura..."
 
-#: src/plugins/spam_report/spam_report.c:336
+#: src/plugins/spam_report/spam_report.c:342
 msgid "Report spam online..."
 msgstr "Informar de correo basura en línea..."
 
-#: src/plugins/spam_report/spam_report.c:347
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:353
+#: src/plugins/spam_report/spam_report.c:391
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "Informe de correo basura"
 
-#: src/plugins/spam_report/spam_report.c:390
+#: src/plugins/spam_report/spam_report.c:396
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13153,7 +13301,7 @@ msgstr ""
 " * spamcop.net\n"
 " * sistema de nominación de lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:415
+#: src/plugins/spam_report/spam_report.c:421
 msgid "Spam reporting"
 msgstr "Informe de correo basura"
 
@@ -13165,32 +13313,32 @@ msgstr "Habilitado"
 msgid "Forward to:"
 msgstr "Reenviar a:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1572
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:649
+#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin_gtk.c:671
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:169
+#: src/plugins/spamassassin/spamassassin.c:182
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "El módulo SpamAssassin no pudo conectar con spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:185
+#: src/plugins/spamassassin/spamassassin.c:198
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Falló el filtrado con el módulo SpamAssassin.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:211
+#: src/plugins/spamassassin/spamassassin.c:224
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "El módulo SpamAssassin esta deshabilitado por sus preferencias.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:216
+#: src/plugins/spamassassin/spamassassin.c:229
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrando mensaje..."
 
-#: src/plugins/spamassassin/spamassassin.c:345
+#: src/plugins/spamassassin/spamassassin.c:358
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
@@ -13200,7 +13348,7 @@ msgstr ""
 "error es que el demonio spamd no está disponible. Por favor, asegúrese de "
 "que spamd está ejecutándose y accesible."
 
-#: src/plugins/spamassassin/spamassassin.c:402
+#: src/plugins/spamassassin/spamassassin.c:416
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13208,17 +13356,17 @@ msgstr ""
 "Claws Mail necesita acceso a la red para enviar este correo al programa de "
 "aprendizaje remoto."
 
-#: src/plugins/spamassassin/spamassassin.c:547
+#: src/plugins/spamassassin/spamassassin.c:561
 msgid "Failed to get username"
 msgstr "Fallo al obtener en nombre de usuario"
 
-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:578
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "El módulo SpamAssassin esta cargado pero deshabilitado por sus "
 "preferencias.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:593
+#: src/plugins/spamassassin/spamassassin.c:612
 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 "
@@ -13242,59 +13390,68 @@ msgstr ""
 "\n"
 "Las opciones están en /Configuración/Preferencias/Módulos/SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:90
+#: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
 msgstr "Máquina local"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:92
 msgid "TCP"
 msgstr "TCP"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Unix Socket"
 msgstr "Conector Unix"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:119
+#: src/plugins/spamassassin/spamassassin_gtk.c:122
 msgid "Select folder to save spam to"
 msgstr "Seleccionar la carpeta en la que guardar el correo basura"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:269
+#: src/plugins/spamassassin/spamassassin_gtk.c:274
 msgid "Enable SpamAssassin plugin"
 msgstr "Habilitar el módulo SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:273
+#: src/plugins/spamassassin/spamassassin_gtk.c:278
 msgid "Transport"
 msgstr "Transporte"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:281
+#: src/plugins/spamassassin/spamassassin_gtk.c:286
 msgid "Type of transport"
 msgstr "Tipo de transporte"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:302
+#: src/plugins/spamassassin/spamassassin_gtk.c:307
 msgid "User"
 msgstr "Usuario"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:315
+#: src/plugins/spamassassin/spamassassin_gtk.c:320
 msgid "User to use with spamd server"
 msgstr "Usuario a utilizar con el servidor spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:317
+#: src/plugins/spamassassin/spamassassin_gtk.c:322
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:335
+#: src/plugins/spamassassin/spamassassin_gtk.c:340
 msgid "Hostname or IP address of spamd server"
 msgstr "Nombre o dirección IP del servidor spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:346
+#: src/plugins/spamassassin/spamassassin_gtk.c:351
 msgid "Port of spamd server"
 msgstr "Puerto del servidor spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:352
+#: src/plugins/spamassassin/spamassassin_gtk.c:357
 msgid "Path of Unix socket"
 msgstr "Ruta al conector Unix"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#, fuzzy
+msgid "Use compression"
+msgstr "Elija la compresión"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:368
+msgid "Enable compression if spamd uses it, otherwise disable it."
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:403
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13302,7 +13459,7 @@ msgstr ""
 "Tiempo máximo permitido para la comprobación. Si la comprobación lleva más "
 "tiempo será cancelada."
 
-#: src/plugins/tnef_parse/tnef_parse.c:73
+#: src/plugins/tnef_parse/tnef_parse.c:74
 #, c-format
 msgid ""
 "\n"
@@ -13315,29 +13472,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:130
-#: src/plugins/tnef_parse/tnef_parse.c:137
+#: src/plugins/tnef_parse/tnef_parse.c:131
+#: src/plugins/tnef_parse/tnef_parse.c:138
 msgid "Failed to write the part data."
 msgstr "Falló la escritura de la parte de datos."
 
-#: src/plugins/tnef_parse/tnef_parse.c:182
+#: src/plugins/tnef_parse/tnef_parse.c:183
 msgid "Failed to parse VCalendar data."
 msgstr "Falló la interpretación de los datos VCalendar."
 
-#: src/plugins/tnef_parse/tnef_parse.c:221
+#: src/plugins/tnef_parse/tnef_parse.c:222
 msgid "Failed to parse VTask data."
 msgstr "Falló la interpretación de los datos VTask."
 
-#: src/plugins/tnef_parse/tnef_parse.c:273
+#: src/plugins/tnef_parse/tnef_parse.c:274
 msgid "Failed to parse VCard data."
 msgstr "Falló la interpretación de los datos VCard."
 
-#: src/plugins/tnef_parse/tnef_parse.c:413
-#: src/plugins/tnef_parse/tnef_parse.c:437
+#: src/plugins/tnef_parse/tnef_parse.c:414
+#: src/plugins/tnef_parse/tnef_parse.c:438
 msgid "TNEF Parser"
 msgstr "Lector TNEF"
 
-#: src/plugins/tnef_parse/tnef_parse.c:442
+#: src/plugins/tnef_parse/tnef_parse.c:443
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13366,11 +13523,11 @@ msgstr "_Crear nueva reunión..."
 msgid "_Go to today"
 msgstr "_Ir a hoy"
 
-#: src/plugins/vcalendar/day-view.c:593 src/plugins/vcalendar/month-view.c:690
+#: src/plugins/vcalendar/day-view.c:594 src/plugins/vcalendar/month-view.c:690
 msgid "Start"
 msgstr "Inicio"
 
-#: src/plugins/vcalendar/day-view.c:606 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
 msgid "Show"
 msgstr "Mostrar"
 
@@ -13450,15 +13607,15 @@ msgstr "Noviembre"
 msgid "December"
 msgstr "Diciembre"
 
-#: src/plugins/vcalendar/month-view.c:796
+#: src/plugins/vcalendar/month-view.c:798
 msgid "Week number"
 msgstr "N.º de semana"
 
-#: src/plugins/vcalendar/month-view.c:886
+#: src/plugins/vcalendar/month-view.c:889
 msgid "Previous month"
 msgstr "Mes anterior"
 
-#: src/plugins/vcalendar/month-view.c:906
+#: src/plugins/vcalendar/month-view.c:909
 msgid "Next month"
 msgstr "Mes siguiente"
 
@@ -13506,65 +13663,65 @@ msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "Está a punto de crear %d reuniones, una a una. ¿Desea continuar?"
 
-#: src/plugins/vcalendar/vcalendar.c:139
+#: src/plugins/vcalendar/vcalendar.c:140
 msgid "Creating meeting..."
 msgstr "Creando reunión..."
 
-#: src/plugins/vcalendar/vcalendar.c:158
+#: src/plugins/vcalendar/vcalendar.c:159
 msgid "no subject"
 msgstr "sin asunto"
 
-#: src/plugins/vcalendar/vcalendar.c:384
+#: src/plugins/vcalendar/vcalendar.c:385
 msgid "Accept"
 msgstr "Aceptar"
 
-#: src/plugins/vcalendar/vcalendar.c:385
+#: src/plugins/vcalendar/vcalendar.c:386
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: src/plugins/vcalendar/vcalendar.c:386
+#: src/plugins/vcalendar/vcalendar.c:387
 msgid "Decline"
 msgstr "Rehusar"
 
-#: src/plugins/vcalendar/vcalendar.c:473
+#: src/plugins/vcalendar/vcalendar.c:474
 msgid "You have a Todo item."
 msgstr "Tiene un elemento pendiente."
 
-#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
-#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
-#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:744
+#: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
+#: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
+#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:716
 msgid "Details follow:"
 msgstr "Los detalles son los siguientes:"
 
-#: src/plugins/vcalendar/vcalendar.c:480
+#: src/plugins/vcalendar/vcalendar.c:481
 msgid "You have created a meeting."
 msgstr "Ha creado una reunión."
 
-#: src/plugins/vcalendar/vcalendar.c:485
+#: src/plugins/vcalendar/vcalendar.c:486
 msgid "You have been invited to a meeting."
 msgstr "Ha sido invitado a una reunión."
 
-#: src/plugins/vcalendar/vcalendar.c:493
+#: src/plugins/vcalendar/vcalendar.c:494
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr "Se ha cancelado una reunión a la que había sido invitado."
 
-#: src/plugins/vcalendar/vcalendar.c:502
+#: src/plugins/vcalendar/vcalendar.c:503
 msgid "You have been forwarded an appointment."
 msgstr "Se le ha enviado una cita."
 
-#: src/plugins/vcalendar/vcalendar.c:556
+#: src/plugins/vcalendar/vcalendar.c:557
 msgid "(this event recurs)"
 msgstr "(este evento es recurrente)"
 
-#: src/plugins/vcalendar/vcalendar.c:563
+#: src/plugins/vcalendar/vcalendar.c:564
 msgid "(this event is part of a recurring event)"
 msgstr "(este evento es parte de un evento recurrente)"
 
-#: src/plugins/vcalendar/vcalendar.c:743
+#: src/plugins/vcalendar/vcalendar.c:715
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Se recibió una respuesta a una propuesta de reunión desconocida."
 
-#: src/plugins/vcalendar/vcalendar.c:747
+#: src/plugins/vcalendar/vcalendar.c:719
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13573,35 +13730,35 @@ msgstr ""
 "Se recibió una respuesta a una propuesta de reunión.\n"
 "%s ha %s la invitación cuyos detalles se indican:"
 
-#: src/plugins/vcalendar/vcalendar.c:826
+#: src/plugins/vcalendar/vcalendar.c:798
 msgid "Error - could not get the calendar MIME part."
 msgstr "Error - no se pudo obtener la parte MIME del calendario."
 
-#: src/plugins/vcalendar/vcalendar.c:833
+#: src/plugins/vcalendar/vcalendar.c:805
 msgid "Error - no calendar part found."
 msgstr "Error - no se encontró la parte del calendario."
 
-#: src/plugins/vcalendar/vcalendar.c:847
+#: src/plugins/vcalendar/vcalendar.c:819
 msgid "Error - Unknown calendar component type."
 msgstr "Error - Tipo de componente de calendario desconocido."
 
-#: src/plugins/vcalendar/vcalendar.c:976
+#: src/plugins/vcalendar/vcalendar.c:951
 msgid "Send a notification to the attendees"
 msgstr "Enviar una notificación a los asistentes"
 
-#: src/plugins/vcalendar/vcalendar.c:985
+#: src/plugins/vcalendar/vcalendar.c:960
 msgid "Cancel meeting"
 msgstr "Cancelar reunión"
 
-#: src/plugins/vcalendar/vcalendar.c:986
+#: src/plugins/vcalendar/vcalendar.c:961
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "¿Está seguro de que quiere cancelar esta reunión?"
 
-#: src/plugins/vcalendar/vcalendar.c:1081
+#: src/plugins/vcalendar/vcalendar.c:1056
 msgid "No account found"
 msgstr "No se encontró ninguna cuenta"
 
-#: src/plugins/vcalendar/vcalendar.c:1082
+#: src/plugins/vcalendar/vcalendar.c:1057
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13609,128 +13766,128 @@ msgstr ""
 "No tiene ninguna cuenta que coincida con algún convocado.\n"
 "¿Desea responder de todas maneras?"
 
-#: src/plugins/vcalendar/vcalendar.c:1084
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid "Reply anyway"
 msgstr "Responder igualmente"
 
-#: src/plugins/vcalendar/vcalendar.c:1213
+#: src/plugins/vcalendar/vcalendar.c:1188
 msgid "Answer"
 msgstr "Responder"
 
-#: src/plugins/vcalendar/vcalendar.c:1214
+#: src/plugins/vcalendar/vcalendar.c:1189
 msgid "Edit meeting..."
 msgstr "Editar reunión..."
 
-#: src/plugins/vcalendar/vcalendar.c:1215
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Cancel meeting..."
 msgstr "Cancelar reunión..."
 
-#: src/plugins/vcalendar/vcalendar.c:1216
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Launch website"
 msgstr "Abrir página web"
 
-#: src/plugins/vcalendar/vcalendar.c:1220
+#: src/plugins/vcalendar/vcalendar.c:1195
 msgid "You are already busy at this time."
 msgstr "Usted ya está ocupado a esa hora."
 
-#: src/plugins/vcalendar/vcalendar.c:1259
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Evento:"
 
-#: src/plugins/vcalendar/vcalendar.c:1260
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1705
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
+#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: src/plugins/vcalendar/vcalendar.c:1261
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
+#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: src/plugins/vcalendar/vcalendar.c:1262
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
+#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Resumen:"
 
-#: src/plugins/vcalendar/vcalendar.c:1263
+#: src/plugins/vcalendar/vcalendar.c:1238
 msgid "Starting:"
 msgstr "Comienza:"
 
-#: src/plugins/vcalendar/vcalendar.c:1264
+#: src/plugins/vcalendar/vcalendar.c:1239
 msgid "Ending:"
 msgstr "Finaliza:"
 
-#: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1710
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
+#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Convocados:"
 
-#: src/plugins/vcalendar/vcalendar.c:1268
+#: src/plugins/vcalendar/vcalendar.c:1243
 msgid "Action:"
 msgstr "Acción:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_New meeting..."
 msgstr "_Nueva reunión..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Export calendar..."
 msgstr "_Exportar calendario..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Subscribe to Webcal..."
 msgstr "_Suscribirse a Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "U_pdate subscriptions"
 msgstr "A_ctualizar suscripciones"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_List view"
 msgstr "Vista en _lista"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:175
 msgid "_Week view"
 msgstr "Vista _semanal"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:176
 msgid "_Month view"
 msgstr "Vista _mensual"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1103
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "in the past"
 msgstr "en el pasado"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "today"
 msgstr "hoy"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "tomorrow"
 msgstr "mañana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "this week"
 msgstr "esta semana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1514
 msgid "later"
 msgstr "más tarde"
 
-#: src/plugins/vcalendar/vcal_folder.c:1516
+#: src/plugins/vcalendar/vcal_folder.c:1518
 #, c-format
 msgid ""
 "\n"
@@ -13739,12 +13896,12 @@ msgstr ""
 "\n"
 "Estos son los eventos planificados %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1611
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Excedido el tiempo (%d segundos) conectando a %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "Error %ld"
@@ -13762,7 +13919,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1841
+#: src/plugins/vcalendar/vcal_folder.c:1846
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -13773,133 +13930,134 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1872
-#: src/plugins/vcalendar/vcal_folder.c:1875
+#: src/plugins/vcalendar/vcal_folder.c:1877
+#: src/plugins/vcalendar/vcal_folder.c:1880
 #, c-format
 msgid "Could not create directory %s"
 msgstr "No se puede crear el directorio %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1915
+#: src/plugins/vcalendar/vcal_folder.c:1920
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws Mail necesita acceso a la red para actualizar la subscripción del "
 "calendario web."
 
-#: src/plugins/vcalendar/vcal_folder.c:1926
+#: src/plugins/vcalendar/vcal_folder.c:1931
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Recuperando calendario para %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1932
 msgid "new subscription"
 msgstr "nueva suscripción"
 
-#: src/plugins/vcalendar/vcal_folder.c:1938
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder actualizar la subscripción."
 
-#: src/plugins/vcalendar/vcal_folder.c:1950
+#: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Subscribe to Webcal"
 msgstr "Suscribirse a un calendario web"
 
-#: src/plugins/vcalendar/vcal_folder.c:1950
-msgid "Enter the WebCal URL:"
+#: src/plugins/vcalendar/vcal_folder.c:1955
+#, fuzzy
+msgid "Enter the Webcal URL:"
 msgstr "Introduzca la URL del calendario web (WebCal):"
 
-#: src/plugins/vcalendar/vcal_folder.c:1962
+#: src/plugins/vcalendar/vcal_folder.c:1967
 msgid "Could not parse the URL."
 msgstr "No se pudo procesar la URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1990
+#: src/plugins/vcalendar/vcal_folder.c:1995
 msgid "Do you really want to unsubscribe?"
 msgstr "¿Desea realmente desuscribirse?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1991
+#: src/plugins/vcalendar/vcal_folder.c:1996
 msgid "Delete subscription"
 msgstr "Borrar suscripción"
 
-#: src/plugins/vcalendar/vcal_manager.c:110
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "accepted"
 msgstr "aceptada"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "tentatively accepted"
 msgstr "aceptada provisionalmente"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "declined"
 msgstr "rehusada"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:114
 msgid "did not answer"
 msgstr "no respondió"
 
-#: src/plugins/vcalendar/vcal_manager.c:144
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "individual"
 msgstr "individuo"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "group"
 msgstr "grupo"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "resource"
 msgstr "recurso"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "room"
 msgstr "lugar"
 
-#: src/plugins/vcalendar/vcal_manager.c:558
+#: src/plugins/vcalendar/vcal_manager.c:560
 msgid "Past"
 msgstr "Pasado"
 
-#: src/plugins/vcalendar/vcal_manager.c:561
+#: src/plugins/vcalendar/vcal_manager.c:563
 msgid "Today"
 msgstr "Hoy"
 
-#: src/plugins/vcalendar/vcal_manager.c:564
+#: src/plugins/vcalendar/vcal_manager.c:566
 msgid "Tomorrow"
 msgstr "Mañana"
 
-#: src/plugins/vcalendar/vcal_manager.c:567
+#: src/plugins/vcalendar/vcal_manager.c:569
 msgid "This week"
 msgstr "Esta semana"
 
-#: src/plugins/vcalendar/vcal_manager.c:570
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Later"
 msgstr "Más tarde"
 
-#: src/plugins/vcalendar/vcal_manager.c:1246
+#: src/plugins/vcalendar/vcal_manager.c:1248
 msgid "Accepted: "
 msgstr "Aceptada: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1250
 msgid "Declined: "
 msgstr "Rehusada: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1252
 msgid "Tentatively Accepted: "
 msgstr "Aceptada provisionalmente: "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:307
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Individual"
 msgstr "Individuo"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
 msgid "Resource"
 msgstr "Recurso"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:311
 msgid "Room"
 msgstr "Lugar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324
 msgid "Add..."
 msgstr "Añadir..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:779
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:728
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
@@ -13907,62 +14065,62 @@ msgstr ""
 "Las siguientes personas están ocupadas a la hora planeada para su reunión:\n"
 "- "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:869
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:818
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:904
 msgid "You"
 msgstr "Usted"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:781
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:730
 msgid "You are busy at the time of your planned meeting"
 msgstr "Usted está ocupado a la hora planeada de su reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:783
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:732
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr "%s está ocupado a la hora planeada para su reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:734
 #, c-format
 msgid "%d hour sooner"
 msgstr "%d hora más temprano"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:736
 #, c-format
 msgid "%d hours sooner"
 msgstr "%d horas más temprano"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:738
 #, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr "%d horas y %d minutos más temprano"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:791
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
 #, c-format
 msgid "%d minutes sooner"
 msgstr "%d minutos más temprano"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:796
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:745
 #, c-format
 msgid "%d hour later"
 msgstr "%d hora más tarde"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:798
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:747
 #, c-format
 msgid "%d hours later"
 msgstr "%d horas más tarde"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:800
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:749
 #, c-format
 msgid "%d hours and %d minutes later"
 msgstr "%d horas y %d minutos más tarde"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:802
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:751
 #, c-format
 msgid "%d minutes later"
 msgstr "%d minutos más tarde"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:808
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
 #, c-format
 msgid ""
 "\n"
@@ -13973,7 +14131,7 @@ msgstr ""
 "\n"
 "Todos estarían disponibles %s o %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:810
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
 #, c-format
 msgid ""
 "\n"
@@ -13984,7 +14142,7 @@ msgstr ""
 "\n"
 "Todos estarían disponibles %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:812
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
 msgid ""
 "\n"
 "\n"
@@ -13996,74 +14154,74 @@ msgstr ""
 "No es posible realizar esta reunión con todos entre las 6 horas anteriores o "
 "siguientes."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:817
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:766
 #, c-format
 msgid "would be available %s or %s"
 msgstr "estaría disponible %s o %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:819
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:768
 #, c-format
 msgid "would be available %s"
 msgstr "estaría disponible %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:821
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:882
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:952
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:770
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:831
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:901
 msgid "not available"
 msgstr "no está disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:824
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
 #, c-format
 msgid ", but would be available %s or %s."
 msgstr ", pero estaría disponible %s o %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:826
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:775
 #, c-format
 msgid ", but would be available %s."
 msgstr ", pero estaría disponible %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:828
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:777
 msgid ", and isn't available in the previous or next 6 hours."
 msgstr ", y no está disponible entre las 6 horas anteriores o siguientes."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:885
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:834
 msgid "available"
 msgstr "disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:887
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1136
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:836
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 msgid "Free/busy retrieval failed"
 msgstr "Falló la recuperación de libre/ocupado"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:969
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:918
 msgid "Not everyone is available"
 msgstr "No todos están disponibles"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:970
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:919
 msgid "Send anyway"
 msgstr "Enviar igualmente"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:981
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
 "No todos están disponibles. Vea las notas flotantes para más información..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1069
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Recuperando la planificación para %s..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1145
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
 msgid "Available"
 msgstr "Disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1158
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1165
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1109
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1124
 msgid "Everyone is available."
 msgstr "Todos están disponibles."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1174
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -14071,7 +14229,7 @@ msgstr ""
 "Todos parecen estar disponibles, pero no se pudo recuperar alguna "
 "información de libre/ocupado."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1340
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14079,61 +14237,61 @@ msgstr ""
 "No se pudo enviar la invitación de reunión.\n"
 "Compruebe los destinatarios."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1461
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
 msgid "Save & Send"
 msgstr "Guardar y enviar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1462
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
 msgid "Check availability"
 msgstr "Comprobar disponibilidad"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1585
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
 msgid "Starts at:"
 msgstr "Comienza a las:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:767
 msgid "on:"
 msgstr "en:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
 msgid "Ends at:"
 msgstr "Finaliza a las:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1650
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
 msgid "New meeting"
 msgstr "Nueva reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1652
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Editar reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "Time:"
 msgstr "Hora:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1864
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Evento inminente: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1879
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14150,39 +14308,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "Recuérdamelo en %d minuto"
 msgstr[1] "Recuérdamelo en %d minutos"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2022
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1897
 msgid "Empty calendar"
 msgstr "Calendario vacío"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2023
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
 msgid "There is nothing to export."
 msgstr "No hay nada que exportar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2063
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
 msgid "Could not export the calendar."
 msgstr "No se puede exportar el calendario."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2080
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
 msgid "Export calendar to ICS"
 msgstr "Exportar calendario a ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2103
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "No se puede exportar el calendario a «%s»\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2219
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
 msgid "Could not export the freebusy info."
 msgstr "No se puede exportar la información de libre/ocupado."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "No se puede exportar la información de libre/ocupado a «%s»\n"
@@ -14276,107 +14434,107 @@ msgstr ""
 msgid "SSL/TLS options"
 msgstr "Opciones SSL/TLS"
 
-#: src/pop.c:152
+#: src/pop.c:153
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "No se encontró en el saludo la marca de tiempo APOP necesaria\n"
 
-#: src/pop.c:159
+#: src/pop.c:160
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxis en la marca de tiempo del saludo\n"
 
-#: src/pop.c:166
+#: src/pop.c:167
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Error de sintaxis en la marca de tiempo del saludo (no ASCII)\n"
 
-#: src/pop.c:190 src/pop.c:217
+#: src/pop.c:191 src/pop.c:218
 msgid "POP protocol error\n"
 msgstr "Error del protocolo POP\n"
 
-#: src/pop.c:263
+#: src/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "respuesta UIDL inválida: %s\n"
 
-#: src/pop.c:841
+#: src/pop.c:843
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Borrando mensaje expirado %d [%s]\n"
 
-#: src/pop.c:857
+#: src/pop.c:859
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Saltándose mensaje %d [%s] (%d bytes)\n"
 
-#: src/pop.c:889
+#: src/pop.c:891
 msgid "mailbox is locked\n"
 msgstr "el buzón está bloqueado\n"
 
-#: src/pop.c:892
+#: src/pop.c:894
 msgid "Session timeout\n"
 msgstr "Excedido el tiempo límite de la sesión\n"
 
-#: src/pop.c:911
+#: src/pop.c:913
 msgid "command not supported\n"
 msgstr "orden no soportada\n"
 
-#: src/pop.c:916
+#: src/pop.c:918
 msgid "error occurred on POP session\n"
 msgstr "hubo un error en la sesión POP\n"
 
-#: src/pop.c:1111
+#: src/pop.c:1113
 msgid "TOP command unsupported\n"
 msgstr "orden TOP no soportada\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
+#: src/prefs_account.c:364 src/prefs_account.c:1582 src/prefs_account.c:2658
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
-#: src/wizard.c:1499
+#: src/prefs_account.c:365 src/prefs_account.c:1695 src/prefs_account.c:2673
+#: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:336
+#: src/prefs_account.c:366
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
-#: src/prefs_account.c:337 src/wizard.c:1500
+#: src/prefs_account.c:367 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Fichero mbox local"
 
-#: src/prefs_account.c:338
+#: src/prefs_account.c:368
 msgid "None (SMTP only)"
 msgstr "Ninguno (sólo SMTP)"
 
-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1131
 msgid "Name of account"
 msgstr "Nombre de cuenta"
 
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1140
 msgid "Set as default"
 msgstr "Marcar como primaria"
 
-#: src/prefs_account.c:1045
+#: src/prefs_account.c:1148
 msgid "Personal information"
 msgstr "Información personal"
 
-#: src/prefs_account.c:1054
+#: src/prefs_account.c:1157
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: src/prefs_account.c:1060
+#: src/prefs_account.c:1163
 msgid "Mail address"
 msgstr "Dirección de correo"
 
-#: src/prefs_account.c:1123 src/wizard.c:1523
+#: src/prefs_account.c:1226 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Configuración automática"
 
-#: src/prefs_account.c:1125 src/wizard.c:1524
+#: src/prefs_account.c:1228 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/prefs_account.c:1142
+#: src/prefs_account.c:1245
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14384,77 +14542,77 @@ msgstr ""
 "Aviso: esta versión de Claws Mail\n"
 "se construyó sin soporte para IMAP y noticias."
 
-#: src/prefs_account.c:1171
+#: src/prefs_account.c:1276
 msgid "This server requires authentication"
 msgstr "Este servidor requiere autenticación"
 
-#: src/prefs_account.c:1178
+#: src/prefs_account.c:1283
 msgid "Authenticate on connect"
 msgstr "Autenticación al conectar"
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1345
 msgid "News server"
 msgstr "Servidor de news"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1351
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account.c:1244
+#: src/prefs_account.c:1357
 msgid "Local mailbox"
 msgstr "Buzón local"
 
-#: src/prefs_account.c:1251
+#: src/prefs_account.c:1364
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1259
+#: src/prefs_account.c:1372
 msgid "Use mail command rather than SMTP server"
 msgstr "Usar mandato para correo en vez de servidor SMTP"
 
-#: src/prefs_account.c:1268
+#: src/prefs_account.c:1381
 msgid "command to send mails"
 msgstr "orden para enviar los correos"
 
-#: src/prefs_account.c:1332
+#: src/prefs_account.c:1456
 #, c-format
 msgid "Account%d"
 msgstr "Cuenta%d"
 
-#: src/prefs_account.c:1428
+#: src/prefs_account.c:1556
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1434 src/prefs_account.c:1523
+#: src/prefs_account.c:1562 src/prefs_account.c:1651
 msgid "Default Inbox"
 msgstr "Entrada predeterminada"
 
-#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
-#: src/prefs_account.c:1537
+#: src/prefs_account.c:1569 src/prefs_account.c:1576 src/prefs_account.c:1658
+#: src/prefs_account.c:1665
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1584
 msgid "Use secure authentication (APOP)"
 msgstr "Utilizar autenticación segura (APOP)"
 
-#: src/prefs_account.c:1459
+#: src/prefs_account.c:1587
 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibirlos"
 
-#: src/prefs_account.c:1470
+#: src/prefs_account.c:1598
 msgid "Remove after"
 msgstr "Eliminar después de"
 
-#: src/prefs_account.c:1477 src/prefs_account.c:1487
+#: src/prefs_account.c:1605 src/prefs_account.c:1615
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 días y 0 horas: borrar inmediatamente"
 
-#: src/prefs_account.c:1500
+#: src/prefs_account.c:1628
 msgid "Receive size limit"
 msgstr "Límite de tamaño al recibir"
 
-#: src/prefs_account.c:1503
+#: src/prefs_account.c:1631
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14462,83 +14620,96 @@ msgstr ""
 "Los mensajes que sobrepasen este límite serán recuperados parcialmente. Al "
 "seleccionarlos podrá descargarlos por completo o borrarlos."
 
-#: src/prefs_account.c:1543 src/prefs_account.c:2482
+#: src/prefs_account.c:1671 src/prefs_account.c:2688
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1550
+#: src/prefs_account.c:1678
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 
-#: src/prefs_account.c:1560
+#: src/prefs_account.c:1688
 msgid "unlimited if 0 is specified"
 msgstr "sin límite si se especifica 0"
 
-#: src/prefs_account.c:1585
+#: src/prefs_account.c:1713
 msgid "Plain text"
 msgstr "Texto plano"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1726
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP"
 
-#: src/prefs_account.c:1602
+#: src/prefs_account.c:1730
 msgid "(usually empty)"
 msgstr "(vacío habitualmente)"
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1744
 msgid "Show subscribed folders only"
 msgstr "Mostrar sólo carpetas suscritas"
 
-#: src/prefs_account.c:1623
+#: src/prefs_account.c:1751
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Modo de ancho de banda eficiente (evita recuperar las etiquetas remotas)"
 
-#: src/prefs_account.c:1625
+#: src/prefs_account.c:1753
 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:1632
+#: src/prefs_account.c:1760 src/prefs_receive.c:164
+msgid "Automatic checking"
+msgstr "Comprobación automática"
+
+#: src/prefs_account.c:1763
+#, fuzzy
+msgid "Use global settings"
+msgstr "Utilizar la configuración del proxy de GNOME"
+
+#: src/prefs_account.c:1769 src/prefs_receive.c:171
+msgid "Check for new mail every"
+msgstr "Comprobar si hay correo nuevo cada"
+
+#: src/prefs_account.c:1808
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1824
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permitir el filtrado usando módulos al recibir"
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1828
 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:1725 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1968 src/prefs_matcher.c:1990
+#: src/prefs_account.c:1917 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:633 src/prefs_matcher.c:2010 src/prefs_matcher.c:2038
 msgid "Header"
 msgstr "Cabecera"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1919
 msgid "Generate Message-ID"
 msgstr "Generar identificador de mensaje"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1922
 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:1733
+#: src/prefs_account.c:1925
 msgid "Add user agent header"
 msgstr "Añadir cabecera de agente de usuario"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1932
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account.c:1755
+#: src/prefs_account.c:1947
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticación SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1840
+#: src/prefs_account.c:2045
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14546,166 +14717,204 @@ 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:1851
+#: src/prefs_account.c:2056
 msgid "Authenticate with POP before sending"
 msgstr "Autenticación con POP antes de enviar"
 
-#: src/prefs_account.c:1866
-msgid "POP authentication timeout: "
+#: src/prefs_account.c:2071
+#, fuzzy
+msgid "POP authentication timeout"
 msgstr "Tiempo límite para autenticación POP: "
 
-#: src/prefs_account.c:1954 src/prefs_account.c:2000
+#: src/prefs_account.c:2159 src/prefs_account.c:2205
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:2162
 msgid "Automatically insert signature"
 msgstr "Insertar la firma automáticamente"
 
-#: src/prefs_account.c:1962
+#: src/prefs_account.c:2167
 msgid "Signature separator"
 msgstr "Separador de la firma"
 
-#: src/prefs_account.c:1987
+#: src/prefs_account.c:2192
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account.c:2020
+#: src/prefs_account.c:2225
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/prefs_account.c:2072
+#: src/prefs_account.c:2277
 msgid "Spell check dictionaries"
 msgstr "Diccionarios de corrección ortográfica"
 
-#: src/prefs_account.c:2082 src/prefs_folder_item.c:1104
-#: src/prefs_spelling.c:163
+#: src/prefs_account.c:2287 src/prefs_folder_item.c:1114
+#: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Diccionario predeterminado"
 
-#: src/prefs_account.c:2095 src/prefs_folder_item.c:1138
-#: src/prefs_spelling.c:176
+#: src/prefs_account.c:2300 src/prefs_folder_item.c:1148
+#: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Diccionario alternativo predeterminado"
 
-#: src/prefs_account.c:2181 src/prefs_account.c:3341
-#: src/prefs_compose_writing.c:373 src/prefs_folder_item.c:1449
-#: src/prefs_folder_item.c:1841 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
+#: src/prefs_account.c:2386 src/prefs_account.c:3799
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
+#: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Componer"
 
-#: src/prefs_account.c:2196 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
-#: src/toolbar.c:487
+#: src/prefs_account.c:2401 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/toolbar.c:490
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:492
+#: src/prefs_account.c:2416 src/prefs_filtering_action.c:185
+#: src/prefs_folder_item.c:1595 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/prefs_account.c:2258
+#: src/prefs_account.c:2463
 msgid "Default privacy system"
 msgstr "Sistema de privacidad predeterminado"
 
-#: src/prefs_account.c:2287
+#: src/prefs_account.c:2492 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Firmar siempre los mensajes"
 
-#: src/prefs_account.c:2289
+#: src/prefs_account.c:2494 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Cifrar siempre los mensajes"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2496
 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:2294
+#: src/prefs_account.c:2499
 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:2297
+#: src/prefs_account.c:2502
 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 la del "
 "destinatario"
 
-#: src/prefs_account.c:2299
+#: src/prefs_account.c:2504
 msgid "Save sent encrypted messages as clear text"
 msgstr "Guardar en claro los mensajes enviados cifrados"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
+#: src/prefs_account.c:2662 src/prefs_account.c:2677 src/prefs_account.c:2691
 msgid "Don't use SSL/TLS"
 msgstr "No usar SSL/TLS"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2474 src/prefs_account.c:2494
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2665 src/prefs_account.c:2680 src/prefs_account.c:2700
+#: src/prefs_account.c:2711
 msgid "Use SSL/TLS"
 msgstr "Usar SSL/TLS"
 
-#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
+#: src/prefs_account.c:2668 src/prefs_account.c:2683 src/prefs_account.c:2714
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Usar la orden STARTTLS para abrir la sesión cifrada"
 
-#: src/prefs_account.c:2498
+#: src/prefs_account.c:2704
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:2502
+#: src/prefs_account.c:2708
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL/TLS (pero usar STARTTLS si es necesario)"
 
-#: src/prefs_account.c:2513
+#: src/prefs_account.c:2719
 msgid "Client certificates"
 msgstr "Certificados de cliente"
 
-#: src/prefs_account.c:2521
+#: src/prefs_account.c:2727
 msgid "Certificate for receiving"
 msgstr "Certificado para recepción"
 
-#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
-#: src/prefs_account.c:2550
+#: src/prefs_account.c:2732 src/prefs_account.c:2734 src/prefs_account.c:2760
+#: src/prefs_account.c:2762
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado de cliente como fichero PKCS12 o PEM"
 
-#: src/prefs_account.c:2543
+#: src/prefs_account.c:2755
 msgid "Certificate for sending"
 msgstr "Certificado para envío"
 
-#: src/prefs_account.c:2576
+#: src/prefs_account.c:2795
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Aceptar automáticamente los certificados SSL/TLS válidos"
 
-#: src/prefs_account.c:2579
+#: src/prefs_account.c:2798
 msgid "Use non-blocking SSL/TLS"
 msgstr "Usar SSL/TLS no-bloqueante"
 
-#: src/prefs_account.c:2591
+#: src/prefs_account.c:2810
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Desactive esto si tiene problemas de conexión con SSL/TLS"
 
-#: src/prefs_account.c:2726
+#: src/prefs_account.c:2902 src/prefs_proxy.c:73
+#, fuzzy
+msgid "Use proxy server"
+msgstr "Usar proxy"
+
+#: src/prefs_account.c:2911
+#, fuzzy
+msgctxt ""
+"In account preferences, referring to whether or not use proxy settings from "
+"common preferences"
+msgid "Use default settings"
+msgstr " Usar configuración inicial "
+
+#: src/prefs_account.c:2913
+#, fuzzy
+msgid "Use global proxy server settings"
+msgstr "Utilizar la configuración del proxy de GNOME"
+
+#: src/prefs_account.c:2950 src/prefs_proxy.c:115 src/wizard.c:1120
+msgid "Use authentication"
+msgstr "Usar autenticación"
+
+#: src/prefs_account.c:2955 src/prefs_proxy.c:123
+#, fuzzy
+msgid "Username"
+msgstr "Usuario:"
+
+#: src/prefs_account.c:2989
+msgid "Use proxy server for sending"
+msgstr ""
+
+#: src/prefs_account.c:2991
+msgid ""
+"If disabled, messages will be sent using direct connection to configured "
+"outgoing server, bypassing any configured proxy server."
+msgstr ""
+
+#: src/prefs_account.c:3102
 msgid "SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account.c:2733
+#: src/prefs_account.c:3109
 msgid "POP port"
 msgstr "Puerto POP"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:3116
 msgid "IMAP port"
 msgstr "Puerto IMAP"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:3123
 msgid "NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:3129
 msgid "Domain name"
 msgstr "Nombre de dominio"
 
-#: src/prefs_account.c:2756
+#: src/prefs_account.c:3132
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14713,202 +14922,243 @@ 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:2770
+#: src/prefs_account.c:3146
 msgid "Use command to communicate with server"
 msgstr "Usar orden para comunicarse con el servidor"
 
-#: src/prefs_account.c:2779
+#: src/prefs_account.c:3155
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar los mensajes cruzados como leídos y de color:"
 
-#: src/prefs_account.c:2835
+#: src/prefs_account.c:3208
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
-#: src/prefs_account.c:2837
+#: src/prefs_account.c:3210
 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 
-#: src/prefs_account.c:2839
+#: src/prefs_account.c:3212
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
-#: src/prefs_account.c:2841
+#: src/prefs_account.c:3214
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account.c:2900
+#: src/prefs_account.c:3271
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de la cuenta."
 
-#: src/prefs_account.c:2904
+#: src/prefs_account.c:3275
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
-#: src/prefs_account.c:2911
+#: src/prefs_account.c:3283
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
-#: src/prefs_account.c:2916
+#: src/prefs_account.c:3288
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
-#: src/prefs_account.c:2921
+#: src/prefs_account.c:3293
 msgid "POP server is not entered."
 msgstr "No se especificó el servidor POP."
 
-#: src/prefs_account.c:2941
+#: src/prefs_account.c:3313
 msgid "The default Inbox folder doesn't exist."
 msgstr "La carpeta de entrada predeterminada no existe."
 
-#: src/prefs_account.c:2947
+#: src/prefs_account.c:3319
 msgid "IMAP server is not entered."
 msgstr "No se especificó el servidor IMAP."
 
-#: src/prefs_account.c:2952
+#: src/prefs_account.c:3324
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
-#: src/prefs_account.c:2958
+#: src/prefs_account.c:3330
 msgid "local mailbox filename is not entered."
 msgstr "no se especificó el nombre de fichero del buzón local."
 
-#: src/prefs_account.c:2964
+#: src/prefs_account.c:3336
 msgid "mail command is not entered."
 msgstr "no se especificó el mandato de correo."
 
-#: src/prefs_account.c:3305
-msgid "Receive"
-msgstr "Recibir"
+#: src/prefs_account.c:3346
+msgid "User ID cannot contain a newline character."
+msgstr ""
 
-#: src/prefs_account.c:3359 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
-msgid "Templates"
-msgstr "Plantillas"
+#: src/prefs_account.c:3351
+msgid "Password cannot contain a newline character."
+msgstr ""
 
-#: src/prefs_account.c:3377
-msgid "Privacy"
-msgstr "Privacidad"
+#: src/prefs_account.c:3379
+msgid "SMTP user ID cannot contain a newline character."
+msgstr ""
 
-#: src/prefs_account.c:3489
-msgid "Advanced"
-msgstr "Avanzadas"
+#: src/prefs_account.c:3384
+msgid "SMTP password cannot contain a newline character."
+msgstr ""
 
-#: src/prefs_account.c:3806
-msgid "Preferences for new account"
-msgstr "Preferencias para una nueva cuenta"
+#: src/prefs_account.c:3460
+#, fuzzy
+msgid "domain is not specified."
+msgstr "No se especificó el destinatario."
 
-#: src/prefs_account.c:3808
+#: src/prefs_account.c:3465
+#, fuzzy
+msgid "sent folder is not selected."
+msgstr "No se estableció la cabecera."
+
+#: src/prefs_account.c:3470
+#, fuzzy
+msgid "queue folder is not selected."
+msgstr "No se estableció la cabecera."
+
+#: src/prefs_account.c:3475
+#, fuzzy
+msgid "draft folder is not selected."
+msgstr "No se estableció la cabecera."
+
+#: src/prefs_account.c:3480
+#, fuzzy
+msgid "trash folder is not selected."
+msgstr "No se estableció la cabecera."
+
+#: src/prefs_account.c:3763
+msgid "Receive"
+msgstr "Recibir"
+
+#: src/prefs_account.c:3817 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+msgid "Templates"
+msgstr "Plantillas"
+
+#: src/prefs_account.c:3835
+msgid "Privacy"
+msgstr "Privacidad"
+
+#: src/prefs_account.c:3965
+msgid "Advanced"
+msgstr "Avanzadas"
+
+#: src/prefs_account.c:4314
+msgid "Preferences for new account"
+msgstr "Preferencias para una nueva cuenta"
+
+#: src/prefs_account.c:4316
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferencias de la cuenta"
 
-#: src/prefs_account.c:3929 src/wizard.c:1388
+#: src/prefs_account.c:4435 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Falló (dirección errónea)"
 
-#: src/prefs_account.c:4014
+#: src/prefs_account.c:4520
 msgid "Select signature file"
 msgstr "Seleccionar fichero de firma"
 
-#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1065
+#: src/prefs_account.c:4538 src/prefs_account.c:4555 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Seleccionar fichero del certificado"
 
-#: src/prefs_account.c:4145
+#: src/prefs_account.c:4651
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:4285
+#: src/prefs_account.c:4822
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (módulo no cargado)"
 
-#: src/prefs_actions.c:223
+#: src/prefs_actions.c:224
 msgid "Actions configuration"
 msgstr "Configuración de acciones"
 
-#: src/prefs_actions.c:250
+#: src/prefs_actions.c:251
 msgid "Menu name"
 msgstr "Nombre de menú"
 
-#: src/prefs_actions.c:283
+#: src/prefs_actions.c:284
 msgid "Shell command"
 msgstr "Orden del intérprete"
 
-#: src/prefs_actions.c:293
+#: src/prefs_actions.c:294
 msgid "Filter action"
 msgstr "Acción de filtrado"
 
-#: src/prefs_actions.c:299
+#: src/prefs_actions.c:300
 msgid "Edit filter action"
 msgstr "Editar acción de filtrado"
 
-#: src/prefs_actions.c:327
+#: src/prefs_actions.c:328
 msgid "Append the new action above to the list"
 msgstr "Añadir la nueva acción de arriba a la lista"
 
-#: src/prefs_actions.c:335
+#: src/prefs_actions.c:336
 msgid "Replace the selected action in list with the action above"
 msgstr "Sustituir la acción seleccionada en la lista con la acción de arriba"
 
-#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:780 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1069
+#: src/prefs_actions.c:338 src/prefs_filtering_action.c:588
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:800 src/prefs_template.c:319
+#: src/prefs_toolbar.c:1024
 msgid "D_elete"
 msgstr "B_orrar"
 
-#: src/prefs_actions.c:345
+#: src/prefs_actions.c:346
 msgid "Delete the selected action from the list"
 msgstr "Borrar la acción seleccionada de la lista"
 
-#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:338
+#: src/prefs_actions.c:356 src/prefs_filtering.c:503 src/prefs_template.c:337
 msgid "Clear all the input fields in the dialog"
 msgstr "Limpiar todos los campos de entrada en el diálogo"
 
-#: src/prefs_actions.c:363
+#: src/prefs_actions.c:364
 msgid "Show information on configuring actions"
 msgstr "Muestra información sobre la configuración de las acciones"
 
-#: src/prefs_actions.c:394
+#: src/prefs_actions.c:395
 msgid "Move the selected action up"
 msgstr "Mover arriba la acción seleccionada"
 
-#: src/prefs_actions.c:402
+#: src/prefs_actions.c:403
 msgid "Move selected action down"
 msgstr "Mover abajo la acción seleccionada"
 
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_actions.c:536 src/prefs_filtering_action.c:677
 #: src/prefs_filtering.c:838 src/prefs_filtering.c:840
-#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:897
-#: src/prefs_template.c:472
+#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:918
+#: src/prefs_template.c:471
 msgid "(New)"
 msgstr "(Nueva)"
 
-#: src/prefs_actions.c:600
+#: src/prefs_actions.c:601
 msgid "Menu name is not set."
 msgstr "No se estableció el nombre del menú."
 
-#: src/prefs_actions.c:605
+#: src/prefs_actions.c:606
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "No se permite «/» al inicio del nombre del menú."
 
-#: src/prefs_actions.c:610
+#: src/prefs_actions.c:611
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "No se permite «:» (dos puntos) en el nombre del menú."
 
-#: src/prefs_actions.c:629
+#: src/prefs_actions.c:630
 msgid "Menu name is too long."
 msgstr "El nombre del menú es demasiado largo."
 
-#: src/prefs_actions.c:638
+#: src/prefs_actions.c:639
 msgid "Command-line not set."
 msgstr "No se especificó la orden a ejecutar."
 
-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:644
 msgid "Menu name and command are too long."
 msgstr "El nombre del menú y la orden son demasiado largos."
 
-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:650
 #, c-format
 msgid ""
 "The command\n"
@@ -14919,139 +15169,139 @@ msgstr ""
 "%s\n"
 "tiene errores sintácticos."
 
-#: src/prefs_actions.c:707
+#: src/prefs_actions.c:708
 msgid "Delete action"
 msgstr "Borrar acción"
 
-#: src/prefs_actions.c:708
+#: src/prefs_actions.c:709
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 
-#: src/prefs_actions.c:728
+#: src/prefs_actions.c:729
 msgid "Delete all actions"
 msgstr "Borrar todas las acciones"
 
-#: src/prefs_actions.c:729
+#: src/prefs_actions.c:730
 msgid "Do you really want to delete all the actions?"
 msgstr "¿Realmente quiere borrar todas las acciones?"
 
-#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2115 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1503
+#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2161 src/prefs_template.c:571
+#: src/prefs_template.c:596
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 
-#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1500
-#: src/prefs_filtering.c:1522 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
+#: src/prefs_filtering.c:1526 src/prefs_template.c:572 src/prefs_template.c:597
 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:925
-#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
-#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2118 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_actions.c:895 src/prefs_actions.c:900 src/prefs_actions.c:926
+#: src/prefs_filtering.c:1483 src/prefs_filtering.c:1505
+#: src/prefs_filtering.c:1527 src/prefs_matcher.c:2164 src/prefs_template.c:573
+#: src/prefs_template.c:598 src/prefs_template.c:603
 msgid "_Continue editing"
 msgstr "_Seguir editando"
 
-#: src/prefs_actions.c:897
+#: src/prefs_actions.c:898
 msgid "Actions list not saved"
 msgstr "Lista de acciones no guardada"
 
-#: src/prefs_actions.c:898
+#: src/prefs_actions.c:899
 msgid "The actions list has been modified. Close anyway?"
 msgstr "La lista de acciones no fue guardada. ¿Cerrar igualmente?"
 
-#: src/prefs_actions.c:968
+#: src/prefs_actions.c:969
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Nombre de menú:</span>"
 
-#: src/prefs_actions.c:969
+#: src/prefs_actions.c:970
 msgid "Use / in menu name to make submenus."
 msgstr "Utilice / en el nombre de menú para crear sub-menús."
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:972
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Línea de orden:</span>"
 
-#: src/prefs_actions.c:972
+#: src/prefs_actions.c:973
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Comenzar con:</span>"
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:974
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "para enviar el mensaje o la selección a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:975
 msgid "to send user provided text to command's standard input"
 msgstr "para enviar el texto de usuario a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:976
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "para enviar el texto de usuario oculto a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Finalizar con:</span>"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:978
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "para reemplazar el mensaje o selección con la salida estándar de la orden"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:979
 msgid "to insert command's standard output without replacing old text"
 msgstr "para insertar la salida estándar de la orden sin reemplazar el texto"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:980
 msgid "to run command asynchronously"
 msgstr "para ejecutar la orden de manera asíncrona"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:981
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Usar:</span>"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:982
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "para el fichero del mensaje seleccionado en formato RFC822/2822 "
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:983
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "para la lista de nombres de los mensajes seleccionados en formato RFC822/2822"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:984
 msgid "for the file of the selected decoded message MIME part"
 msgstr "para el fichero de la parte MIME seleccionada del mensaje decodificada"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:985
 msgid "for a user provided argument"
 msgstr "para un parámetro introducido por el usuario"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:986
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 "para un parámetro introducido por el usuario y oculto (p.ej. contraseña)"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:987
 msgid "for the text selection"
 msgstr "para la parte seleccionada del texto"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:988
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplicar acciones de filtrado entre {} a los mensajes seleccionados"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:989
 msgid "for a literal %"
 msgstr "para un carácter %"
 
-#: src/prefs_actions.c:998 src/prefs_themes.c:1051
+#: src/prefs_actions.c:999 src/prefs_themes.c:1090
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/prefs_actions.c:999
+#: src/prefs_actions.c:1000
 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."
@@ -15059,29 +15309,29 @@ msgstr ""
 "Las acciones son una forma de que el usuario pueda lanzar órdenes externas "
 "que procesen un fichero de mensaje o alguna de sus partes."
 
-#: src/prefs_actions.c:1086 src/prefs_filtering.c:1697
-#: src/prefs_template.c:1111
+#: src/prefs_actions.c:1087 src/prefs_filtering.c:1701
+#: src/prefs_template.c:1113
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: src/prefs_actions.c:1206
+#: src/prefs_actions.c:1207
 msgid "Current actions"
 msgstr "Acciones actuales"
 
-#: src/prefs_actions.c:1305 src/prefs_filtering.c:1076
-#: src/prefs_filtering.c:1134
+#: src/prefs_actions.c:1306 src/prefs_filtering.c:1078
+#: src/prefs_filtering.c:1136
 msgid "Action string is not valid."
 msgstr "La cadena de la acción no es válida."
 
-#: src/prefs_common.c:237 src/prefs_quote.c:69
+#: src/prefs_common.c:239 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hola,\\n"
 
-#: src/prefs_common.c:315
+#: src/prefs_common.c:317
 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:321 src/prefs_quote.c:85
+#: src/prefs_common.c:323 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"
@@ -15089,7 +15339,7 @@ msgstr ""
 "\\n\\nInicio del mensaje redirigido:\\n\\n?d{Fecha: %d\\n}?f{Desde: %f\\n}?"
 "t{Para: %t\\n}?c{Cc: %c\\n}?n{Grupos: %n\\n}?s{Asunto: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:453
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15121,162 +15371,162 @@ msgstr "Lanzar el editor externo automáticamente"
 msgid "Automatically save message to Drafts folder every"
 msgstr "Guardar automáticamente el mensaje en Borradores cada"
 
-#: src/prefs_compose_writing.c:163 src/prefs_wrapping.c:101
+#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:100
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_compose_writing.c:174
+#: src/prefs_compose_writing.c:173
 msgid "Even if message is to be encrypted"
 msgstr "Incluso si se va a cifrar el mensaje"
 
-#: src/prefs_compose_writing.c:181
+#: src/prefs_compose_writing.c:180
 msgid "Undo level"
 msgstr "Niveles de deshacer"
 
-#: src/prefs_compose_writing.c:199
+#: src/prefs_compose_writing.c:197
 msgid "Warn when inserting a file larger than"
 msgstr "Avisar al insertar un fichero mayor de"
 
-#: src/prefs_compose_writing.c:211
+#: src/prefs_compose_writing.c:208
 msgid "KB into message body "
 msgstr "KB en el cuerpo del mensaje"
 
-#: src/prefs_compose_writing.c:217
+#: src/prefs_compose_writing.c:214
 msgid "Replying"
 msgstr "Respuesta"
 
-#: src/prefs_compose_writing.c:220
+#: src/prefs_compose_writing.c:217
 msgid "Reply will quote by default"
 msgstr "Responder con citación de manera predeterminada"
 
-#: src/prefs_compose_writing.c:223
+#: src/prefs_compose_writing.c:220
 msgid "Reply button invokes mailing list reply"
 msgstr "El botón Responder invoca responder a la lista de correo"
 
-#: src/prefs_compose_writing.c:225
+#: src/prefs_compose_writing.c:222
 msgid "Forwarding"
 msgstr "Reenvíos"
 
-#: src/prefs_compose_writing.c:228 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:186
 msgid "Forward as attachment"
 msgstr "Reenviar como adjunto"
 
-#: src/prefs_compose_writing.c:230
+#: src/prefs_compose_writing.c:227
 #, c-format
 msgid "Keep the original '%s' header when redirecting"
 msgstr "Mantener la cabecera «%s» del original al redirigir"
 
-#: src/prefs_compose_writing.c:236
+#: src/prefs_compose_writing.c:233
 msgid "When dropping files into the Compose window"
 msgstr "Al soltar ficheros en la ventana de composición"
 
-#: src/prefs_compose_writing.c:245
+#: src/prefs_compose_writing.c:242
 msgid "Ask"
 msgstr "Preguntar"
 
-#: src/prefs_compose_writing.c:246 src/toolbar.c:519
+#: src/prefs_compose_writing.c:243 src/toolbar.c:522
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/prefs_compose_writing.c:247 src/toolbar.c:520
+#: src/prefs_compose_writing.c:244 src/toolbar.c:523
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/prefs_compose_writing.c:374
+#: src/prefs_compose_writing.c:371
 msgid "Writing"
 msgstr "Redacción"
 
-#: src/prefs_customheader.c:183
+#: src/prefs_customheader.c:184
 msgid "Custom header configuration"
 msgstr "Configuración de cabeceras de usuario"
 
-#: src/prefs_customheader.c:506 src/prefs_display_header.c:601
-#: src/prefs_matcher.c:1595 src/prefs_matcher.c:1610
+#: src/prefs_customheader.c:503 src/prefs_display_header.c:588
+#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1648
 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera."
 
-#: src/prefs_customheader.c:516
+#: src/prefs_customheader.c:513
 msgid "This Header name is not allowed as a custom header."
 msgstr "Este nombre de cabecera no está permitido como cabecera de usuario."
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:560
 msgid "Choose a PNG file"
 msgstr "Elegir un fichero PNG"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:562
 msgid "Choose an XBM file"
 msgstr "Elegir un fichero XBM"
 
-#: src/prefs_customheader.c:567
+#: src/prefs_customheader.c:564
 msgid "Choose a text file"
 msgstr "Elegir un fichero de texto"
 
-#: src/prefs_customheader.c:580
+#: src/prefs_customheader.c:577
 msgid "This file isn't an image."
 msgstr "Este fichero no es un imagen."
 
-#: src/prefs_customheader.c:585
+#: src/prefs_customheader.c:582
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "La imagen elegida no tiene el tamaño correcto (48x48)."
 
-#: src/prefs_customheader.c:591
+#: src/prefs_customheader.c:588
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "La imagen es demasiado grande; como máximo deben ser 725 bytes."
 
-#: src/prefs_customheader.c:596
+#: src/prefs_customheader.c:593
 msgid "The image isn't in the correct format (PNG)."
 msgstr "La imagen no tiene el formato correcto (PNG)."
 
-#: src/prefs_customheader.c:605
+#: src/prefs_customheader.c:602
 msgid "The image isn't in the correct format (XBM)."
 msgstr "La imagen no tiene el formato correcto (XBM)."
 
-#: src/prefs_customheader.c:614
+#: src/prefs_customheader.c:611
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr "No se pudo llamar a «compface». Asegúrese que está en su $PATH"
 
-#: src/prefs_customheader.c:620
+#: src/prefs_customheader.c:617
 #, c-format
 msgid "Compface error: %s"
 msgstr "Error de compface: %s"
 
-#: src/prefs_customheader.c:673
+#: src/prefs_customheader.c:670
 msgid "This file contains newlines."
 msgstr "Este fichero contiene saltos de línea."
 
-#: src/prefs_customheader.c:703
+#: src/prefs_customheader.c:700
 msgid "Delete header"
 msgstr "Borrar cabecera"
 
-#: src/prefs_customheader.c:704
+#: src/prefs_customheader.c:701
 msgid "Do you really want to delete this header?"
 msgstr "¿Quiere borrar realmente esta cabecera?"
 
-#: src/prefs_customheader.c:877
+#: src/prefs_customheader.c:874
 msgid "Current custom headers"
 msgstr "Cabeceras de usuario actuales"
 
-#: src/prefs_display_header.c:252
+#: src/prefs_display_header.c:253
 msgid "Displayed header configuration"
 msgstr "Configuración de cabeceras mostradas"
 
-#: src/prefs_display_header.c:276
+#: src/prefs_display_header.c:277
 msgid "Header name"
 msgstr "Cabecera"
 
-#: src/prefs_display_header.c:319
-msgid "Displayed Headers"
-msgstr "Cabeceras mostradas"
-
-#: src/prefs_display_header.c:381
+#: src/prefs_display_header.c:312
 msgid "Hidden headers"
 msgstr "Cabeceras ocultas"
 
-#: src/prefs_display_header.c:407
+#: src/prefs_display_header.c:353
+msgid "Displayed Headers"
+msgstr "Cabeceras mostradas"
+
+#: src/prefs_display_header.c:398
 msgid "Show all unspecified headers"
 msgstr "Mostrar todas las cabeceras"
 
-#: src/prefs_display_header.c:611
+#: src/prefs_display_header.c:598
 msgid "This header is already in the list."
 msgstr "Esa cabecera ya existe en la lista."
 
@@ -15314,7 +15564,7 @@ msgstr ""
 "un script cuando se usa la opción «Mostrar como texto» del menú contextual"
 
 #: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:354
+#: src/prefs_message.c:351
 msgid "Message View"
 msgstr "Vista de mensaje"
 
@@ -15322,177 +15572,173 @@ msgstr "Vista de mensaje"
 msgid "External Programs"
 msgstr "Programas externos"
 
-#: src/prefs_filtering_action.c:175
+#: src/prefs_filtering_action.c:171
 msgid "Move"
 msgstr "Mover"
 
-#: src/prefs_filtering_action.c:176
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/prefs_filtering_action.c:178
+#: src/prefs_filtering_action.c:174
 msgid "Hide"
 msgstr "Ocultar"
 
+#: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
+#: src/prefs_filtering_action.c:177 src/prefs_filtering_action.c:178
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
-#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
 msgid "Message flags"
 msgstr "Marcas de mensaje"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:450
-#: src/prefs_summary_column.c:78 src/summaryview.c:2800 src/toolbar.c:502
+#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:620
+#: src/prefs_summary_column.c:77 src/summaryview.c:2908 src/toolbar.c:505
 msgid "Mark"
 msgstr "Marca"
 
-#: src/prefs_filtering_action.c:183
+#: src/prefs_filtering_action.c:179
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
-#: src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:180
 msgid "Mark as unread"
 msgstr "Marcar como no leído"
 
-#: src/prefs_filtering_action.c:185
+#: src/prefs_filtering_action.c:181
 msgid "Mark as spam"
 msgstr "Marcar como basura"
 
-#: src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:182
 msgid "Mark as ham"
 msgstr "Marcar como bueno"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1439
-#: src/toolbar.c:238 src/toolbar.c:496 src/toolbar.c:2387
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1394
+#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:448
+#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:618
 msgid "Color label"
 msgstr "Color"
 
-#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:187
 msgid "Resend"
 msgstr "Reenviar"
 
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:187
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1443 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:87
-#: src/summaryview.c:448
+#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:1398 src/prefs_matcher.c:639
+#: src/prefs_summaries.c:623 src/prefs_summary_column.c:86
+#: src/summaryview.c:472
 msgid "Score"
 msgstr "Puntos"
 
-#: src/prefs_filtering_action.c:194
+#: src/prefs_filtering_action.c:188
 msgid "Change score"
 msgstr "Cambiar puntos"
 
-#: src/prefs_filtering_action.c:195
+#: src/prefs_filtering_action.c:189
 msgid "Set score"
 msgstr "Establecer puntos"
 
-#: 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:450
+#: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
+#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:643
+#: src/prefs_summary_column.c:88 src/summaryview.c:474
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/prefs_filtering_action.c:196
+#: src/prefs_filtering_action.c:190
 msgid "Apply tag"
 msgstr "Aplicar etiqueta"
 
-#: src/prefs_filtering_action.c:197
+#: src/prefs_filtering_action.c:191
 msgid "Unset tag"
 msgstr "Quitar etiqueta"
 
-#: src/prefs_filtering_action.c:198
+#: src/prefs_filtering_action.c:192
 msgid "Clear tags"
 msgstr "Limpiar etiquetas"
 
-#: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
+#: src/prefs_filtering_action.c:193 src/prefs_filtering_action.c:194
 msgid "Threads"
 msgstr "Hilos"
 
-#: src/prefs_filtering_action.c:202
+#: src/prefs_filtering_action.c:196
 msgid "Stop filter"
 msgstr "Detener filtro"
 
-#: src/prefs_filtering_action.c:410
+#: src/prefs_filtering_action.c:400
 msgid "Action configuration"
 msgstr "Configuración de la acción"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
-#: src/prefs_matcher.c:586
+#: src/prefs_filtering_action.c:417 src/prefs_filtering.c:1894
+#: src/prefs_matcher.c:596
 msgid "Rule"
 msgstr "Regla"
 
-#: src/prefs_filtering_action.c:440 src/prefs_filtering.c:433
+#: src/prefs_filtering_action.c:430 src/prefs_filtering.c:433
 msgid "Action"
 msgstr "Acción"
 
-#: src/prefs_filtering_action.c:935
+#: src/prefs_filtering_action.c:906
 msgid "Command-line not set"
 msgstr "Orden no establecida"
 
-#: src/prefs_filtering_action.c:936
+#: src/prefs_filtering_action.c:907
 msgid "Destination is not set."
 msgstr "Destino no establecido."
 
-#: src/prefs_filtering_action.c:947
+#: src/prefs_filtering_action.c:918
 msgid "Recipient is not set."
 msgstr "Destinatario no establecido."
 
-#: src/prefs_filtering_action.c:965
+#: src/prefs_filtering_action.c:934
 msgid "Score is not set"
 msgstr "Puntuación no establecida"
 
-#: src/prefs_filtering_action.c:973
+#: src/prefs_filtering_action.c:942
 msgid "Header is not set."
 msgstr "No se estableció la cabecera."
 
-#: src/prefs_filtering_action.c:980
+#: src/prefs_filtering_action.c:949
 msgid "Target addressbook/folder is not set."
 msgstr "No se especificó agenda/carpeta de destino."
 
-#: src/prefs_filtering_action.c:994
+#: src/prefs_filtering_action.c:959
 msgid "Tag name is empty."
 msgstr "El nombre de la etiqueta está vacío."
 
-#: src/prefs_filtering_action.c:1216
+#: src/prefs_filtering_action.c:1181
 msgid "No action was defined."
 msgstr "No se definió ninguna acción."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2161
+#: src/prefs_filtering_action.c:1219 src/prefs_matcher.c:2208
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "carácter %"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2170
+#: src/prefs_filtering_action.c:1228 src/prefs_matcher.c:2217
 msgid "filename (should not be modified)"
 msgstr "nombre de fichero (no debe modificarse)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2171
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2218
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nueva línea"
 
-#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2172
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2219
 msgid "escape character for quotes"
 msgstr "carácter de escape para citas"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2173
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2220
 msgid "quote character"
 msgstr "carácter de cita"
 
-#: src/prefs_filtering_action.c:1275
+#: src/prefs_filtering_action.c:1240
 msgid "Filtering Action: 'Execute'"
 msgstr "Acción de filtrado: «Ejecutar»"
 
-#: src/prefs_filtering_action.c:1276
+#: src/prefs_filtering_action.c:1241
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -15502,23 +15748,23 @@ msgstr ""
 "externo o script.\n"
 "Se pueden usar los siguientes símbolos:"
 
-#: src/prefs_filtering_action.c:1423
+#: src/prefs_filtering_action.c:1380
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: src/prefs_filtering_action.c:1427
+#: src/prefs_filtering_action.c:1384
 msgid "Book/Folder"
 msgstr "Agenda/carpeta"
 
-#: src/prefs_filtering_action.c:1431
+#: src/prefs_filtering_action.c:1388
 msgid "Destination"
 msgstr "Destino"
 
-#: src/prefs_filtering_action.c:1435
+#: src/prefs_filtering_action.c:1391
 msgid "Color"
 msgstr "Colorear"
 
-#: src/prefs_filtering_action.c:1521
+#: src/prefs_filtering_action.c:1476
 msgid "Current action list"
 msgstr "Lista actual de acciones"
 
@@ -15527,7 +15773,7 @@ msgid "Filtering/Processing configuration"
 msgstr "Configuración de filtrado/procesamiento"
 
 #: src/prefs_filtering.c:266 src/prefs_filtering.c:869
-#: src/prefs_filtering.c:983
+#: src/prefs_filtering.c:985
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Cualquiera"
@@ -15588,59 +15834,59 @@ msgstr "Mover la regla seleccionada una página hacia abajo"
 msgid "Move the selected rule to the bottom"
 msgstr "Mover la regla seleccionada al fondo"
 
-#: src/prefs_filtering.c:1040 src/prefs_filtering.c:1126
+#: src/prefs_filtering.c:1042 src/prefs_filtering.c:1128
 msgid "Condition string is not valid."
 msgstr "La cadena de condición no es válida."
 
-#: src/prefs_filtering.c:1113
+#: src/prefs_filtering.c:1115
 msgid "Condition string is empty."
 msgstr "La cadena de condición esta vacía."
 
-#: src/prefs_filtering.c:1119
+#: src/prefs_filtering.c:1121
 msgid "Action string is empty."
 msgstr "La cadena de la acción esta vacía."
 
-#: src/prefs_filtering.c:1207
+#: src/prefs_filtering.c:1210
 msgid "Delete rule"
 msgstr "Borrar regla"
 
-#: src/prefs_filtering.c:1208
+#: src/prefs_filtering.c:1211
 msgid "Do you really want to delete this rule?"
 msgstr "¿Quiere borrar realmente esta regla?"
 
-#: src/prefs_filtering.c:1226
+#: src/prefs_filtering.c:1229
 msgid "Delete all rules"
 msgstr "Borrar todas las reglas"
 
-#: src/prefs_filtering.c:1227
+#: src/prefs_filtering.c:1230
 msgid "Do you really want to delete all the rules?"
 msgstr "¿Quiere borrar realmente todas las reglas?"
 
-#: src/prefs_filtering.c:1477
+#: src/prefs_filtering.c:1481
 msgid "Filtering rules not saved"
 msgstr "Reglas de filtrado no guardadas"
 
-#: src/prefs_filtering.c:1478
+#: src/prefs_filtering.c:1482
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "La lista de reglas de filtrado ha sido modificada. ¿Cerrar igualmente?"
 
-#: src/prefs_filtering.c:1700
+#: src/prefs_filtering.c:1704
 msgid "Move one page up"
 msgstr "Mover una página arriba"
 
-#: src/prefs_filtering.c:1701
+#: src/prefs_filtering.c:1705
 msgid "Move one page down"
 msgstr "Mover una página abajo"
 
-#: src/prefs_filtering.c:1856
+#: src/prefs_filtering.c:1862
 msgid "Enable"
 msgstr "Activar"
 
-#: src/prefs_folder_column.c:212
+#: src/prefs_folder_column.c:211
 msgid "Folder list columns configuration"
 msgstr "Configuración de las columnas de la lista de carpetas"
 
-#: src/prefs_folder_column.c:229
+#: src/prefs_folder_column.c:228
 msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
@@ -15652,17 +15898,17 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Columnas ocultas"
 
-#: src/prefs_folder_column.c:290 src/prefs_summaries.c:417
-#: src/prefs_summaries.c:593 src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:299 src/prefs_summaries.c:383
+#: src/prefs_summaries.c:448 src/prefs_summary_column.c:313
 msgid "Displayed columns"
 msgstr "Columnas visibles"
 
-#: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1077
+#: src/prefs_folder_column.c:332 src/prefs_msg_colors.c:425
+#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1032
 msgid " Use default "
 msgstr " Usar configuración inicial "
 
-#: src/prefs_folder_item.c:210
+#: src/prefs_folder_item.c:214
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
@@ -15672,7 +15918,7 @@ msgstr ""
 "Sin embargo puede establecerlas en todo el árbol de carpetas del buzón "
 "usando «Aplicar a subcarpetas»."
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:886
+#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:896
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15680,55 +15926,57 @@ msgstr ""
 "Aplicar a\n"
 "subcarpetas"
 
-#: src/prefs_folder_item.c:314
+#: src/prefs_folder_item.c:318
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:316
+#: src/prefs_folder_item.c:320
 msgid "Outbox"
 msgstr "Salida"
 
-#: src/prefs_folder_item.c:332
+#: src/prefs_folder_item.c:336
 msgid "Folder type"
 msgstr "Tipo de carpeta"
 
-#: src/prefs_folder_item.c:344
+#: src/prefs_folder_item.c:348
 msgid "Simplify Subject RegExp"
 msgstr "Expr. reg. para simplificar asunto"
 
-#: src/prefs_folder_item.c:370
-msgid "Test string:"
+#: src/prefs_folder_item.c:374
+#, fuzzy
+msgid "Test string"
 msgstr "Texto de prueba:"
 
-#: src/prefs_folder_item.c:387
-msgid "Result:"
+#: src/prefs_folder_item.c:391
+#, fuzzy
+msgid "Result"
 msgstr "Resultado:"
 
-#: src/prefs_folder_item.c:402
+#: src/prefs_folder_item.c:406
 msgid "Folder chmod"
 msgstr "Permisos de la carpeta"
 
-#: src/prefs_folder_item.c:428
+#: src/prefs_folder_item.c:432
 msgid "Folder color"
 msgstr "Color de la carpeta"
 
-#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1678
+#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
 msgid "Pick color for folder"
 msgstr "Elegir color para la carpeta"
 
-#: src/prefs_folder_item.c:459
+#: src/prefs_folder_item.c:462
 msgid "Run Processing rules at start-up"
 msgstr "Ejecutar las reglas de procesamiento al iniciar"
 
-#: src/prefs_folder_item.c:474
+#: src/prefs_folder_item.c:477
 msgid "Run Processing rules when opening"
 msgstr "Ejecutar las reglas de procesamiento al abrir"
 
-#: src/prefs_folder_item.c:488
+#: src/prefs_folder_item.c:491
 msgid "Scan for new mail"
 msgstr "Examinar si hay correo nuevo"
 
-#: src/prefs_folder_item.c:490
+#: src/prefs_folder_item.c:493
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -15736,11 +15984,11 @@ msgstr ""
 "Active esta opción si el correo es servido directamente en esta carpeta por "
 "el filtrado del servidor en IMAP o por una aplicación externa"
 
-#: src/prefs_folder_item.c:510
+#: src/prefs_folder_item.c:513
 msgid "Select the HTML part of multipart messages"
 msgstr "Seleccionar la parte HTML en mensajes multiparte"
 
-#: src/prefs_folder_item.c:527
+#: src/prefs_folder_item.c:530
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -15748,64 +15996,68 @@ msgstr ""
 "«Por omisión» obedecerá las preferencias globales (que se encuentran en /"
 "Preferencias/Vista de mensaje/Opciones de texto)"
 
-#: src/prefs_folder_item.c:537
+#: src/prefs_folder_item.c:540
 msgid "Synchronise for offline use"
 msgstr "Sincronizar para uso sin conexión"
 
-#: src/prefs_folder_item.c:558
+#: src/prefs_folder_item.c:561
 msgid "Fetch message bodies from the last"
 msgstr "Recuperar cuerpos de mensaje desde el último"
 
-#: src/prefs_folder_item.c:565
+#: src/prefs_folder_item.c:568
 msgid "0: all bodies"
 msgstr "0: todos los cuerpos"
 
-#: src/prefs_folder_item.c:573
+#: src/prefs_folder_item.c:576
 msgid "Remove older messages bodies"
 msgstr "Eliminar cuerpos de mensaje antiguos"
 
-#: src/prefs_folder_item.c:590
+#: src/prefs_folder_item.c:593
 msgid "Discard folder cache"
 msgstr "Descartar la caché de la carpeta"
 
-#: src/prefs_folder_item.c:895
+#: src/prefs_folder_item.c:905
 msgid "Request Return Receipt"
 msgstr "Solicitar acuse de recibo"
 
-#: src/prefs_folder_item.c:910
+#: src/prefs_folder_item.c:920
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Guardar los mensajes salientes en esta carpeta en vez de en Enviado"
 
-#: src/prefs_folder_item.c:924 src/prefs_folder_item.c:976
-#: src/prefs_folder_item.c:1002 src/prefs_folder_item.c:1028
+#: src/prefs_folder_item.c:934 src/prefs_folder_item.c:986
+#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "Cabecera %s predeterminada"
 
-#: src/prefs_folder_item.c:950
+#: src/prefs_folder_item.c:960
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr "Cabecera %s para respuestas"
 
-#: src/prefs_folder_item.c:1053
+#: src/prefs_folder_item.c:1063
 msgid "Default account"
 msgstr "Cuenta primaria"
 
-#: src/prefs_folder_item.c:1691
+#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+msgid "\"Default\" will follow the applicable account preference"
+msgstr ""
+
+#: src/prefs_folder_item.c:1781
 msgid "Discard cache"
 msgstr "Descartar caché"
 
-#: src/prefs_folder_item.c:1692
+#: src/prefs_folder_item.c:1782
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "¿Quiere borrar realmente los datos locales en caché para esta carpeta?"
 
-#: src/prefs_folder_item.c:1824
+#: src/prefs_folder_item.c:1907
 msgid "General"
 msgstr "Genéricas"
 
-#: src/prefs_folder_item.c:1903
+#: src/prefs_folder_item.c:1986
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propiedades de la carpeta %s"
@@ -15814,7 +16066,7 @@ msgstr "Propiedades de la carpeta %s"
 msgid "Folder and Message Lists"
 msgstr "Carpeta y listas de mensajes"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2036
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2082
 msgid "Message"
 msgstr "Mensaje"
 
@@ -15840,8 +16092,8 @@ msgstr "Usar una tipografía distinta para imprimir"
 msgid "Message Printing"
 msgstr "Impresión de mensajes"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:768
-#: src/prefs_themes.c:389
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:842
+#: src/prefs_themes.c:422
 msgid "Display"
 msgstr "Ver"
 
@@ -15849,7 +16101,7 @@ msgstr "Ver"
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: src/prefs_gtk.c:908 src/toolbar.c:256 src/toolbar.c:514
+#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -15877,27 +16129,27 @@ msgstr "Imprimir imágenes"
 msgid "Image Viewer"
 msgstr "Visor de imágenes"
 
-#: src/prefs_logging.c:147 src/prefs_logging.c:254
+#: src/prefs_logging.c:143 src/prefs_logging.c:249
 msgid "Restrict the log window to"
 msgstr "Restringir la ventana de traza a"
 
-#: src/prefs_logging.c:159 src/prefs_logging.c:266
+#: src/prefs_logging.c:154 src/prefs_logging.c:260
 msgid "0 to stop logging in the log window"
 msgstr "0 para dejar de registrar en la ventana de traza"
 
-#: src/prefs_logging.c:161 src/prefs_logging.c:268
+#: src/prefs_logging.c:156 src/prefs_logging.c:262
 msgid "lines"
 msgstr "líneas"
 
-#: src/prefs_logging.c:171
+#: src/prefs_logging.c:165
 msgid "Filtering/processing log"
 msgstr "Configuración de filtrado/traza de procesamiento"
 
-#: src/prefs_logging.c:174
+#: src/prefs_logging.c:168
 msgid "Enable logging of filtering/processing rules"
 msgstr "Activar la traza de reglas de filtrado/procesamiento"
 
-#: src/prefs_logging.c:180
+#: src/prefs_logging.c:174
 msgid ""
 "If checked, turns on logging of filtering and processing rules.\n"
 "The log is accessible from 'Tools/Filtering log'.\n"
@@ -15910,47 +16162,47 @@ msgstr ""
 "Atención: habilitando esta opción ralentizará el filtrado/procesamiento, lo "
 "cual puede ser crítico al aplicar muchas reglas sobre miles de mensajes."
 
-#: src/prefs_logging.c:187
+#: src/prefs_logging.c:181
 msgid "Log filtering/processing when..."
 msgstr "Traza las reglas de filtrado/procesamiento cuando..."
 
-#: src/prefs_logging.c:191
+#: src/prefs_logging.c:185
 msgid "filtering at incorporation"
 msgstr "se filtre en la incorporación"
 
-#: src/prefs_logging.c:193
+#: src/prefs_logging.c:187
 msgid "pre-processing folders"
 msgstr "se pre-procesen las carpetas"
 
-#: src/prefs_logging.c:198
+#: src/prefs_logging.c:192
 msgid "manually filtering"
 msgstr "se filtre manualmente"
 
-#: src/prefs_logging.c:200
+#: src/prefs_logging.c:194
 msgid "post-processing folders"
 msgstr "se post-procesen las carpetas"
 
-#: src/prefs_logging.c:207
+#: src/prefs_logging.c:201
 msgid "processing folders"
 msgstr "se procesen las carpetas"
 
-#: src/prefs_logging.c:222
+#: src/prefs_logging.c:217
 msgid "Log level"
 msgstr "Nivel de traza"
 
-#: src/prefs_logging.c:231
+#: src/prefs_logging.c:226
 msgid "Low"
 msgstr "Bajo"
 
-#: src/prefs_logging.c:232
+#: src/prefs_logging.c:227
 msgid "Medium"
 msgstr "Medio"
 
-#: src/prefs_logging.c:233
+#: src/prefs_logging.c:228
 msgid "High"
 msgstr "Alto"
 
-#: src/prefs_logging.c:238
+#: src/prefs_logging.c:233
 msgid ""
 "Select the level of detail of the logging.\n"
 "Choose Low to see when rules are applied, which conditions match or don't "
@@ -15970,279 +16222,293 @@ msgstr ""
 "aplican las reglas y por qué coinciden o no.\n"
 "Atención: cuanto mayor sea el nivel mayor será el impacto en en rendimiento."
 
-#: src/prefs_logging.c:280
+#: src/prefs_logging.c:274
 msgid "Disk log"
 msgstr "Traza en disco"
 
-#: src/prefs_logging.c:282
+#: src/prefs_logging.c:276
 msgid "Write the following information to disk..."
 msgstr "Escribir la siguiente información en el disco..."
 
-#: src/prefs_logging.c:290
+#: src/prefs_logging.c:284
 msgid "Warning messages"
 msgstr "Mensajes de aviso"
 
-#: src/prefs_logging.c:291
+#: src/prefs_logging.c:285
 msgid "Network protocol messages"
 msgstr "Mensajes de los protocolos de red"
 
-#: src/prefs_logging.c:295
+#: src/prefs_logging.c:289
 msgid "Error messages"
 msgstr "Mensajes de error"
 
-#: src/prefs_logging.c:296
+#: src/prefs_logging.c:290
 msgid "Status messages for filtering/processing log"
 msgstr "Mensajes de estado de filtrado/traza de procesamiento"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:814
 msgid "Other"
 msgstr "Otras"
 
-#: src/prefs_logging.c:428
+#: src/prefs_logging.c:411
 msgid "Logging"
 msgstr "Depuración"
 
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:335
 msgid "more than"
 msgstr "más que"
 
-#: src/prefs_matcher.c:332
+#: src/prefs_matcher.c:336
 msgid "less than"
 msgstr "menos que"
 
-#: src/prefs_matcher.c:338
+#: src/prefs_matcher.c:342
 msgid "weeks"
 msgstr "semanas"
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:346
+msgid "after"
+msgstr ""
+
+#: src/prefs_matcher.c:347
+msgid "before"
+msgstr ""
+
+#: src/prefs_matcher.c:351
 msgid "higher than"
 msgstr "más alto que"
 
-#: src/prefs_matcher.c:343
+#: src/prefs_matcher.c:352
 msgid "lower than"
 msgstr "más bajo que"
 
-#: src/prefs_matcher.c:344 src/prefs_matcher.c:350
+#: src/prefs_matcher.c:353 src/prefs_matcher.c:359
 msgid "exactly"
 msgstr "exactamente"
 
-#: src/prefs_matcher.c:348
+#: src/prefs_matcher.c:357
 msgid "greater than"
 msgstr "mayor que"
 
-#: src/prefs_matcher.c:349
+#: src/prefs_matcher.c:358
 msgid "smaller than"
 msgstr "menor que"
 
-#: src/prefs_matcher.c:354
+#: src/prefs_matcher.c:363
 msgid "bytes"
 msgstr "bytes"
 
-#: src/prefs_matcher.c:355
+#: src/prefs_matcher.c:364
 msgid "kilobytes"
 msgstr "kilobytes"
 
-#: src/prefs_matcher.c:356
+#: src/prefs_matcher.c:365
 msgid "megabytes"
 msgstr "megabytes"
 
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:369
 msgid "contains"
 msgstr "contiene"
 
-#: src/prefs_matcher.c:361
+#: src/prefs_matcher.c:370
 msgid "doesn't contain"
 msgstr "no contiene"
 
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:394
 msgid "headers part"
 msgstr "sección cabeceras"
 
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:395
 msgid "headers values"
 msgstr "valores de cabeceras"
 
-#: src/prefs_matcher.c:387
+#: src/prefs_matcher.c:396
 msgid "body part"
 msgstr "sección cuerpo"
 
-#: src/prefs_matcher.c:388
+#: src/prefs_matcher.c:397
 msgid "whole message"
 msgstr "mensaje completo"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6309
+#: src/prefs_matcher.c:403 src/summaryview.c:6579
 msgid "Marked"
 msgstr "Marcado"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6307
+#: src/prefs_matcher.c:404 src/summaryview.c:6577
 msgid "Deleted"
 msgstr "Borrado"
 
-#: src/prefs_matcher.c:396
+#: src/prefs_matcher.c:405
 msgid "Replied"
 msgstr "Respondido"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6301
+#: src/prefs_matcher.c:406 src/summaryview.c:6571
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6291 src/toolbar.c:512
-#: src/toolbar.c:981 src/toolbar.c:2261
+#: src/prefs_matcher.c:408 src/summaryview.c:6561 src/toolbar.c:515
+#: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Basura"
 
-#: src/prefs_matcher.c:400
+#: src/prefs_matcher.c:409
 msgid "Has attachment"
 msgstr "Tiene adjunto"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6327
+#: src/prefs_matcher.c:410 src/summaryview.c:6597
 msgid "Signed"
 msgstr "Firmado"
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:414
 msgid "set"
 msgstr "establecido"
 
-#: src/prefs_matcher.c:406
+#: src/prefs_matcher.c:415
 msgid "not set"
 msgstr "no establecido"
 
-#: src/prefs_matcher.c:410
+#: src/prefs_matcher.c:419
 msgid "yes"
 msgstr "si"
 
-#: src/prefs_matcher.c:411
+#: src/prefs_matcher.c:420
 msgid "no"
 msgstr "no"
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:424
 msgid "Any tags"
 msgstr "Cualquier etiqueta"
 
-#: src/prefs_matcher.c:416
+#: src/prefs_matcher.c:425
 msgid "Specific tag"
 msgstr "Etiqueta específica"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:429
 msgid "ignored"
 msgstr "ignorado"
 
-#: src/prefs_matcher.c:421
+#: src/prefs_matcher.c:430
 msgid "not ignored"
 msgstr "no ignorado"
 
-#: src/prefs_matcher.c:422
+#: src/prefs_matcher.c:431
 msgid "watched"
 msgstr "observado"
 
-#: src/prefs_matcher.c:423
+#: src/prefs_matcher.c:432
 msgid "not watched"
 msgstr "no observado"
 
-#: src/prefs_matcher.c:427
+#: src/prefs_matcher.c:436
 msgid "found"
 msgstr "encontrado"
 
-#: src/prefs_matcher.c:428
+#: src/prefs_matcher.c:437
 msgid "not found"
 msgstr "no encontrado"
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:441
 msgid "0 (Passed)"
 msgstr "0 (Pasado)"
 
-#: src/prefs_matcher.c:433
+#: src/prefs_matcher.c:442
 msgid "non-0 (Failed)"
 msgstr "no-0 (Fallido)"
 
-#: src/prefs_matcher.c:569
+#: src/prefs_matcher.c:579
 msgid "Condition configuration"
 msgstr "Configuración de la condición"
 
-#: src/prefs_matcher.c:613
-msgid "Match criteria:"
+#: src/prefs_matcher.c:623
+#, fuzzy
+msgid "Match criteria"
 msgstr "Criterio de búsqueda:"
 
-#: src/prefs_matcher.c:622
+#: src/prefs_matcher.c:632
 msgid "All messages"
 msgstr "Todos los mensajes"
 
-#: src/prefs_matcher.c:624
+#: src/prefs_matcher.c:634
 msgid "Age"
 msgstr "Edad"
 
-#: src/prefs_matcher.c:625
+#: src/prefs_matcher.c:635
 msgid "Phrase"
 msgstr "Frase"
 
-#: src/prefs_matcher.c:626
+#: src/prefs_matcher.c:636
 msgid "Flags"
 msgstr "Marcas"
 
-#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:410
+#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:341
 msgid "Color labels"
 msgstr "Colores"
 
-#: src/prefs_matcher.c:628
+#: src/prefs_matcher.c:638
 msgid "Thread"
 msgstr "Hilo"
 
-#: src/prefs_matcher.c:631
+#: src/prefs_matcher.c:641
 msgid "Partially downloaded"
 msgstr "Parcialmente descargado"
 
-#: src/prefs_matcher.c:634
+#: src/prefs_matcher.c:644
 msgid "External program test"
 msgstr "Prueba con un programa externo"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1616 src/prefs_matcher.c:1631
-#: src/prefs_matcher.c:2517
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1654 src/prefs_matcher.c:1669
+#: src/prefs_matcher.c:2579
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Todos"
 
-#: src/prefs_matcher.c:744
+#: src/prefs_matcher.c:749
 msgid "Use regexp"
 msgstr "Usar exp.reg."
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:840
 msgid "Message must match"
 msgstr "El mensaje debe cumplir"
 
-#: src/prefs_matcher.c:824
+#: src/prefs_matcher.c:844
 msgid "at least one"
 msgstr "al menos una de"
 
-#: src/prefs_matcher.c:825
+#: src/prefs_matcher.c:845
 msgid "all"
 msgstr "todas"
 
-#: src/prefs_matcher.c:828
+#: src/prefs_matcher.c:848
 msgid "of above rules"
 msgstr "las reglas anteriores"
 
-#: src/prefs_matcher.c:1534 src/prefs_matcher.c:1600
+#: src/prefs_matcher.c:1560 src/prefs_matcher.c:1638
 msgid "Search pattern is not set."
 msgstr "No se estableció el patrón de búsqueda."
 
-#: src/prefs_matcher.c:1543
+#: src/prefs_matcher.c:1574
+#, fuzzy
+msgid "Invalid hour."
+msgstr "%d hora"
+
+#: src/prefs_matcher.c:1583
 msgid "Test command is not set."
 msgstr "No se estableció la orden de prueba."
 
-#: src/prefs_matcher.c:1617
+#: src/prefs_matcher.c:1655
 msgid "all addresses in all headers"
 msgstr "todas las direcciones en todas las cabeceras"
 
-#: src/prefs_matcher.c:1620
+#: src/prefs_matcher.c:1658
 msgid "any address in any header"
 msgstr "cualquier dirección en cualquier cabecera"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1660
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "la(s) dirección(es) en la cabecera «%s»"
 
-#: src/prefs_matcher.c:1623
+#: src/prefs_matcher.c:1661
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16255,83 +16521,88 @@ msgstr ""
 "Si quiere encontrar coincidencias de «%s» en todo el libro de direcciones "
 "deberá seleccionar «%s» en la lista desplegable de agenda/carpeta."
 
-#: src/prefs_matcher.c:1842
+#: src/prefs_matcher.c:1880
 msgid "Headers part"
 msgstr "Sección cabeceras"
 
-#: src/prefs_matcher.c:1846
+#: src/prefs_matcher.c:1884
 msgid "Headers values"
 msgstr "Valores de cabeceras"
 
-#: src/prefs_matcher.c:1850
+#: src/prefs_matcher.c:1888
 msgid "Body part"
 msgstr "Sección cuerpo"
 
-#: src/prefs_matcher.c:1854
+#: src/prefs_matcher.c:1892
 msgid "Whole message"
 msgstr "Mensaje completo"
 
-#: src/prefs_matcher.c:1967 src/prefs_matcher.c:2009
+#: src/prefs_matcher.c:2009 src/prefs_matcher.c:2055
 msgid "in"
 msgstr "en"
 
-#: src/prefs_matcher.c:1969
+#: src/prefs_matcher.c:2011
 msgid "content is"
 msgstr "contenido es"
 
-#: src/prefs_matcher.c:1978
+#: src/prefs_matcher.c:2015
+#, fuzzy
+msgid "Date is"
+msgstr "Fecha"
+
+#: src/prefs_matcher.c:2026
 msgid "Age is"
 msgstr "Edad es"
 
-#: src/prefs_matcher.c:1983
+#: src/prefs_matcher.c:2031
 msgid "Flag"
 msgstr "Marca"
 
-#: src/prefs_matcher.c:1984 src/prefs_matcher.c:1999
+#: src/prefs_matcher.c:2032 src/prefs_matcher.c:2046
 msgid "is"
 msgstr "es"
 
-#: src/prefs_matcher.c:1989
+#: src/prefs_matcher.c:2037
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/prefs_matcher.c:1998
+#: src/prefs_matcher.c:2045
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/prefs_matcher.c:2004
+#: src/prefs_matcher.c:2050
 msgid "Value:"
 msgstr "Valor:"
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2065
 msgid "Score is"
 msgstr "Puntuación es"
 
-#: src/prefs_matcher.c:2020
+#: src/prefs_matcher.c:2066
 msgid "points"
 msgstr "puntos"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2076
 msgid "Size is"
 msgstr "Tamaño es"
 
-#: src/prefs_matcher.c:2035
+#: src/prefs_matcher.c:2081
 msgid "Scope:"
 msgstr "Alcance:"
 
-#: src/prefs_matcher.c:2037
+#: src/prefs_matcher.c:2083
 msgid "tags"
 msgstr "etiquetas"
 
-#: src/prefs_matcher.c:2042
+#: src/prefs_matcher.c:2088
 msgid "type is"
 msgstr "tipo es"
 
-#: src/prefs_matcher.c:2046
+#: src/prefs_matcher.c:2092
 msgid "Program returns"
 msgstr "El programa devuelve"
 
-#: src/prefs_matcher.c:2116
+#: src/prefs_matcher.c:2162
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16339,11 +16610,11 @@ msgstr ""
 "La entrada no fue guardada.\n"
 "¿Cerrar igualmente?"
 
-#: src/prefs_matcher.c:2182
+#: src/prefs_matcher.c:2229
 msgid "Match Type: 'Test'"
 msgstr "Tipo de coincidencia: «Probar»"
 
-#: src/prefs_matcher.c:2183
+#: src/prefs_matcher.c:2230
 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"
@@ -16355,91 +16626,92 @@ msgstr ""
 "\n"
 "Se pueden usar los siguientes símbolos:"
 
-#: src/prefs_matcher.c:2282
+#: src/prefs_matcher.c:2329
 msgid "Current condition rules"
 msgstr "Reglas de condición actuales"
 
-#: src/prefs_message.c:120
+#: src/prefs_message.c:119
 msgid "Headers"
 msgstr "Cabeceras"
 
-#: src/prefs_message.c:123
+#: src/prefs_message.c:122
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceras sobre el mensaje"
 
-#: src/prefs_message.c:127
+#: src/prefs_message.c:126
 msgid "Display (X-)Face in message view"
 msgstr "Mostrar (X-)Face en la vista del mensaje"
 
-#: src/prefs_message.c:130
+#: src/prefs_message.c:129
 msgid "Display Face in message view"
 msgstr "Mostrar Face en la vista del mensaje"
 
-#: src/prefs_message.c:144
+#: src/prefs_message.c:143
 msgid "Display headers in message view"
 msgstr "Mostrar cabeceras en la vista del mensaje"
 
-#: src/prefs_message.c:156
+#: src/prefs_message.c:155
 msgid "HTML messages"
 msgstr "Mensajes HTML"
 
-#: src/prefs_message.c:159
+#: src/prefs_message.c:158
 msgid "Render HTML messages as text"
 msgstr "Presentar los mensajes HTML como texto"
 
-#: src/prefs_message.c:162
+#: src/prefs_message.c:161
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Mostrar los mensajes HTML con un módulo si es posible"
 
-#: src/prefs_message.c:165
+#: src/prefs_message.c:164
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Seleccionar la parte HTML en mensajes «multipart/alternative»"
 
-#: src/prefs_message.c:175
+#: src/prefs_message.c:174
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_message.c:189 src/prefs_message.c:223
+#: src/prefs_message.c:187 src/prefs_message.c:220
 msgid "pixels"
 msgstr "píxels"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:193
 msgid "Scroll"
 msgstr "Desplazamiento"
 
-#: src/prefs_message.c:197
+#: src/prefs_message.c:195
 msgid "Half page"
 msgstr "Media página"
 
-#: src/prefs_message.c:203
+#: src/prefs_message.c:201
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_message.c:209
+#: src/prefs_message.c:207
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:227
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Mostrar descripciones de los adjuntos (en vez de nombres)"
 
-#: src/prefs_message.c:233
+#: src/prefs_message.c:230
 msgid "Quotation"
 msgstr "Citas"
 
-#: src/prefs_message.c:242
+#: src/prefs_message.c:239
 msgid "Collapse quoted text on double click"
 msgstr "Colapsar el texto citado al hacer doble clic"
 
-#: src/prefs_message.c:249
-msgid "Treat these characters as quotation marks: "
+#: src/prefs_message.c:246
+#, fuzzy
+msgid "Treat these characters as quotation marks"
 msgstr "Tratar estos caracteres como marcas de cita: "
 
-#: src/prefs_message.c:355
+#: src/prefs_message.c:352
 msgid "Text Options"
 msgstr "Opciones de texto"
 
-#: src/prefs_migration.c:95
+#: src/prefs_migration.c:51
 #, c-format
 msgid ""
 "Your Claws Mail configuration is from a newer version than the version which "
@@ -16460,100 +16732,102 @@ msgstr ""
 "\n"
 "¿Quiere salir ahora?"
 
-#: src/prefs_migration.c:104
+#: src/prefs_migration.c:60
 msgid "Configuration warning"
 msgstr "Aviso de configuración"
 
-#: src/prefs_msg_colors.c:147
+#: src/prefs_msg_colors.c:153
 msgid "Message view"
 msgstr "Vista de mensaje"
 
-#: src/prefs_msg_colors.c:154
+#: src/prefs_msg_colors.c:160
 msgid "Enable coloration of message text"
 msgstr "Permitir colores en el texto del mensaje"
 
-#: src/prefs_msg_colors.c:162
+#: src/prefs_msg_colors.c:168
 msgid "Quote"
 msgstr "Cita"
 
-#: src/prefs_msg_colors.c:174
+#: src/prefs_msg_colors.c:180
 msgid "Cycle quote colors"
 msgstr "Reutilizar colores de citación"
 
-#: src/prefs_msg_colors.c:178
+#: src/prefs_msg_colors.c:184
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "Si hay más de 3 niveles de cita se reutilizarán los colores"
 
-#: src/prefs_msg_colors.c:184
+#: src/prefs_msg_colors.c:190
 msgid "1st Level"
 msgstr "Primer nivel"
 
-#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216
-#: src/prefs_msg_colors.c:242
+#: src/prefs_msg_colors.c:196 src/prefs_msg_colors.c:214
+#: src/prefs_msg_colors.c:232
 msgid "Text"
 msgstr "Texto"
 
-#: src/prefs_msg_colors.c:204
+#: src/prefs_msg_colors.c:200
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Elegir el color para el texto de primer nivel"
 
-#: src/prefs_msg_colors.c:210
+#: src/prefs_msg_colors.c:208
 msgid "2nd Level"
 msgstr "Segundo nivel"
 
-#: src/prefs_msg_colors.c:230
+#: src/prefs_msg_colors.c:218
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Elegir el color para el texto de segundo nivel"
 
-#: src/prefs_msg_colors.c:236
+#: src/prefs_msg_colors.c:226
 msgid "3rd Level"
 msgstr "Tercer nivel"
 
-#: src/prefs_msg_colors.c:256
+#: src/prefs_msg_colors.c:236
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "Elegir el color para el texto de tercer nivel"
 
-#: src/prefs_msg_colors.c:263
+#: src/prefs_msg_colors.c:245
 msgid "Enable coloration of text background"
 msgstr "Habilitar el color en el fondo del texto"
 
-#: src/prefs_msg_colors.c:279
+#: src/prefs_msg_colors.c:254
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
 msgstr "Elegir el color para el fondo del texto de primer nivel"
 
-#: src/prefs_msg_colors.c:300
+#: src/prefs_msg_colors.c:267
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
 msgstr "Elegir el color para el fondo del texto de segundo nivel"
 
-#: src/prefs_msg_colors.c:321
+#: src/prefs_msg_colors.c:280
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
 msgstr "Elegir el color para el fondo del texto de tercer nivel"
 
-#: src/prefs_msg_colors.c:341
+#: src/prefs_msg_colors.c:292
 msgctxt "Tooltip"
 msgid "Pick color for links"
 msgstr "Elegir el color para los enlaces"
 
-#: src/prefs_msg_colors.c:343
+#: src/prefs_msg_colors.c:296
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_msg_colors.c:360
+#: src/prefs_msg_colors.c:304
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Elegir el color para las firmas"
 
-#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:365
+#: src/prefs_msg_colors.c:311 src/prefs_summaries.c:377
 msgid "Folder list"
 msgstr "Lista de carpetas"
 
-#: src/prefs_msg_colors.c:380
+#: src/prefs_msg_colors.c:318
+#, fuzzy
+msgctxt "Tooltip"
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
@@ -16562,21 +16836,23 @@ msgstr ""
 "la opción «Ejecutar inmediatamente movimientos o borrados de mensajes» está "
 "desactivada"
 
-#: src/prefs_msg_colors.c:384
+#: src/prefs_msg_colors.c:323
 msgid "Target folder"
 msgstr "Carpeta de destino"
 
-#: src/prefs_msg_colors.c:399
+#: src/prefs_msg_colors.c:330
+#, fuzzy
+msgctxt "Tooltip"
 msgid "Pick color for folders containing new messages"
 msgstr "Elegir el color para las carpetas que contiene mensajes nuevos"
 
-#: src/prefs_msg_colors.c:401
+#: src/prefs_msg_colors.c:334
 msgid "Folder containing new messages"
 msgstr "Carpeta que contiene mensajes nuevos"
 
 #. 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
+#: src/prefs_msg_colors.c:359 src/prefs_msg_colors.c:391
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -16584,82 +16860,82 @@ msgstr "Seleccionar el color para el «color %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
+#: src/prefs_msg_colors.c:363 src/prefs_msg_colors.c:395
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Establecer la etiqueta para el «color %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 "Elegir el color para el «color %d»"
-
-#: src/prefs_msg_colors.c:600
+#: src/prefs_msg_colors.c:490
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
 msgstr "Elegir color del texto de primer nivel"
 
-#: src/prefs_msg_colors.c:603
+#: src/prefs_msg_colors.c:492
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
 msgstr "Elegir color del texto de segundo nivel"
 
-#: src/prefs_msg_colors.c:606
+#: src/prefs_msg_colors.c:494
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
 msgstr "Elegir color del texto de tercer nivel"
 
-#: src/prefs_msg_colors.c:609
+#: src/prefs_msg_colors.c:496
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Elegir color de fondo del texto de primer nivel"
 
-#: src/prefs_msg_colors.c:612
+#: src/prefs_msg_colors.c:498
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Elegir color de fondo del texto de segundo nivel"
 
-#: src/prefs_msg_colors.c:615
+#: src/prefs_msg_colors.c:500
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Elegir color de fondo del texto de tercer nivel"
 
-#: src/prefs_msg_colors.c:618
+#: src/prefs_msg_colors.c:502
 msgctxt "Dialog title"
 msgid "Pick color for links"
 msgstr "Elegir color para «color %d»"
 
-#: src/prefs_msg_colors.c:621
+#: src/prefs_msg_colors.c:504
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
 msgstr "Elegir color de la carpeta destino"
 
-#: src/prefs_msg_colors.c:624
+#: src/prefs_msg_colors.c:506
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
 msgstr "Elegir color de las firmas"
 
-#: src/prefs_msg_colors.c:627
+#: src/prefs_msg_colors.c:508
 msgctxt "Dialog title"
 msgid "Pick color for folder"
 msgstr "Elegir color para «color %d»"
 
-#: src/prefs_msg_colors.c:840
+#. TRANSLATORS: 'color %d' refers to the filtering/processing
+#. rule name and should not be translated
+#: src/prefs_msg_colors.c:531
+#, c-format
+msgctxt "Dialog title"
+msgid "Pick color for 'color %d'"
+msgstr "Elegir el color para el «color %d»"
+
+#: src/prefs_msg_colors.c:732
 msgid "Colors"
 msgstr "Colores"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:109
 msgid "Choose preset keyboard shortcuts"
 msgstr "Elegir configuración de atajos de teclado"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:123
 msgid "Select preset:"
 msgstr "Seleccionar combinación:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:138
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16692,10 +16968,15 @@ msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
 #: src/prefs_other.c:517
-msgid "Enable customisable keyboard shortcuts"
+#, fuzzy
+msgid "Enable keyboard shortcuts"
 msgstr "Habilitar los atajos de teclado configurables"
 
 #: src/prefs_other.c:520
+msgid "Enable customisable keyboard shortcuts"
+msgstr "Habilitar los atajos de teclado configurables"
+
+#: src/prefs_other.c:523
 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"
@@ -16706,15 +16987,15 @@ msgstr ""
 "de teclas.\n"
 "Desmarque esta opción si quiere bloquear todos los atajos existentes."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:530
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Seleccionar configuración de atajos de teclado..."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:540
 msgid "Metadata handling"
 msgstr "Gestión de metadatos"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:541
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16723,33 +17004,45 @@ msgstr ""
 "metadatos;\n"
 "Evita la pérdida de datos en caso de caídas pero puede llevar cierto tiempo."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:545
 msgid "Safer"
 msgstr "Más seguro"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:547
 msgid "Faster"
 msgstr "Más rápido"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:565
 msgid "Socket I/O timeout"
 msgstr "Tiempo límite de E/S del conector"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:586
+msgid "Translate header names"
+msgstr "Traducir nombres de cabeceras"
+
+#: src/prefs_other.c:588
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"Las cabeceras estándar mostradas (como «From:», «Subject:») serán traducidas "
+"a su idioma."
+
+#: src/prefs_other.c:591
 msgid "Ask before emptying trash"
 msgstr "Preguntar antes de vaciar la papelera"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:593
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Preguntar sobre las reglas de filtrado específicas de la cuenta al filtrar "
 "manualmente"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:598
 msgid "Use secure file deletion if possible"
 msgstr "Usar borrado de ficheros seguro si es posible"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:602
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16757,7 +17050,7 @@ msgstr ""
 "Usar borrado de ficheros seguro si es posible\n"
 "(el programa «shred» no está disponible)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:607
 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."
@@ -16766,19 +17059,19 @@ msgstr ""
 "aleatorios antes de borrarlos. Esto ralentiza el borrado. Asegúrese de leer "
 "las implicaciones en la página del manual de shred."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:611
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronizar carpetas sin conexión tan pronto como sea posible"
 
-#: src/prefs_other.c:607
+#: src/prefs_other.c:614
 msgid "Master passphrase"
 msgstr "Contraseña maestra"
 
-#: src/prefs_other.c:610
+#: src/prefs_other.c:617
 msgid "Use a master passphrase"
 msgstr "Utilizar una contraseña maestra"
 
-#: src/prefs_other.c:613
+#: src/prefs_other.c:620
 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."
@@ -16786,34 +17079,30 @@ msgstr ""
 "Si se activa, las contraseñas guardadas de sus cuentas estarán protegidas "
 "por una contraseña maestra. Si no se establece ninguna se le solicitará una."
 
-#: src/prefs_other.c:618
+#: src/prefs_other.c:625
 msgid "Change master passphrase"
 msgstr "Cambiar la contraseña maestra"
 
-#: src/prefs_other.c:778
+#: src/prefs_other.c:815
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
+#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
+msgid "Mail Handling"
+msgstr "Manejo de correo"
+
 #: src/prefs_quote.c:77
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "El %d\\n%f escribió:\\n\\n%q"
 
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:145
 msgid "External incorporation program"
 msgstr "Programa externo para incorporación"
 
-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:148
 msgid "Use external program for receiving mail"
 msgstr "Usar un programa externo para recibir correo"
 
-#: src/prefs_receive.c:161
-msgid "Automatic checking"
-msgstr "Comprobación automática"
-
-#: src/prefs_receive.c:168
-msgid "Check for new mail every"
-msgstr "Comprobar si hay correo nuevo cada"
-
 #: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
 msgstr "Comprobar si hay correo nuevo al inicio"
@@ -16862,48 +17151,47 @@ msgstr "después de la comprobación automática"
 msgid "after manual check"
 msgstr "después de la comprobación manual"
 
-#: src/prefs_receive.c:268
-#, c-format
-msgid ""
-"Command to execute:\n"
-"(use %d as number of new mails)"
+#: src/prefs_receive.c:280
+#, fuzzy, c-format
+msgid "Use %d as number of new mails"
 msgstr ""
 "Orden a ejecutar:\n"
 "(use %d como n.º de mensajes nuevos)"
 
-#: src/prefs_receive.c:411 src/prefs_send.c:371
-msgid "Mail Handling"
-msgstr "Manejo de correo"
-
-#: src/prefs_receive.c:412
+#: src/prefs_receive.c:416
 msgid "Receiving"
 msgstr "Recepción"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:176
 msgid "Save sent messages"
 msgstr "Guardar mensajes enviados"
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:179
 msgid "Never send Return Receipts"
 msgstr "No enviar nunca acuses de recibo"
 
-#: src/prefs_send.c:180
+#: src/prefs_send.c:197
 msgid "Confirm before sending queued messages"
 msgstr "Confirmar antes de enviar los mensajes en la cola"
 
-#: src/prefs_send.c:183
+#: src/prefs_send.c:200
 msgid "Show send dialog"
 msgstr "Mostrar diálogo de envío"
 
-#: src/prefs_send.c:186
+#: src/prefs_send.c:203
 msgid "Warn when Subject is empty"
 msgstr "Avisar cuando el asunto esta vacío"
 
-#: src/prefs_send.c:193
+#: src/prefs_send.c:209
+#, fuzzy
+msgid "Warn when sending to more recipients than"
+msgstr "Avisar al insertar un fichero mayor de"
+
+#: src/prefs_send.c:225
 msgid "Outgoing encoding"
 msgstr "Codificación de caracteres para enviar"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:250
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
@@ -16911,131 +17199,131 @@ msgstr ""
 "Si selecciona «Automático» se utilizará la codificación óptima para la "
 "localización actual."
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:267
 msgid "7bit ASCII (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASCII)"
 
-#: src/prefs_send.c:236
+#: src/prefs_send.c:268
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:238
+#: src/prefs_send.c:270
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:271
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:273
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_send.c:243
+#: src/prefs_send.c:275
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:276
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:278
 msgid "Greek (ISO-8859-7)"
 msgstr "Griego (ISO-8859-7)"
 
-#: src/prefs_send.c:248
+#: src/prefs_send.c:280
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreo (ISO-8859-8)"
 
-#: src/prefs_send.c:249
+#: src/prefs_send.c:281
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreo (Windows-1255)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:283
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arábigo (ISO-8859-6)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:284
 msgid "Arabic (Windows-1256)"
 msgstr "Arábigo (Windows-1256)"
 
-#: src/prefs_send.c:254
+#: src/prefs_send.c:286
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:288
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_send.c:257
+#: src/prefs_send.c:289
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_send.c:258
+#: src/prefs_send.c:290
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "Cirílico (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:291
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_send.c:260
+#: src/prefs_send.c:292
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:294
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonés (ISO-2022-JP)"
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:296
 msgid "Japanese (EUC-JP)"
 msgstr "Japonés (EUC-JP)"
 
-#: src/prefs_send.c:265
+#: src/prefs_send.c:297
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonés (Shift_JIS)"
 
-#: src/prefs_send.c:268
+#: src/prefs_send.c:300
 msgid "Simplified Chinese (GB18030)"
 msgstr "Chino simplificado (GB18030)"
 
-#: src/prefs_send.c:269
+#: src/prefs_send.c:301
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chino simplificado (GB2312)"
 
-#: src/prefs_send.c:270
+#: src/prefs_send.c:302
 msgid "Simplified Chinese (GBK)"
 msgstr "Chino simplificado (GBK)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:303
 msgid "Traditional Chinese (Big5)"
 msgstr "Chino tradicional (Big5)"
 
-#: src/prefs_send.c:273
+#: src/prefs_send.c:305
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chino tradicional (EUC-TW)"
 
-#: src/prefs_send.c:274
+#: src/prefs_send.c:306
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chino (ISO-2022-CN)"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:309
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_send.c:279
+#: src/prefs_send.c:311
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:312
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:316
 msgid "Transfer encoding"
 msgstr "Codificación de envío"
 
-#: src/prefs_send.c:295
+#: src/prefs_send.c:327
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -17043,297 +17331,322 @@ msgstr ""
 "Especificar la codificación de envío (Content-Transfer-Encoding) usada "
 "cuando el cuerpo del mensaje contiene caracteres no-ASCII"
 
-#: src/prefs_send.c:372 src/send_message.c:501 src/send_message.c:505
-#: src/send_message.c:510
+#: src/prefs_send.c:420 src/send_message.c:520 src/send_message.c:524
+#: src/send_message.c:529
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/prefs_spelling.c:81
+#: src/prefs_spelling.c:80
 msgid "Pick color for misspelled word"
 msgstr "Elegir color de las palabras incorrectas"
 
-#: src/prefs_spelling.c:129
+#: src/prefs_spelling.c:128
 msgid "Enable spell checker"
 msgstr "Habilitar el corrector ortográfico"
 
-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:133
 msgid "Enable alternate dictionary"
 msgstr "Habilitar un diccionario alternativo"
 
-#: src/prefs_spelling.c:139
+#: src/prefs_spelling.c:138
 msgid "Faster switching with last used dictionary"
 msgstr "Cambio más rápido con el último diccionario usado"
 
-#: src/prefs_spelling.c:141
+#: src/prefs_spelling.c:140
 msgid "Automatic spell checking"
 msgstr "Comprobación ortográfica automática"
 
-#: src/prefs_spelling.c:149
+#: src/prefs_spelling.c:148
 msgid "Re-check message when changing dictionary"
 msgstr "Recomprobar el mensaje al cambiar de diccionario"
 
-#: src/prefs_spelling.c:153
+#: src/prefs_spelling.c:152
 msgid "Dictionary"
 msgstr "Diccionario"
 
-#: src/prefs_spelling.c:190
+#: src/prefs_spelling.c:187
 msgid "Check with both dictionaries"
 msgstr "Comprobar con ambos diccionarios"
 
-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194
 msgid "Get more dictionaries..."
 msgstr "Obtener más diccionarios..."
 
-#: src/prefs_spelling.c:207
+#: src/prefs_spelling.c:204
 msgid "Misspelled word color"
 msgstr "Color de las faltas ortográficas"
 
-#: src/prefs_spelling.c:220
+#: src/prefs_spelling.c:216
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Elegir color de los fallos ortográficos. Usar negro para subrayar"
 
-#: src/prefs_spelling.c:337
+#: src/prefs_spelling.c:333
 msgid "Spell Checking"
 msgstr "Corrección ortográfica"
 
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:166
 msgid "the abbreviated weekday name"
 msgstr "el día la semana abreviado"
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:167
 msgid "the full weekday name"
 msgstr "el día de la semana completo"
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:168
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:169
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:170
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:171
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:172
 msgid "the day of the month as a decimal number"
 msgstr "el día del mes como número decimal"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:173
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:174
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:175
 msgid "the day of the year as a decimal number"
 msgstr "el día del año como número decimal"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:176
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:177
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:178
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:179
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:180
 msgid "the day of the week as a decimal number"
 msgstr "el día de la semana como número decimal"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:181
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:182
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:183
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:184
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
-#: src/prefs_summaries.c:199 src/prefs_summaries.c:247
-#: src/prefs_summaries.c:567
+#: src/prefs_summaries.c:205 src/prefs_summaries.c:253
+#: src/prefs_summaries.c:465
 msgid "Date format"
 msgstr "Formato de fecha"
 
-#: src/prefs_summaries.c:223
+#: src/prefs_summaries.c:229
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_summaries.c:265
+#: src/prefs_summaries.c:271
 msgid "Example"
 msgstr "Ejemplo"
 
-#: src/prefs_summaries.c:371
+#: src/prefs_summaries.c:397
 msgid "Display message count next to folder name"
 msgstr "Ver el número de mensajes junto al nombre de la carpeta"
 
-#: src/prefs_summaries.c:381
+#: src/prefs_summaries.c:407
 msgid "Unread messages"
 msgstr "Mensajes sin leer"
 
-#: src/prefs_summaries.c:382
+#: src/prefs_summaries.c:408
 msgid "Unread and Total messages"
 msgstr "Mensajes sin leer y totales"
 
-#: src/prefs_summaries.c:392
+#: src/prefs_summaries.c:414
 msgid "Open last opened folder at start-up"
 msgstr "Abrir la última carpeta abierta al inicio"
 
-#: src/prefs_summaries.c:395
+#: src/prefs_summaries.c:421
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nombres de grupo con más de"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:434
 msgid "letters"
 msgstr "letras"
 
-#: src/prefs_summaries.c:427
+#: src/prefs_summaries.c:442
 msgid "Message list"
 msgstr "Lista de mensajes"
 
-#: src/prefs_summaries.c:433
-msgid "Sort new folders by"
-msgstr "Ordenar las carpetas nuevas por"
-
-#: src/prefs_summaries.c:441 src/prefs_summary_column.c:86
-msgid "Number"
-msgstr "Número"
-
-#: src/prefs_summaries.c:444
-msgid "Thread date"
-msgstr "Fecha del hilo"
+#: src/prefs_summaries.c:459
+#, fuzzy
+msgid "Lock column headers"
+msgstr "Cabeceras de columna"
 
-#: src/prefs_summaries.c:455
-msgid "Don't sort"
-msgstr "No ordenar"
+#: src/prefs_summaries.c:484
+msgid "Date format help"
+msgstr "Ayuda del formato de fecha"
 
-#: src/prefs_summaries.c:472
-msgid "Set default selection when entering a folder"
+#: src/prefs_summaries.c:490
+#, fuzzy
+msgid "Set message selection when entering a folder"
 msgstr "Establecer el mensaje seleccionado al entrar en una carpeta"
 
-#: src/prefs_summaries.c:485
-msgid "Show \"no unread (or new) message\" dialog"
-msgstr "Mostrar el diálogo de «No hay mensajes sin leer (o nuevos)»"
-
-#: src/prefs_summaries.c:495
-msgid "Assume 'Yes'"
-msgstr "Asumir «Sí»"
-
-#: src/prefs_summaries.c:496
-msgid "Assume 'No'"
-msgstr "Asumir «No»"
-
-#: src/prefs_summaries.c:501
+#: src/prefs_summaries.c:499
 msgid "Open message when selected"
 msgstr "Abrir el mensaje cuando se seleccione"
 
-#: src/prefs_summaries.c:506
+#: src/prefs_summaries.c:504
 msgid "When opening a folder"
 msgstr "Al abrir una carpeta"
 
-#: src/prefs_summaries.c:508
+#: src/prefs_summaries.c:506
 msgid "When displaying search results"
 msgstr "Al mostrar los resultados de una búsqueda"
 
-#: src/prefs_summaries.c:510
+#: src/prefs_summaries.c:508
 msgid "When selecting next or previous message using shortcuts"
 msgstr "Al seleccionar el mensaje anterior o siguiente usando atajos"
 
-#: src/prefs_summaries.c:512
+#: src/prefs_summaries.c:510
 msgid "When deleting or moving messages"
 msgstr "Al borrar o mover mensajes"
 
-#: src/prefs_summaries.c:514
+#: src/prefs_summaries.c:512
 msgid "When using directional keys"
 msgstr "Al usar las teclas de dirección"
 
-#: src/prefs_summaries.c:518
-msgid "Thread using subject in addition to standard headers"
-msgstr "Jerarquizar usando el asunto además de las cabeceras estándar"
-
-#: src/prefs_summaries.c:522
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
-
-#: src/prefs_summaries.c:524
-msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/"
-"Execute'"
-msgstr ""
-"Pospone el movimiento, copia y borrado de mensajes se hasta que se "
-"utilice la opción «Herramientas/Ejecutar»"
-
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:514
 msgid "Mark message as read"
 msgstr "Marcar el mensaje como leído"
 
-#: src/prefs_summaries.c:530
+#: src/prefs_summaries.c:517
 msgid "when selected, after"
 msgstr "al seleccionarlo, después de"
 
-#: src/prefs_summaries.c:550
+#: src/prefs_summaries.c:536
 msgid "only when opened in a new window, or replied to"
 msgstr "sólo al abrirlo en una ventana nueva, o al responderlo"
 
+#: src/prefs_summaries.c:546
+msgid "Show \"no unread (or new) message\" dialog"
+msgstr "Mostrar el diálogo de «No hay mensajes sin leer (o nuevos)»"
+
+#: src/prefs_summaries.c:556
+msgid "Assume 'Yes'"
+msgstr "Asumir «Sí»"
+
 #: src/prefs_summaries.c:557
+msgid "Assume 'No'"
+msgstr "Asumir «No»"
+
+#: src/prefs_summaries.c:563
 msgid "Display sender using address book"
 msgstr "Mostrar remitente usando la agenda"
 
-#: src/prefs_summaries.c:561
+#: src/prefs_summaries.c:567
+msgid "Thread using subject in addition to standard headers"
+msgstr "Jerarquizar usando el asunto además de las cabeceras estándar"
+
+#: src/prefs_summaries.c:571
+msgid "Execute immediately when moving or deleting messages"
+msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
+
+#: src/prefs_summaries.c:573
+#, fuzzy
+msgid ""
+"When unchecked moving, copying and deleting of messages is deferred until "
+"you use 'Tools/Execute'"
+msgstr ""
+"Pospone el movimiento, copia y borrado de mensajes se hasta que se utilice "
+"la opción «Herramientas/Ejecutar»"
+
+#: src/prefs_summaries.c:578
+#, fuzzy
+msgid "Confirm when marking all messages as read or unread"
+msgstr "Confirmar antes de marcar todos los correos en una carpeta como leídos"
+
+#: src/prefs_summaries.c:581
+msgid "Confirm when changing color labels"
+msgstr ""
+
+#: src/prefs_summaries.c:585
 msgid "Show tooltips"
 msgstr "Mostrar ayudas de herramienta"
 
-#: src/prefs_summaries.c:587
-msgid "Date format help"
-msgstr "Ayuda del formato de fecha"
+#: src/prefs_summaries.c:595 src/quote_fmt.c:539
+msgid "Defaults"
+msgstr "Predeterminados"
 
-#: src/prefs_summaries.c:605
-msgid "Confirm before marking all messages in a folder as read"
-msgstr "Confirmar antes de marcar todos los correos en una carpeta como leídos"
+#: src/prefs_summaries.c:597
+#, fuzzy
+msgid "New folders"
+msgstr "Carpetas de noticias"
 
-#: src/prefs_summaries.c:608
-msgid "Translate header names"
-msgstr "Traducir nombres de cabeceras"
+#: src/prefs_summaries.c:603
+#, fuzzy
+msgid "Sort by"
+msgstr "_Ordenar"
 
-#: src/prefs_summaries.c:610
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"Las cabeceras estándar mostradas (como «From:», «Subject:») serán traducidas "
-"a su idioma."
+#: src/prefs_summaries.c:611 src/prefs_summary_column.c:85
+msgid "Number"
+msgstr "Número"
+
+#: src/prefs_summaries.c:614
+msgid "Thread date"
+msgstr "Fecha del hilo"
+
+#: src/prefs_summaries.c:625
+msgid "Don't sort"
+msgstr "No ordenar"
+
+#: src/prefs_summaries.c:640
+#, fuzzy
+msgid "Thread view"
+msgstr "_Vista jerárquica"
+
+#: src/prefs_summaries.c:643
+#, fuzzy
+msgid "Collapse all threads"
+msgstr "Co_lapsar todos los hilos"
+
+#: src/prefs_summaries.c:649
+#, fuzzy
+msgid "Hide read messages"
+msgstr "_Ocultar los mensajes leídos"
 
-#: src/prefs_summaries.c:769
+#: src/prefs_summaries.c:843
 msgid "Summaries"
 msgstr "Resúmenes"
 
-#: src/prefs_summary_column.c:226
+#: src/prefs_summary_column.c:225
 msgid "Message list columns configuration"
 msgstr "Configuración de las columnas de la lista de mensajes"
 
-#: src/prefs_summary_column.c:243
+#: src/prefs_summary_column.c:242
 msgid ""
 "Select columns to be displayed in the message list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
@@ -17342,15 +17655,18 @@ msgstr ""
 "el orden utilizando los botones Arriba/Abajo, o arrastrando los elementos."
 
 #: src/prefs_summary_open.c:109
-msgid "first marked email"
+#, fuzzy
+msgid "oldest marked email"
 msgstr "el primer correo marcado"
 
 #: src/prefs_summary_open.c:110
-msgid "first new email"
+#, fuzzy
+msgid "oldest new email"
 msgstr "el primer correo nuevo"
 
 #: src/prefs_summary_open.c:111
-msgid "first unread email"
+#, fuzzy
+msgid "oldest unread email"
 msgstr "el primer correo no leído"
 
 #: src/prefs_summary_open.c:112
@@ -17358,24 +17674,44 @@ msgid "last opened email"
 msgstr "el último correo abierto"
 
 #: src/prefs_summary_open.c:113
-msgid "last email in the list"
+#, fuzzy
+msgid "newest email in the list"
 msgstr "el último correo de la lista"
 
 #: src/prefs_summary_open.c:115
-msgid "first email in the list"
-msgstr "el primer correo de la lista"
+#, fuzzy
+msgid "oldest email in the list"
+msgstr "el último correo de la lista"
 
-#: src/prefs_summary_open.c:184
-msgid " Selection when entering a folder"
+#: src/prefs_summary_open.c:116
+#, fuzzy
+msgid "newest marked email"
+msgstr "el primer correo marcado"
+
+#: src/prefs_summary_open.c:117
+#, fuzzy
+msgid "newest new email"
+msgstr "el primer correo nuevo"
+
+#: src/prefs_summary_open.c:118
+#, fuzzy
+msgid "newest unread email"
+msgstr "el primer correo no leído"
+
+#: src/prefs_summary_open.c:188
+#, fuzzy
+msgid "Message selection when entering a folder"
 msgstr "Selección de mensaje al abrir una carpeta"
 
-#: src/prefs_summary_open.c:230
-msgid "Possible selections"
+#: src/prefs_summary_open.c:233
+#, fuzzy
+msgid "Available selections"
 msgstr "Selecciones disponibles"
 
-#: src/prefs_summary_open.c:266
-msgid "Selection on folder opening"
-msgstr "Selección al abrir la carpeta"
+#: src/prefs_summary_open.c:268
+#, fuzzy
+msgid "Current selections"
+msgstr "Acciones actuales"
 
 #: src/prefs_template.c:80
 msgid "This name is used as the Menu item"
@@ -17389,137 +17725,133 @@ msgstr ""
 "Sobreescribir la cabecera «Desde» de la cuenta de composición. Esto no "
 "cambia la cuenta de composición."
 
-#: src/prefs_template.c:309
+#: src/prefs_template.c:308
 msgid "Append the new template above to the list"
 msgstr "Añadir la nueva plantilla de arriba a la lista"
 
-#: src/prefs_template.c:318
+#: src/prefs_template.c:317
 msgid "Replace the selected template in list with the template above"
 msgstr ""
 "Sustituir la plantilla seleccionada en la lista con la plantilla de arriba"
 
-#: src/prefs_template.c:328
+#: src/prefs_template.c:327
 msgid "Delete the selected template from the list"
 msgstr "Borrar la plantilla seleccionada de la lista"
 
-#: src/prefs_template.c:346
+#: src/prefs_template.c:345
 msgid "Show information on configuring templates"
 msgstr "Mostrar información sobre cómo configurar plantillas"
 
-#: src/prefs_template.c:370
+#: src/prefs_template.c:369
 msgid "Move the selected template to the top"
 msgstr "Mover la plantilla seleccionada encima de todas"
 
-#: src/prefs_template.c:380
+#: src/prefs_template.c:379
 msgid "Move the selected template up"
 msgstr "Mover la plantilla seleccionada arriba"
 
-#: src/prefs_template.c:388
+#: src/prefs_template.c:387
 msgid "Move the selected template down"
 msgstr "Mover la plantilla seleccionada abajo"
 
-#: src/prefs_template.c:398
+#: src/prefs_template.c:397
 msgid "Move the selected template to the bottom"
 msgstr "Mover la plantilla seleccionada al fondo"
 
-#: src/prefs_template.c:414
+#: src/prefs_template.c:413
 msgid "Template configuration"
 msgstr "Configuración de plantilla"
 
-#: src/prefs_template.c:602
+#: src/prefs_template.c:601
 msgid "Templates list not saved"
 msgstr "Lista de plantillas no guardada"
 
-#: src/prefs_template.c:603
+#: src/prefs_template.c:602
 msgid "The templates list has been modified. Close anyway?"
 msgstr "La lista de plantillas ha sido modificada. ¿Cerrar igualmente?"
 
-#: src/prefs_template.c:758
+#: src/prefs_template.c:759
 msgid "The template's name is not set."
 msgstr "No se estableció el nombre de la plantilla."
 
-#: src/prefs_template.c:801
+#: src/prefs_template.c:802
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr ""
 "El campo «Desde» de la plantilla contiene una dirección de correo inválida."
 
-#: src/prefs_template.c:807
+#: src/prefs_template.c:808
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr ""
 "El campo «Para» de la plantilla contiene una dirección de correo inválida."
 
-#: src/prefs_template.c:813
+#: src/prefs_template.c:814
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr ""
 "El campo «Cc» de la plantilla contiene una dirección de correo inválida."
 
-#: src/prefs_template.c:819
+#: src/prefs_template.c:820
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr ""
 "El campo «Bcc» de la plantilla contiene una dirección de correo inválida."
 
-#: src/prefs_template.c:825
+#: src/prefs_template.c:826
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr ""
 "El campo «Reply-To» de la plantilla contiene una dirección de correo "
 "inválida."
 
-#: src/prefs_template.c:831
+#: src/prefs_template.c:832
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "El campo «Asunto» de la plantilla no es válido."
 
-#: src/prefs_template.c:902
+#: src/prefs_template.c:903
 msgid "Delete template"
 msgstr "Borrar plantilla"
 
-#: src/prefs_template.c:903
+#: src/prefs_template.c:904
 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 
-#: src/prefs_template.c:915
+#: src/prefs_template.c:916
 msgid "Delete all templates"
 msgstr "Borrar todas las plantillas"
 
-#: src/prefs_template.c:916
+#: src/prefs_template.c:917
 msgid "Do you really want to delete all the templates?"
 msgstr "¿Quiere borrar realmente todas las plantillas?"
 
-#: src/prefs_template.c:1231
+#: src/prefs_template.c:1233
 msgid "Current templates"
 msgstr "Plantillas actuales"
 
-#: src/prefs_template.c:1259
+#: src/prefs_template.c:1261
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_themes.c:368 src/prefs_themes.c:804
+#: src/prefs_themes.c:401 src/prefs_themes.c:841
 msgid "Default internal theme"
 msgstr "Tema interno predeterminado"
 
-#: src/prefs_themes.c:390
+#: src/prefs_themes.c:423
 msgid "Themes"
 msgstr "Temas"
 
-#: src/prefs_themes.c:464
-msgid "Only root can remove system themes"
-msgstr "Solo el usuario root puede eliminar temas del sistema"
-
-#: src/prefs_themes.c:467
+#: src/prefs_themes.c:500
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Eliminar el tema global «%s»"
 
-#: src/prefs_themes.c:470
+#: src/prefs_themes.c:502
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Eliminar tema «%s»"
 
-#: src/prefs_themes.c:476
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "¿Está seguro de que quiere borrar este tema?"
 
-#: src/prefs_themes.c:486
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17528,40 +17860,41 @@ msgstr ""
 "Error en el fichero %s\n"
 "al eliminar el tema."
 
-#: src/prefs_themes.c:490
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "Falló la eliminación del directorio del tema."
 
-#: src/prefs_themes.c:493
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "Tema eliminado con éxito"
 
-#: src/prefs_themes.c:513
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Seleccionar carpeta del tema"
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Instalar tema «%s»"
 
-#: src/prefs_themes.c:531
+#: src/prefs_themes.c:562
+#, fuzzy
 msgid ""
-"This folder doesn't seem to be a theme folder.\n"
+"This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
 msgstr ""
 "Esta carpeta no parece la carpeta de un tema.\n"
 "¿Instalar de todas maneras?"
 
-#: src/prefs_themes.c:538
+#: src/prefs_themes.c:572
 msgid "Do you want to install theme for all users?"
 msgstr "¿Quiere instalar el tema para todos los usuarios?"
 
-#: src/prefs_themes.c:558
+#: src/prefs_themes.c:592
 msgid "Theme exists"
 msgstr "El tema ya existe"
 
-#: src/prefs_themes.c:559
+#: src/prefs_themes.c:593
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17573,25 +17906,25 @@ msgstr ""
 "\n"
 "¿Desea reemplazarlo?"
 
-#: src/prefs_themes.c:565
+#: src/prefs_themes.c:600
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "No se puede borrar el tema existente en %s."
 
-#: src/prefs_themes.c:573
+#: src/prefs_themes.c:609
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "No se puede crear el directorio de destino %s."
 
-#: src/prefs_themes.c:586
+#: src/prefs_themes.c:623
 msgid "Theme installed successfully."
 msgstr "Tema instalado con éxito."
 
-#: src/prefs_themes.c:593
+#: src/prefs_themes.c:630
 msgid "Failed installing theme"
 msgstr "Error al instalar el tema"
 
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:633
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17600,70 +17933,72 @@ msgstr ""
 "Error en el fichero %s\n"
 "al instalar el tema."
 
-#: src/prefs_themes.c:766
+#: src/prefs_themes.c:803
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "Disponibles %d temas (%d de usuario, %d globales, 1 interno)"
 
-#: src/prefs_themes.c:807
+#: src/prefs_themes.c:844
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "El tema interno tiene %d iconos"
 
-#: src/prefs_themes.c:813
+#: src/prefs_themes.c:850
 msgid "No info file available for this theme"
 msgstr "No hay fichero de información para este tema"
 
-#: src/prefs_themes.c:831
+#: src/prefs_themes.c:868
 msgid "Error: couldn't get theme status"
 msgstr "Error: no se pudo obtener el estado del tema"
 
-#: src/prefs_themes.c:861
+#: src/prefs_themes.c:898
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d ficheros (%d iconos), tamaño: %s"
 
-#: src/prefs_themes.c:919
+#: src/prefs_themes.c:956
 msgid "Selector"
 msgstr "Selector"
 
-#: src/prefs_themes.c:930
+#: src/prefs_themes.c:967
 msgid "Install new..."
 msgstr "Instalar nuevo..."
 
-#: src/prefs_themes.c:935
+#: src/prefs_themes.c:972
 msgid "Get more..."
 msgstr "Obtener más..."
 
-#: src/prefs_themes.c:946
+#: src/prefs_themes.c:983
 msgid "Information"
 msgstr "Información"
 
-#: src/prefs_themes.c:960
-msgid "Author: "
-msgstr "Autor: "
+#: src/prefs_themes.c:998
+#, fuzzy
+msgid "Author"
+msgstr "Autor:"
 
-#: src/prefs_themes.c:968
-msgid "URL:"
+#: src/prefs_themes.c:1006
+#, fuzzy
+msgid "URL"
 msgstr "URL:"
 
-#: src/prefs_themes.c:1010
+#: src/prefs_themes.c:1048
 msgid "Preview"
 msgstr "Apariencia"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1105
 msgid "SVG rendering"
 msgstr "Procesamiento de SVG"
 
-#: src/prefs_themes.c:1073
+#: src/prefs_themes.c:1112
 msgid "Enable alpha channel"
 msgstr "Habilitar el canal alfa"
 
-#: src/prefs_themes.c:1074
+#: src/prefs_themes.c:1113
 msgid "Force scaling"
 msgstr "Forzar escalado"
 
-#: src/prefs_themes.c:1080
+#: src/prefs_themes.c:1119
 msgid "Pixels per inch (PPI)"
 msgstr "Píxeles por pulgada (PPP)"
 
@@ -17683,67 +18018,67 @@ msgstr "El elemento no tiene un icono definido."
 msgid "Item has no text defined."
 msgstr "El elemento no tiene un texto definido."
 
-#: src/prefs_toolbar.c:929
+#: src/prefs_toolbar.c:896
 msgid "Toolbar item"
 msgstr "Ítem de la barra de herramientas"
 
-#: src/prefs_toolbar.c:945
+#: src/prefs_toolbar.c:912
 msgid "Item type"
 msgstr "Tipo de ítem"
 
-#: src/prefs_toolbar.c:955
+#: src/prefs_toolbar.c:922
 msgid "Internal Function"
 msgstr "Función interna"
 
-#: src/prefs_toolbar.c:956
+#: src/prefs_toolbar.c:923
 msgid "User Action"
 msgstr "Acción de usuario"
 
-#: src/prefs_toolbar.c:958 src/toolbar.c:277
+#: src/prefs_toolbar.c:925 src/toolbar.c:279
 msgid "Separator"
 msgstr "Separador"
 
-#: src/prefs_toolbar.c:965
+#: src/prefs_toolbar.c:932
 msgid "Event executed on click"
 msgstr "Evento ejecutado al pulsar"
 
-#: src/prefs_toolbar.c:1004
+#: src/prefs_toolbar.c:959
 msgid "Toolbar text"
 msgstr "Texto asociado"
 
-#: src/prefs_toolbar.c:1019 src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
 msgid "Icon"
 msgstr "Icono"
 
-#: src/prefs_toolbar.c:1055
+#: src/prefs_toolbar.c:1010
 msgid "A_dd"
 msgstr "Aña_dir"
 
-#: src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289 src/prefs_toolbar.c:1303
+#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
 msgid "Toolbars"
 msgstr "Barras de herramientas"
 
-#: src/prefs_toolbar.c:1276
+#: src/prefs_toolbar.c:1231
 msgid "Main Window"
 msgstr "Ventana principal"
 
-#: src/prefs_toolbar.c:1290
+#: src/prefs_toolbar.c:1245
 msgid "Message Window"
 msgstr "Ventana de mensaje"
 
-#: src/prefs_toolbar.c:1304
+#: src/prefs_toolbar.c:1259
 msgid "Compose Window"
 msgstr "Ventana de composición"
 
-#: src/prefs_toolbar.c:1418
+#: src/prefs_toolbar.c:1374
 msgid "Icon text"
 msgstr "Texto del icono"
 
-#: src/prefs_toolbar.c:1427
+#: src/prefs_toolbar.c:1383
 msgid "Mapped event"
 msgstr "Evento mapeado"
 
-#: src/prefs_toolbar.c:1724
+#: src/prefs_toolbar.c:1690
 msgid "Toolbar item icon"
 msgstr "Icono de ítem de herramientas"
 
@@ -17767,39 +18102,39 @@ msgstr "Auto-sangrado"
 msgid "Wrap text at"
 msgstr "Recortar texto a"
 
-#: src/prefs_wrapping.c:154
+#: src/prefs_wrapping.c:153
 msgid "Wrapping"
 msgstr "Recorte de líneas"
 
-#: src/printing.c:436
+#: src/printing.c:430
 msgid "Print preview"
 msgstr "Previsualizar impresión"
 
-#: src/printing.c:479
+#: src/printing.c:473
 msgid "First page"
 msgstr "Primera página"
 
-#: src/printing.c:490
+#: src/printing.c:483
 msgid "Last page"
 msgstr "Última página"
 
-#: src/printing.c:496
+#: src/printing.c:489
 msgid "Zoom 100%"
 msgstr "Aumento 100%"
 
-#: src/printing.c:498
+#: src/printing.c:491
 msgid "Zoom fit"
 msgstr "Aumento ajustado"
 
-#: src/printing.c:500
+#: src/printing.c:493
 msgid "Zoom in"
 msgstr "Aumentar"
 
-#: src/printing.c:502
+#: src/printing.c:495
 msgid "Zoom out"
 msgstr "Disminuir"
 
-#: src/printing.c:701
+#: src/printing.c:675
 #, c-format
 msgid "Page %d"
 msgstr "Página %d"
@@ -17812,28 +18147,33 @@ msgstr "No hay información disponible"
 msgid "No recipient keys defined."
 msgstr "No se definió ninguna clave para el destinatario."
 
-#: src/procmime.c:433 src/procmime.c:435 src/procmime.c:436
+#: src/procmime.c:402 src/procmime.c:404 src/procmime.c:405
 msgid "[Error decoding BASE64]\n"
 msgstr "[Error decodificando BASE64]\n"
 
-#: src/procmsg.c:937 src/procmsg.c:940
+#: src/procmime.c:2755
+#, fuzzy
+msgid "Could not decode part"
+msgstr "No se puede obtener la parte del mensaje."
+
+#: src/procmsg.c:935 src/procmsg.c:938
 msgid "Already trying to send."
 msgstr "Ya se está intentando enviar."
 
-#: src/procmsg.c:1558 src/procmsg.c:1618
+#: src/procmsg.c:1562 src/procmsg.c:1623
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "No se puede abrir el fichero %s."
 
-#: src/procmsg.c:1628
+#: src/procmsg.c:1633
 msgid "Queued message header is broken."
 msgstr "La cabecera del mensaje en cola está corrupta."
 
-#: src/procmsg.c:1648
+#: src/procmsg.c:1653
 msgid "An error happened during SMTP session."
 msgstr "Hubo algún error durante la sesión SMTP."
 
-#: src/procmsg.c:1662
+#: src/procmsg.c:1667
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -17841,7 +18181,7 @@ msgstr ""
 "No se encontró una cuenta específica para enviar, y hubo un error durante la "
 "sesión SMTP."
 
-#: src/procmsg.c:1670
+#: src/procmsg.c:1675
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17849,20 +18189,20 @@ msgstr ""
 "No se pudo determinar la información de envío. Quizás el correo no se generó "
 "con Claws Mail."
 
-#: src/procmsg.c:1693
+#: src/procmsg.c:1698
 msgid "Couldn't create temporary file for news sending."
 msgstr "No se pudo crear el fichero temporal para enviar noticias."
 
-#: src/procmsg.c:1706
+#: src/procmsg.c:1711
 msgid "Error when writing temporary file for news sending."
 msgstr "Error al escribir el fichero temporal para enviar noticias."
 
-#: src/procmsg.c:1720
+#: src/procmsg.c:1725
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Ocurrió un error mientras se enviaba el mensaje a %s."
 
-#: src/procmsg.c:2272
+#: src/procmsg.c:2285
 msgid "Filtering messages...\n"
 msgstr "Filtrando mensajes...\n"
 
@@ -18117,7 +18457,7 @@ msgstr "Se pueden usar los siguientes símbolos y órdenes:"
 msgid "Use template when composing new messages"
 msgstr "Usar plantilla al componer mensajes nuevos"
 
-#: src/quote_fmt.c:198
+#: src/quote_fmt.c:197
 msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
@@ -18125,35 +18465,31 @@ msgstr ""
 "Sobreescribir la cabecera «Desde». Esto no cambia la cuenta usada para "
 "componer el mensaje nuevo."
 
-#: src/quote_fmt.c:300
+#: src/quote_fmt.c:297
 msgid "Use template when replying to messages"
 msgstr "Usar plantilla al responder a mensajes"
 
-#: src/quote_fmt.c:324
+#: src/quote_fmt.c:320
 msgid "Override From header. This doesn't change the account used to reply."
 msgstr ""
 "Sobreescribir la cabecera «Desde». Esto no cambia la cuenta usada para "
 "responder."
 
-#: src/quote_fmt.c:335 src/quote_fmt.c:465
+#: src/quote_fmt.c:331 src/quote_fmt.c:459
 msgid "Quotation mark"
 msgstr "Marca de cita"
 
-#: src/quote_fmt.c:430
+#: src/quote_fmt.c:425
 msgid "Use template when forwarding messages"
 msgstr "Usar plantilla al reenviar mensajes"
 
-#: src/quote_fmt.c:454
+#: src/quote_fmt.c:448
 msgid "Override From header. This doesn't change the account used to forward."
 msgstr ""
 "Sobreescribir la cabecera «Desde». Esto no cambia la cuenta usada para "
 "reenviar."
 
-#: src/quote_fmt.c:546
-msgid "Defaults"
-msgstr "Predeterminados"
-
-#: src/quote_fmt.c:564
+#: src/quote_fmt.c:557
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
@@ -18161,109 +18497,109 @@ msgstr ""
 "El campo «Desde» de la plantilla «Componer» contiene una dirección de correo "
 "inválida."
 
-#: src/quote_fmt.c:567
+#: src/quote_fmt.c:560
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
 msgstr "El campo «Asunto» de la plantilla «Componer» es inválido."
 
-#: src/quote_fmt.c:584
+#: src/quote_fmt.c:577
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr "El campo «Marca de cita» de la plantilla «Responder» es inválido."
 
-#: src/quote_fmt.c:604
+#: src/quote_fmt.c:597
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr "El campo «Marca de cita» de la plantilla «Reenviar» es inválido."
 
-#: src/quote_fmt_parse.y:541
+#: src/quote_fmt_parse.y:544
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Introducir texto para sustituir «%s»"
 
-#: src/quote_fmt_parse.y:542
+#: src/quote_fmt_parse.y:545
 msgid "Enter variable"
 msgstr "Introducir variable"
 
-#: src/send_message.c:152
+#: src/send_message.c:154
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando mensaje usando la orden: %s\n"
 
-#: src/send_message.c:166
+#: src/send_message.c:168
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "No se pudo ejecutar la orden: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:204
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ha habido un error ejecutando la orden: %s"
 
-#: src/send_message.c:350
+#: src/send_message.c:353
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:355
+#: src/send_message.c:358
 msgid "Doing POP before SMTP..."
 msgstr "Haciendo POP antes de SMTP..."
 
-#: src/send_message.c:358
+#: src/send_message.c:361
 msgid "POP before SMTP"
 msgstr "POP antes de SMTP"
 
-#: src/send_message.c:363
+#: src/send_message.c:366
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor SMTP: %s:%d..."
 
-#: src/send_message.c:420
+#: src/send_message.c:439
 msgid "Mail sent successfully."
 msgstr "Correo enviado con éxito."
 
-#: src/send_message.c:486
+#: src/send_message.c:505
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
+#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
 msgid "Authenticating"
 msgstr "Autenticándose"
 
-#: src/send_message.c:488 src/send_message.c:493
+#: src/send_message.c:507 src/send_message.c:512
 msgid "Sending message..."
 msgstr "Enviando mensaje..."
 
-#: src/send_message.c:491
+#: src/send_message.c:510
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:500
+#: src/send_message.c:519
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:504
+#: src/send_message.c:523
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:509
+#: src/send_message.c:528
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:513
+#: src/send_message.c:532
 msgid "Quitting..."
 msgstr "Saliendo..."
 
-#: src/send_message.c:542
+#: src/send_message.c:561
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: src/send_message.c:595
+#: src/send_message.c:614
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: src/send_message.c:664 src/send_message.c:684
+#: src/send_message.c:683 src/send_message.c:703
 msgid "Error occurred while sending the message."
 msgstr "Ocurrió un error enviando los mensajes."
 
-#: src/send_message.c:667
+#: src/send_message.c:686
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18288,334 +18624,366 @@ msgstr ""
 "si ya lo tiene.\n"
 "Si no está seguro, seleccione Aceptar."
 
-#: src/sourcewindow.c:64
+#: src/sourcewindow.c:65
 msgid "Source of the message"
 msgstr "Fuente del mensaje"
 
-#: src/sourcewindow.c:159
+#: src/sourcewindow.c:160
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Fuente"
 
-#: src/ssl_manager.c:156
+#: src/ssl_manager.c:131
+msgid "Expiry"
+msgstr ""
+
+#: src/ssl_manager.c:195
 msgid "Saved SSL/TLS certificates"
 msgstr "Certificados SSL/TLS guardados"
 
-#: src/ssl_manager.c:436
+#: src/ssl_manager.c:444
 msgid "Delete certificate"
 msgstr "Eliminar certificado"
 
-#: src/ssl_manager.c:437
+#: src/ssl_manager.c:445
 msgid "Do you really want to delete this certificate?"
 msgstr "¿Quiere borrar realmente este certificado?"
 
-#: src/summary_search.c:305
+#: src/summary_search.c:290
 msgid "Search messages"
 msgstr "Buscar en los mensajes"
 
-#: src/summary_search.c:327
+#: src/summary_search.c:312
 msgid "Match any of the following"
 msgstr "Coincidir con alguno de los siguientes"
 
-#: src/summary_search.c:329
+#: src/summary_search.c:314
 msgid "Match all of the following"
 msgstr "Coincidir con todos los siguientes"
 
-#: src/summary_search.c:495
+#: src/summary_search.c:435
 msgid "Body:"
 msgstr "Cuerpo:"
 
-#: src/summary_search.c:502
+#: src/summary_search.c:442
 msgid "Condition:"
 msgstr "Condición:"
 
-#: src/summary_search.c:536
+#: src/summary_search.c:476
 msgid "Find _all"
 msgstr "Encontrar _todos"
 
-#: src/summary_search.c:751 src/summaryview.c:1089 src/summaryview.c:1351
+#: src/summary_search.c:691 src/summaryview.c:1148 src/summaryview.c:1411
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Buscando en %s...\n"
 
-#: src/summary_search.c:846
+#: src/summary_search.c:786
 msgid "Beginning of list reached; continue from end?"
 msgstr "Se llegó al principio de la lista, ¿seguir desde el final?"
 
-#: src/summary_search.c:848
+#: src/summary_search.c:788
 msgid "End of list reached; continue from beginning?"
 msgstr "Se terminó la lista, ¿comenzar desde el principio?"
 
-#: src/summaryview.c:431
+#: src/summaryview.c:441
 msgid "Create _filter rule"
 msgstr "Crear regla de _filtrado"
 
-#: src/summaryview.c:559
+#: src/summaryview.c:454
+#, fuzzy
+msgid "_Set displayed columns"
+msgstr "Establecer _columnas visibles"
+
+#: src/summaryview.c:459
+#, fuzzy
+msgid "_Lock column headers"
+msgstr "Cabeceras de columna"
+
+#: src/summaryview.c:596
 msgid "Toggle quick search bar"
 msgstr "Conmutar barra de búsqueda rápida"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:633
 msgid "Toggle multiple selection"
 msgstr "Commutar la selección múltiple"
 
-#: src/summaryview.c:1279
+#: src/summaryview.c:1339
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:1280
+#: src/summaryview.c:1340
 msgid "Some marks are left. Process them?"
 msgstr "Quedan algunas marcas. ¿Procesarlas?"
 
-#: src/summaryview.c:1330
+#: src/summaryview.c:1390
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1870 src/summaryview.c:1918
+#: src/summaryview.c:1971 src/summaryview.c:2019
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1871
+#: src/summaryview.c:1972
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1883 src/summaryview.c:1931 src/summaryview.c:1968
-#: src/summaryview.c:2016 src/summaryview.c:2083
+#: src/summaryview.c:1984 src/summaryview.c:2032 src/summaryview.c:2069
+#: src/summaryview.c:2117 src/summaryview.c:2184
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Error interno: valor inesperado para prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1895
+#: src/summaryview.c:1996
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1919
+#: src/summaryview.c:2020
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1955 src/summaryview.c:2003
+#: src/summaryview.c:2056 src/summaryview.c:2104
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:1956
+#: src/summaryview.c:2057
 msgid "No new message found. Search from the end?"
 msgstr "No hay mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1980
+#: src/summaryview.c:2081
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2105
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:2037 src/summaryview.c:2070
+#: src/summaryview.c:2138 src/summaryview.c:2171
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:2038
+#: src/summaryview.c:2139
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:2047
+#: src/summaryview.c:2148
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:2071
+#: src/summaryview.c:2172
 msgid "No marked message found. Go to next folder?"
 msgstr "No hay mensajes marcados. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:2104 src/summaryview.c:2133
+#: src/summaryview.c:2205 src/summaryview.c:2234
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:2105
+#: src/summaryview.c:2206
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:2114 src/summaryview.c:2147
+#: src/summaryview.c:2215 src/summaryview.c:2248
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:2134
+#: src/summaryview.c:2235
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:2451
+#: src/summaryview.c:2557
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por el asunto..."
 
-#: src/summaryview.c:2636
+#: src/summaryview.c:2742
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrado(s)"
 
-#: src/summaryview.c:2640
+#: src/summaryview.c:2746
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2641 src/summaryview.c:2648
+#: src/summaryview.c:2747 src/summaryview.c:2754
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2646
+#: src/summaryview.c:2752
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2660
+#: src/summaryview.c:2766
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " elemento seleccionado"
 msgstr[1] " elementos seleccionados"
 
-#: src/summaryview.c:2678 src/summaryview.c:2721
+#: src/summaryview.c:2784 src/summaryview.c:2829
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevo(s), %d no leído(s), %d total(es) (%s)"
 
-#: src/summaryview.c:2696
+#: src/summaryview.c:2804
 msgid "Message summary"
 msgstr "Resumen de mensajes"
 
-#: src/summaryview.c:2697
+#: src/summaryview.c:2805
 msgid "New:"
 msgstr "Nuevos:"
 
-#: src/summaryview.c:2698
+#: src/summaryview.c:2806
 msgid "Unread:"
 msgstr "Sin leer:"
 
-#: src/summaryview.c:2699
+#: src/summaryview.c:2807
 msgid "Total:"
 msgstr "Total:"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2809
 msgid "Marked:"
 msgstr "Marcados:"
 
-#: src/summaryview.c:2702
+#: src/summaryview.c:2810
 msgid "Replied:"
 msgstr "Respondidos:"
 
-#: src/summaryview.c:2703
+#: src/summaryview.c:2811
 msgid "Forwarded:"
 msgstr "Reenviados:"
 
-#: src/summaryview.c:2704
+#: src/summaryview.c:2812
 msgid "Locked:"
 msgstr "Bloqueados:"
 
-#: src/summaryview.c:2705
+#: src/summaryview.c:2813
 msgid "Ignored:"
 msgstr "ignorados:"
 
-#: src/summaryview.c:2706
+#: src/summaryview.c:2814
 msgid "Watched:"
 msgstr "Observados:"
 
-#: src/summaryview.c:2716
+#: src/summaryview.c:2824
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d seleccionados (%s/%s), %d sin leer"
 
-#: src/summaryview.c:3009
+#: src/summaryview.c:3117
 msgid "Sorting summary..."
 msgstr "Ordenando el resumen..."
 
-#: src/summaryview.c:3148
+#: src/summaryview.c:3285
 msgid "Setting summary from message data..."
 msgstr "Estableciendo el resumen de los mensajes..."
 
-#: src/summaryview.c:3353
+#: src/summaryview.c:3491
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
-#: src/summaryview.c:3405
+#: src/summaryview.c:3548
 msgid "(No Recipient)"
 msgstr "(Sin destinatario)"
 
-#: src/summaryview.c:3440
+#: src/summaryview.c:3596
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Desde: %s, en %s"
 
-#: src/summaryview.c:3449
+#: src/summaryview.c:3605
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Para: %s, en %s"
 
-#: src/summaryview.c:4314
-msgid "You're not the author of the article.\n"
+#: src/summaryview.c:4501
+#, fuzzy
+msgid "You're not the author of the article."
 msgstr "Usted no es el autor del artículo.\n"
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4591
 #, 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] "¿Quiere borrar realmente el mensaje seleccionado?"
 msgstr[1] "¿Quiere borrar realmente los %d mensajes seleccionados?"
 
-#: src/summaryview.c:4407
+#: src/summaryview.c:4594
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Borrar mensaje"
 msgstr[1] "Borrar mensajes"
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4758
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:4677
+#: src/summaryview.c:4813
+msgid "Select folder to move selected message to"
+msgid_plural "Select folder to move selected messages to"
+msgstr[0] "Seleccionar la carpeta a la que mover el mensaje seleccionado"
+msgstr[1] "Seleccionar la carpeta a la que mover los mensajes seleccionados"
+
+#: src/summaryview.c:4864
 msgid "Destination to copy is same as current folder."
 msgstr "El destino de copia es la carpeta actual."
 
-#: src/summaryview.c:4847
+#: src/summaryview.c:4898
+msgid "Select folder to copy selected message to"
+msgid_plural "Select folder to copy selected messages to"
+msgstr[0] "Seleccionar la carpeta a la que copiar el mensaje seleccionado"
+msgstr[1] "Seleccionar la carpeta a la que copiar los mensajes seleccionados"
+
+#: src/summaryview.c:5056
 msgid "Append or Overwrite"
 msgstr "Añadir o sobreescribir"
 
-#: src/summaryview.c:4848
+#: src/summaryview.c:5057
 msgid "Append or overwrite existing file?"
 msgstr "¿Añadir o sobreescribir el fichero existente?"
 
-#: src/summaryview.c:4849
+#: src/summaryview.c:5058
 msgid "_Append"
 msgstr "_Añadir"
 
-#: src/summaryview.c:4849
+#: src/summaryview.c:5058
 msgid "_Overwrite"
 msgstr "S_obreescribir"
 
-#: src/summaryview.c:4890
+#: src/summaryview.c:5069 src/summaryview.c:5072 src/summaryview.c:5087
+#, c-format
+msgid "Couldn't save the file '%s'."
+msgstr "No se pudo guardar el fichero «%s»."
+
+#: src/summaryview.c:5106
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Está a punto de imprimir %d mensajes, uno a uno. ¿Desea continuar?"
 
-#: src/summaryview.c:5348
+#: src/summaryview.c:5564
 msgid "Building threads..."
 msgstr "Construyendo jerarquía..."
 
-#: src/summaryview.c:5596
+#: src/summaryview.c:5812
 msgid "Skip these rules"
 msgstr "Saltarse estas reglas"
 
-#: src/summaryview.c:5599
+#: src/summaryview.c:5815
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 "Aplicar estas reglas independientemente de la cuenta a la que pertenecen"
 
-#: src/summaryview.c:5602
+#: src/summaryview.c:5818
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar estas reglas si se aplican a la cuenta actual"
 
-#: src/summaryview.c:5631
+#: src/summaryview.c:5847
 msgid "Filtering"
 msgstr "Filtrando"
 
-#: src/summaryview.c:5632
+#: src/summaryview.c:5848
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18623,55 +18991,75 @@ msgstr ""
 "Hay ciertas reglas de filtrado que pertenecen a una cuenta.\n"
 "Por favor seleccione que quiere hacer con ellas:"
 
-#: src/summaryview.c:5662
+#: src/summaryview.c:5880
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:5741
+#: src/summaryview.c:5963
 msgid "Processing configuration"
 msgstr "Configuración de procesamiento"
 
-#: src/summaryview.c:6287
+#: src/summaryview.c:6111
+#, fuzzy
+msgid "Do you really want to reset the color label of all selected messages?"
+msgstr "¿Quiere borrar realmente el mensaje seleccionado?"
+
+#: src/summaryview.c:6113
+#, fuzzy
+msgid "Do you really want to apply this color label to all selected messages?"
+msgstr "¿Quiere borrar realmente el mensaje seleccionado?"
+
+#: src/summaryview.c:6114
+#, fuzzy
+msgid "Reset color label"
+msgstr "Por el _color"
+
+#: src/summaryview.c:6114
+#, fuzzy
+msgid "Set color label"
+msgstr "Por el _color"
+
+#: src/summaryview.c:6557
 msgid "Ignored thread"
 msgstr "Hilo ignorado"
 
-#: src/summaryview.c:6289
+#: src/summaryview.c:6559
 msgid "Watched thread"
 msgstr "Hilo observado"
 
-#: src/summaryview.c:6297
+#: src/summaryview.c:6567
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Respondido y también reenviado - pulse para ver la respuesta"
 
-#: src/summaryview.c:6299
+#: src/summaryview.c:6569
 msgid "Replied - click to see reply"
 msgstr "Respondido - pulse para ver la respuesta"
 
-#: src/summaryview.c:6311
+#: src/summaryview.c:6581
 msgid "To be moved"
 msgstr "Será movido"
 
-#: src/summaryview.c:6313
+#: src/summaryview.c:6583
 msgid "To be copied"
 msgstr "Será copiado"
 
-#: src/summaryview.c:6325
+#: src/summaryview.c:6595
 msgid "Signed, has attachment(s)"
 msgstr "Firmado, tiene adjunto(s)"
 
-#: src/summaryview.c:6329
+#: src/summaryview.c:6599
 msgid "Encrypted, has attachment(s)"
 msgstr "Cifrado, tiene adjunto(s)"
 
-#: src/summaryview.c:6331
+#: src/summaryview.c:6601
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: src/summaryview.c:6333
+#: src/summaryview.c:6603
 msgid "Has attachment(s)"
 msgstr "Tiene adjunto(s)"
 
-#: src/summaryview.c:7990
+#: src/summaryview.c:8317
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18680,53 +19068,45 @@ msgstr ""
 "Error en la expresión regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8093
+#: src/summaryview.c:8420
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Volver a la lista de carpetas (tiene mensajes sin leer)"
 
-#: src/summaryview.c:8098
+#: src/summaryview.c:8425
 msgid "Go back to the folder list"
 msgstr "Volver a la lista de carpetas"
 
-#: src/textview.c:245
+#: src/textview.c:242
 msgid "_Open in web browser"
 msgstr "_Abrir con el navegador web"
 
-#: src/textview.c:246
+#: src/textview.c:243
 msgid "Copy this _link"
 msgstr "_Copiar el enlace"
 
-#: src/textview.c:253
+#: src/textview.c:250
 msgid "_Reply to this address"
 msgstr "_Responder a esta dirección"
 
-#: src/textview.c:254
+#: src/textview.c:251
 msgid "Add to _Address book"
 msgstr "Añadir a la _agenda"
 
-#: src/textview.c:255
+#: src/textview.c:252
 msgid "Copy this add_ress"
 msgstr "Copiar esta di_rección"
 
-#: src/textview.c:261
-msgid "_Open image"
-msgstr "_Abrir imagen"
-
-#: src/textview.c:262
-msgid "_Save image..."
-msgstr "_Guardar imagen..."
-
-#: src/textview.c:724
+#: src/textview.c:702
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
-#: src/textview.c:727
+#: src/textview.c:705
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
-#: src/textview.c:917
+#: src/textview.c:876
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -18740,69 +19120,68 @@ msgstr ""
 "\n"
 "  Utilice "
 
-#: src/textview.c:922
+#: src/textview.c:881
 msgid "'Network Log'"
 msgstr "«Traza de red»"
 
-#: src/textview.c:923
+#: src/textview.c:882
 msgid " in the Tools menu for more information."
 msgstr " en el menú Herramientas para más información."
 
-#: src/textview.c:986
+#: src/textview.c:948
 msgid "  The following can be performed on this part\n"
 msgstr "  Puede efectuar las siguientes acciones en esta parte haciendo\n"
 
-#: src/textview.c:988
+#: src/textview.c:950
 msgid "  by right-clicking the icon or list item:"
 msgstr "  clic con el botón derecho en el icono o elemento de la lista:"
 
-#: src/textview.c:992
+#: src/textview.c:954
 msgid "     - To save, select "
 msgstr "     - Para guardar, seleccione "
 
-#: src/textview.c:993
+#: src/textview.c:955
 msgid "'Save as...'"
 msgstr "«Guardar como...»"
 
 # NOTE: closing quote is within and untranslated string
-#: src/textview.c:995 src/textview.c:1007 src/textview.c:1019
-#: src/textview.c:1029
+#: src/textview.c:957 src/textview.c:969 src/textview.c:981 src/textview.c:991
 msgid " (Shortcut key: '"
 msgstr " (Atajo de teclado: '"
 
-#: src/textview.c:1003
+#: src/textview.c:965
 msgid "     - To display as text, select "
 msgstr "     - Para mostrar como texto, seleccione "
 
-#: src/textview.c:1004
+#: src/textview.c:966
 msgid "'Display as text'"
 msgstr "«Mostrar como texto»"
 
-#: src/textview.c:1015
+#: src/textview.c:977
 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir con un programa externo, seleccione "
 
-#: src/textview.c:1016
+#: src/textview.c:978
 msgid "'Open'"
 msgstr "«Abrir»"
 
-#: src/textview.c:1024
+#: src/textview.c:986
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente doble clic, o clic con el botón "
 
-#: src/textview.c:1025
+#: src/textview.c:987
 msgid "mouse button)\n"
 msgstr "central del ratón)\n"
 
-#: src/textview.c:1027
+#: src/textview.c:989
 msgid "     - Or use "
 msgstr "     - O utilice "
 
-#: src/textview.c:1028
+#: src/textview.c:990
 msgid "'Open with...'"
 msgstr "«Abrir con...»"
 
-#: src/textview.c:1146
+#: src/textview.c:1111
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -18813,47 +19192,47 @@ msgstr ""
 "    %s\n"
 "Código de salida %d\n"
 
-#: src/textview.c:2197
+#: src/textview.c:2187
 msgid "Tags: "
 msgstr "Etiquetas: "
 
-#: src/textview.c:2905
+#: src/textview.c:2906
 msgid "The real URL is different from the displayed URL."
 msgstr "La URL real es distinta de la URL mostrada."
 
-#: src/textview.c:2906
+#: src/textview.c:2907
 msgid "Displayed URL:"
 msgstr "URL mostrada:"
 
-#: src/textview.c:2907
+#: src/textview.c:2908
 msgid "Real URL:"
 msgstr "URL real:"
 
-#: src/textview.c:2908
+#: src/textview.c:2909
 msgid "Open it anyway?"
 msgstr "¿Abrirla de todas formas?"
 
-#: src/textview.c:2909
+#: src/textview.c:2910
 msgid "Phishing attempt warning"
 msgstr "Aviso de intento de «phishing»"
 
-#: src/textview.c:2910
+#: src/textview.c:2911
 msgid "_Open URL"
 msgstr "_Abrir URL"
 
-#: src/toolbar.c:224 src/toolbar.c:2213
+#: src/toolbar.c:224 src/toolbar.c:2294
 msgid "Receive Mail from all Accounts"
 msgstr "Recibir correo para todas las cuentas"
 
-#: src/toolbar.c:225 src/toolbar.c:2218
+#: src/toolbar.c:225 src/toolbar.c:2299
 msgid "Receive Mail from current Account"
 msgstr "Recibir correo para la cuenta actual"
 
-#: src/toolbar.c:226 src/toolbar.c:2222
+#: src/toolbar.c:226 src/toolbar.c:2303
 msgid "Send Queued Messages"
 msgstr "Enviar mensajes en la cola"
 
-#: src/toolbar.c:227 src/toolbar.c:952 src/toolbar.c:2240 src/toolbar.c:2251
+#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
 msgid "Compose Email"
 msgstr "Componer correo"
 
@@ -18861,35 +19240,35 @@ msgstr "Componer correo"
 msgid "Compose News"
 msgstr "Componer noticia"
 
-#: src/toolbar.c:229 src/toolbar.c:2295 src/toolbar.c:2305
+#: src/toolbar.c:229 src/toolbar.c:2376 src/toolbar.c:2386
 msgid "Reply to Message"
 msgstr "Responder al mensaje"
 
-#: src/toolbar.c:230 src/toolbar.c:2312 src/toolbar.c:2322
+#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
 msgid "Reply to Sender"
 msgstr "Responder al remitente"
 
-#: src/toolbar.c:231 src/toolbar.c:2329 src/toolbar.c:2339
+#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: src/toolbar.c:232 src/toolbar.c:2346 src/toolbar.c:2356
+#: src/toolbar.c:232 src/toolbar.c:2427 src/toolbar.c:2437
 msgid "Reply to Mailing-list"
 msgstr "Responder a la lista de correo"
 
-#: src/toolbar.c:233 src/toolbar.c:2234
+#: src/toolbar.c:233 src/toolbar.c:2315
 msgid "Open email"
 msgstr "Abrir correo"
 
-#: src/toolbar.c:234 src/toolbar.c:2363 src/toolbar.c:2374
+#: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
 msgid "Forward Message"
 msgstr "Reenviar mensaje"
 
-#: src/toolbar.c:235 src/toolbar.c:2379
+#: src/toolbar.c:235 src/toolbar.c:2460
 msgid "Trash Message"
 msgstr "Mensaje a la papelera"
 
-#: src/toolbar.c:236 src/toolbar.c:2383
+#: src/toolbar.c:236 src/toolbar.c:2464
 msgid "Delete Message"
 msgstr "Borrar mensaje"
 
@@ -18897,11 +19276,11 @@ msgstr "Borrar mensaje"
 msgid "Delete duplicate messages"
 msgstr "Borrar los mensajes duplicados"
 
-#: src/toolbar.c:239 src/toolbar.c:2391
+#: src/toolbar.c:239 src/toolbar.c:2472
 msgid "Go to Previous Unread Message"
 msgstr "Ir al mensaje anterior no leído"
 
-#: src/toolbar.c:240 src/toolbar.c:2395
+#: src/toolbar.c:240 src/toolbar.c:2476
 msgid "Go to Next Unread Message"
 msgstr "Ir al mensaje siguiente no leído"
 
@@ -18937,7 +19316,7 @@ msgstr "Marcar el mensaje como leído"
 msgid "Mark Message as unread"
 msgstr "Marcar el mensaje como no leído"
 
-#: src/toolbar.c:253 src/toolbar.c:511
+#: src/toolbar.c:253 src/toolbar.c:514
 msgid "Print"
 msgstr "Imprimir"
 
@@ -18949,272 +19328,302 @@ msgstr "Aprender correo basura o bueno"
 msgid "Open folder/Go to folder list"
 msgstr "Abrir carpeta/Ir a la lista de carpetas"
 
-#: src/toolbar.c:258 src/toolbar.c:2401
+#: src/toolbar.c:258 src/toolbar.c:2482
 msgid "Send Message"
 msgstr "Enviar mensaje"
 
-#: src/toolbar.c:259 src/toolbar.c:2405
+#: src/toolbar.c:259 src/toolbar.c:2486
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/toolbar.c:260 src/toolbar.c:2409
+#: src/toolbar.c:260 src/toolbar.c:2490
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/toolbar.c:261 src/toolbar.c:2413
+#: src/toolbar.c:261 src/toolbar.c:2494
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/toolbar.c:262 src/toolbar.c:2417
+#: src/toolbar.c:262 src/toolbar.c:2498
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#: src/toolbar.c:263 src/toolbar.c:2421
+#: src/toolbar.c:263 src/toolbar.c:2502
 msgid "Insert signature"
 msgstr "Insertar firma"
 
-#: src/toolbar.c:264 src/toolbar.c:2425
+#: src/toolbar.c:264 src/toolbar.c:2506
 msgid "Replace signature"
 msgstr "Reemplazar firma"
 
-#: src/toolbar.c:265 src/toolbar.c:2429
+#: src/toolbar.c:265 src/toolbar.c:2510
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/toolbar.c:266 src/toolbar.c:2433
+#: src/toolbar.c:266 src/toolbar.c:2514
 msgid "Wrap long lines of current paragraph"
 msgstr "Cortar líneas largas del párrafo actual"
 
-#: src/toolbar.c:267 src/toolbar.c:2437
+#: src/toolbar.c:267 src/toolbar.c:2518
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
-#: src/toolbar.c:270 src/toolbar.c:528 src/toolbar.c:2446
+#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2527
 msgid "Check spelling"
 msgstr "Verificar ortografía"
 
-#: src/toolbar.c:272
+#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
+#, fuzzy
+msgid "Sign"
+msgstr "Firmante"
+
+#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
+#, fuzzy
+msgid "Encrypt"
+msgstr "_Cifrado"
+
+#: src/toolbar.c:274
 msgid "Claws Mail Actions Feature"
 msgstr "Acciones de Claws Mail"
 
-#: src/toolbar.c:273 src/toolbar.c:2462
+#: src/toolbar.c:275 src/toolbar.c:2559
 msgid "Cancel receiving"
 msgstr "Cancelar recepción"
 
-#: src/toolbar.c:275 src/toolbar.c:2470
+#: src/toolbar.c:277 src/toolbar.c:2567
 msgid "Cancel receiving/sending"
 msgstr "Cancelar recepción/envío"
 
-#: src/toolbar.c:276 src/toolbar.c:2226
+#: src/toolbar.c:278 src/toolbar.c:2307
 msgid "Close window"
 msgstr "Cerrar ventana"
 
-#: src/toolbar.c:278
+#: src/toolbar.c:280
 msgid "Claws Mail Plugins"
 msgstr "Módulos de Claws Mail"
 
-#: src/toolbar.c:442 src/toolbar.c:493
+#: src/toolbar.c:445 src/toolbar.c:496
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/toolbar.c:482
+#: src/toolbar.c:485
 msgid "Get Mail"
 msgstr "Recibir correo"
 
-#: src/toolbar.c:483
+#: src/toolbar.c:486
 msgid "Get"
 msgstr "Recibir"
 
-#: src/toolbar.c:485 src/toolbar.c:486
+#: src/toolbar.c:488 src/toolbar.c:489
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Componer"
 
-#: src/toolbar.c:488
+#: src/toolbar.c:491
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Remitente"
 
-#: src/toolbar.c:489
+#: src/toolbar.c:492
 msgid "All"
 msgstr "Todo"
 
-#: src/toolbar.c:490
+#: src/toolbar.c:493
 msgid "List"
 msgstr "Lista"
 
-#: src/toolbar.c:495 src/toolbar.c:2279 src/toolbar.c:2288
+#: src/toolbar.c:498 src/toolbar.c:2360 src/toolbar.c:2369
 msgid "Delete duplicates"
 msgstr "Borrar duplicados"
 
-#: src/toolbar.c:497
+#: src/toolbar.c:500
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/toolbar.c:498
+#: src/toolbar.c:501
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/toolbar.c:506
+#: src/toolbar.c:509
 msgid "All read"
 msgstr "Todos leídos"
 
-#: src/toolbar.c:507
+#: src/toolbar.c:510
 msgid "All unread"
 msgstr "Todos no leídos"
 
-#: src/toolbar.c:508
+#: src/toolbar.c:511
 msgid "Read"
 msgstr "Leído"
 
-#: src/toolbar.c:513
+#: src/toolbar.c:516
 msgid "Folders"
 msgstr "Carpetas"
 
-#: src/toolbar.c:518
+#: src/toolbar.c:521
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/toolbar.c:521
+#: src/toolbar.c:524
 msgid "Insert sig."
 msgstr "Insertar firma"
 
-#: src/toolbar.c:522
+#: src/toolbar.c:525
 msgid "Replace sig."
 msgstr "Reemplazar firma"
 
-#: src/toolbar.c:523
+#: src/toolbar.c:526
 msgid "Edit"
 msgstr "Editar"
 
-#: src/toolbar.c:524
+#: src/toolbar.c:527
 msgid "Wrap para."
 msgstr "Recorta párr."
 
-#: src/toolbar.c:525
+#: src/toolbar.c:528
 msgid "Wrap all"
 msgstr "Recorta todo"
 
-#: src/toolbar.c:531 src/toolbar.c:532
+#: src/toolbar.c:536 src/toolbar.c:537
 msgid "Stop"
 msgstr "Detener"
 
-#: src/toolbar.c:533
+#: src/toolbar.c:538
 msgid "Stop all"
 msgstr "Detener todo"
 
-#: src/toolbar.c:944
+#: src/toolbar.c:951
 msgid "Compose News message"
 msgstr "Componer un mensaje _nuevo"
 
-#: src/toolbar.c:983
+#: src/toolbar.c:990
 msgid "Learn spam"
 msgstr "Aprender correo basura"
 
-#: src/toolbar.c:992
+#: src/toolbar.c:999
 msgid "Ham"
 msgstr "Bueno"
 
-#: src/toolbar.c:994
+#: src/toolbar.c:1001
 msgid "Learn ham"
 msgstr "Aprender correo bueno"
 
-#: src/toolbar.c:2208
+#: src/toolbar.c:1916
+#, fuzzy
+msgid "Message will be signed"
+msgstr "Mensaje que ha sido respondido"
+
+#: src/toolbar.c:1918
+#, fuzzy
+msgid "Message will not be signed"
+msgstr "Mensaje que está en un hilo ignorado"
+
+#: src/toolbar.c:1937
+#, fuzzy
+msgid "Message will be encrypted"
+msgstr "Incluso si se va a cifrar el mensaje"
+
+#: src/toolbar.c:1939
+#, fuzzy
+msgid "Message will not be encrypted"
+msgstr "Incluso si se va a cifrar el mensaje"
+
+#: src/toolbar.c:2289
 msgid "Go to folder list"
 msgstr "Ir a la lista de carpetas"
 
-#: src/toolbar.c:2214
+#: src/toolbar.c:2295
 msgid "Receive Mail from selected Account"
 msgstr "Recibir correo para la cuenta seleccionada"
 
-#: src/toolbar.c:2230
+#: src/toolbar.c:2311
 msgid "Open preferences"
 msgstr "Abrir preferencias"
 
-#: src/toolbar.c:2241
+#: src/toolbar.c:2322
 msgid "Compose with selected Account"
 msgstr "Componer correo con la cuenta seleccionada"
 
-#: src/toolbar.c:2262
+#: src/toolbar.c:2343
 msgid "Learn as..."
 msgstr "Aprender como..."
 
-#: src/toolbar.c:2272
+#: src/toolbar.c:2353
 msgid "Learn as _Spam"
 msgstr "Aprender como correo basura"
 
-#: src/toolbar.c:2273
+#: src/toolbar.c:2354
 msgid "Learn as _Ham"
 msgstr "Aprender como bueno"
 
-#: src/toolbar.c:2280
+#: src/toolbar.c:2361
 msgid "Delete duplicates options"
 msgstr "Opciones de borrado de duplicados"
 
-#: src/toolbar.c:2284
+#: src/toolbar.c:2365
 msgid "Delete duplicates in selected folder"
 msgstr "Borrar duplicados en la carpeta seleccionada"
 
-#: src/toolbar.c:2285
+#: src/toolbar.c:2366
 msgid "Delete duplicates in all folders"
 msgstr "Borrar duplicados en todas las carpetas"
 
-#: src/toolbar.c:2296
+#: src/toolbar.c:2377
 msgid "Reply to Message options"
 msgstr "Opciones de responder al mensaje"
 
-#: src/toolbar.c:2300 src/toolbar.c:2317 src/toolbar.c:2334 src/toolbar.c:2351
+#: src/toolbar.c:2381 src/toolbar.c:2398 src/toolbar.c:2415 src/toolbar.c:2432
 msgid "_Reply with quote"
 msgstr "Responder con _cita"
 
-#: src/toolbar.c:2301 src/toolbar.c:2318 src/toolbar.c:2335 src/toolbar.c:2352
+#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
 msgid "Reply without _quote"
 msgstr "_Responder sin cita"
 
-#: src/toolbar.c:2313
+#: src/toolbar.c:2394
 msgid "Reply to Sender options"
 msgstr "Opciones de responder al remitente"
 
-#: src/toolbar.c:2330
+#: src/toolbar.c:2411
 msgid "Reply to All options"
 msgstr "Opciones de responder a todos"
 
-#: src/toolbar.c:2347
+#: src/toolbar.c:2428
 msgid "Reply to Mailing-list options"
 msgstr "Opciones de responder a la lista de correo"
 
-#: src/toolbar.c:2364
+#: src/toolbar.c:2445
 msgid "Forward Message options"
 msgstr "Opciones de reenviar mensaje"
 
-#: src/uri_opener.c:88
+#: src/uri_opener.c:87
 msgid "There are no URLs in this email."
 msgstr "No hay URLs en este correo."
 
-#: src/uri_opener.c:116
+#: src/uri_opener.c:115
 msgid "Available URLs:"
 msgstr "URLs disponibles:"
 
-#: src/uri_opener.c:181
+#: src/uri_opener.c:189
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "Abrir URLs"
 
-#: src/uri_opener.c:206
+#: src/uri_opener.c:216
 msgid "Please select the URL to open."
 msgstr "Por favor seleccione la URL a abrir."
 
-#: src/uri_opener.c:214
+#: src/uri_opener.c:224
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/wizard.c:521
+#: src/wizard.c:523
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenido a Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:546
 #, c-format
 msgid ""
 "\n"
@@ -19306,47 +19715,47 @@ msgstr ""
 "hacerlo en «%s».\n"
 "\n"
 
-#: src/wizard.c:619
+#: src/wizard.c:621
 msgid "Please enter the mailbox name."
 msgstr "Por favor introduzca el nombre del buzón."
 
-#: src/wizard.c:647
+#: src/wizard.c:649
 msgid "Please enter your name and email address."
 msgstr "Por favor introduzca su nombre y dirección de correo."
 
-#: src/wizard.c:658
+#: src/wizard.c:660
 msgid "Please enter your receiving server and username."
 msgstr "Por favor introduzca su servidor de recepción y nombre de usuario."
 
-#: src/wizard.c:668
+#: src/wizard.c:670
 msgid "Please enter your username."
 msgstr "Por favor introduzca su nombre de usuario."
 
-#: src/wizard.c:678
+#: src/wizard.c:680
 msgid "Please enter your SMTP server."
 msgstr "Por favor introduzca su servidor SMTP."
 
-#: src/wizard.c:689
+#: src/wizard.c:691
 msgid "Please enter your SMTP username."
 msgstr "Por favor introduzca su nombre de usuario SMTP."
 
-#: src/wizard.c:974
+#: src/wizard.c:976
 msgid "Your name:"
 msgstr "Su nombre:"
 
-#: src/wizard.c:985
+#: src/wizard.c:987
 msgid "Your email address:"
 msgstr "Su dirección de correo:"
 
-#: src/wizard.c:996
+#: src/wizard.c:998
 msgid "Your organization:"
 msgstr "Su organización:"
 
-#: src/wizard.c:1030
+#: src/wizard.c:1032
 msgid "Mailbox name:"
 msgstr "Nombre del buzón:"
 
-#: src/wizard.c:1038
+#: src/wizard.c:1040
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19354,7 +19763,7 @@ msgstr ""
 "Puede especificar también una ruta absoluta, por ejemplo: «/home/usuario/"
 "Documentos/Correo»"
 
-#: src/wizard.c:1109
+#: src/wizard.c:1111
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19362,55 +19771,51 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:25»"
 
-#: src/wizard.c:1112
+#: src/wizard.c:1114
 msgid "SMTP server address:"
 msgstr "Dirección del servidor SMTP:"
 
-#: src/wizard.c:1118
-msgid "Use authentication"
-msgstr "Usar autenticación"
-
-#: src/wizard.c:1127
+#: src/wizard.c:1129
 msgid "(empty to use the same as receive)"
 msgstr "(vacío para usar el mismo que en la recepción)"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1143
 msgid "SMTP username:"
 msgstr "Usuario SMTP:"
 
-#: src/wizard.c:1152
+#: src/wizard.c:1154
 msgid "SMTP password:"
 msgstr "Contraseña SMTP:"
 
-#: src/wizard.c:1165
+#: src/wizard.c:1167
 msgid "Use SSL/TLS to connect to SMTP server"
 msgstr "Usar SSL/TLS para conectar al servidor SMTP"
 
-#: src/wizard.c:1176 src/wizard.c:1596
+#: src/wizard.c:1178 src/wizard.c:1598
 msgid "Use STARTTLS command to start encryption"
 msgstr "Usar la orden STARTTLS para abrir la sesión cifrada"
 
-#: src/wizard.c:1188 src/wizard.c:1608
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "Client SSL/TLS certificate (optional)"
 msgstr "Certificado SSL/TLS de cliente (opcional)"
 
-#: src/wizard.c:1256 src/wizard.c:1288 src/wizard.c:1543
+#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
 msgid "Server address:"
 msgstr "Dirección del servidor:"
 
-#: src/wizard.c:1320
+#: src/wizard.c:1322
 msgid "Local mailbox:"
 msgstr "Buzón local:"
 
-#: src/wizard.c:1489
+#: src/wizard.c:1491
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/wizard.c:1498
+#: src/wizard.c:1500
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1554
+#: src/wizard.c:1556
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19418,19 +19823,19 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:110»"
 
-#: src/wizard.c:1585
+#: src/wizard.c:1587
 msgid "Use SSL/TLS to connect to receiving server"
 msgstr "Usar SSL/TLS para conectar al servidor de recepción"
 
-#: src/wizard.c:1650
+#: src/wizard.c:1652
 msgid "IMAP server directory:"
 msgstr "Directorio del servidor IMAP:"
 
-#: src/wizard.c:1661
+#: src/wizard.c:1663
 msgid "Show only subscribed folders"
 msgstr "Mostrar sólo las carpetas suscritas"
 
-#: src/wizard.c:1669
+#: src/wizard.c:1671
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19438,15 +19843,15 @@ msgstr ""
 "Aviso: esta versión de Claws Mail\n"
 "se construyó sin soporte IMAP."
 
-#: src/wizard.c:1787
+#: src/wizard.c:1789
 msgid "Claws Mail Setup Wizard"
 msgstr "Ayudante de configuración de Claws Mail"
 
-#: src/wizard.c:1821
+#: src/wizard.c:1822
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenido a Claws Mail "
 
-#: src/wizard.c:1828
+#: src/wizard.c:1829
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19460,31 +19865,31 @@ msgstr ""
 "correo más comunes de manera que pueda comenzar a usar Claws Mail en menos "
 "de cinco minutos."
 
-#: src/wizard.c:1841
+#: src/wizard.c:1842
 msgid "About You"
 msgstr "Sobre usted"
 
-#: src/wizard.c:1849 src/wizard.c:1864 src/wizard.c:1879 src/wizard.c:1895
+#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
 msgid "Bold fields must be completed"
 msgstr "Los campos en etiquetados en negrilla deben ser completados"
 
-#: src/wizard.c:1856
+#: src/wizard.c:1857
 msgid "Receiving mail"
 msgstr "Recibiendo correo"
 
-#: src/wizard.c:1871
+#: src/wizard.c:1872
 msgid "Sending mail"
 msgstr "Enviando correo"
 
-#: src/wizard.c:1887
+#: src/wizard.c:1888
 msgid "Saving mail on disk"
 msgstr "Guardando el correo en el disco"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1904
 msgid "Configuration finished"
 msgstr "Configuración finalizada."
 
-#: src/wizard.c:1910
+#: src/wizard.c:1911
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."

commit e139c1126120ac1c0112948216b98b77130cffbd
Author: Ricardo Mones <ricardo at mones.org>
Date:   Wed Aug 7 16:41:04 2019 +0200

    perl: fix incoming typos in pod

diff --git a/src/plugins/perl/cm_perl.pod b/src/plugins/perl/cm_perl.pod
index cde360e70..7d7dc2e66 100644
--- a/src/plugins/perl/cm_perl.pod
+++ b/src/plugins/perl/cm_perl.pod
@@ -667,7 +667,7 @@ sure you get the idea..
  learn_and_move '#mh/mail/MailLists/Sylpheed'
    if matchcase('list-id','sylpheed.good-day.net');
 
- # Implement imcomming folders using addressbook
+ # Implement incoming folders using addressbook
  # attributes. Target folders for specific email addresses are
  # stored directly in the addressbook. This way, if an email
  # address changes, we only have to update the addressbook, not
@@ -679,9 +679,9 @@ sure you get the idea..
  my ($from) = extract_addresses $fromheader;
 
  # check if this email address has an associated attribute
- # called "incomming_folder". If if has, the value of this
+ # called "incoming_folder". If if has, the value of this
  # attribute is supposed to be the target folder.
- my $value = get_attribute_value $from, "incomming_folder";
+ my $value = get_attribute_value $from, "incoming_folder";
  learn_and_move($value) if $value;
 
  # An example of a whitelist: If the from-address is in my

commit 02730a60e1c7b77131558661f2ad163d0bde6c26
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sun Aug 4 12:20:48 2019 +0200

    Fix a failed assertion in NNTP group list dialog
    
    The code was trying to expand nodes of already subscribed
    newsgroups, even if those newsgroups weren't being displayed
    in the list, usually because of an active search pattern.

diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index e5a2437a7..cb8810137 100644
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -390,11 +390,14 @@ static GtkCMCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo,
 static void grouplist_expand_upwards(GtkCMCTree *ctree, const gchar *name) {
 	const gchar *ptr;
 	gchar *newname=g_malloc0(strlen(name));
+	GtkCMCTreeNode *node;
 
 	for (ptr=name; *ptr; ptr++) {
-		if (*ptr == '.')
-			gtk_cmctree_expand(ctree, 
-				grouplist_hash_get_branch_node(newname));
+		if (*ptr == '.') {
+			node = grouplist_hash_get_branch_node(newname);
+			if (node != NULL)
+				gtk_cmctree_expand(ctree, node);
+		}
 		newname[ptr-name] = *ptr;
 	}
 	g_free(newname);

commit 78723ba10749e4ef3a8d6bcd8f0af70ecbc7cfc7
Author: Paul <paul at claws-mail.org>
Date:   Fri Jul 26 11:58:35 2019 +0100

    for release 3.17.4

diff --git a/NEWS b/NEWS
index d6bf35df1..a47531873 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,78 @@
 Changes of the  Claws Mail GTK2 branch
 
+* 3.17.4
+--------
+
+* New HTML viewer plugin: Litehtml viewer
+
+* Added option 'Enable keyboard shortcuts' to the 'Keyboard
+  shortcuts' frame on /Configuration/Preferences/Other/Miscellaneous
+
+* Compose: implemented copying of attached images to clipboard
+
+* Compose: images and text/uri-list (files) can now be attached by
+  pasting into the Compose window
+
+* Python plugin: window sizes are now remembered for the Python
+  console, the 'Open URLs' and the 'Set mailbox order' windows.
+
+* Fancy plugin: the download-link feature now follows redirections
+
+* MBOX export: the Enter key in the dialogue now starts the export
+
+* The date (ISO format) has been added to log timestamps
+
+* Updated translations: Brazilian Portuguese, Catalan, Czech, Danish,
+  Dutch, French, German, Hungarian, Indonesian, Polish, Portuguese,
+  Romanian, Russian, Slovak, Spanish, Swedish, Traditional Chinese,
+  Turkish
+
+* bug fixes:
+	o bug 1920, 'No automatic NNTP filtering'
+	o bug 2045, 'address book blocks focus on email window'
+	o bug 2131, 'Focus stealing after mail check'
+	o bug 2627, 'Filtering does not work on NNTP'
+	o bug 3070, 'misbehaving text wrapping when URL chars are
+		     present'
+	o bug 3838, 'Canceled right-click on message list leaves UI
+		     in inconsistent state'
+	o bug 3977, 'Fix crashes when some external APIs fail'
+	o bug 3979, 'Hang (with killing needed) during action which
+		     extracts attachments'
+	o bug 4029, 'segfault after deleting message in a window'
+	o bug 4031, 'fingerprint in SSL/TLS certificates for ...
+		     (regress error)'
+	o bug 4037, 'Fix some small issues'
+	o bug 4142, 'Translation error on Russian'
+	o bug 4145, 'proxy server for sending doesn't work'
+	o bug 4155, 'remember directory of last saving'
+	o bug 4166, 'corrupted double-linked list'
+	0 bug 4167, 'Max line length exceeded when forwarding mail'
+	o bug 4188, 'STL file is sent not as an attachment but as its
+		     base64 representation in plaintext'
+	o CID 1442278, 'impossible to trigger buffer overflow'
+	o Make key accelerators from menu work in addressbook window
+	o save checkbox choices of display/summaries/defaults prefs
+	o Do not throw an error when cancelling 'Save email as...'.
+	o occasional crash on drag'n'drop of msgs
+	o possible stack overflow in vcalendar's Curl data handler
+	o crash when LDAP address source is defined in index, but
+	  LDAP support is disabled
+	o crash in Fancy plugin if one of the MIME parts has no
+	  Content-ID
+	o a few small memory leaks in scan_mailto_url()
+	o configure script for rare cases where python is not
+	  installed
+	o incorrect charset conversion in sc_html_read_line().
+	o markup in 'key not fully trusted' warning in pgpcore
+	o use after free in rare code path in rssyl_subscribe()
+	o several memory leaks
+	o verify_folderlist_xml() for fresh starts
+	o printf formats for size_t and goffset arguments.
+	o alertpanel API use in win32 part of mimeview.c
+	o pid handling in debug output of kill_children_cb()
+	o incorrect pointer arithmetic in w32_filesel.c
+
 * 3.17.3
 --------
 
diff --git a/README b/README
index 667e8561a..8e19c3434 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Claws Mail - a GTK+ based, lightweight, and fast e-mail client
 
 ---------------------------------------------------------------------
 
-   Copyright (C) 1999-2018 The Claws Mail Team and Hiroyuki Yamamoto
+   Copyright (C) 1999-2019 The Claws Mail Team and Hiroyuki Yamamoto
    <hiro-y at kcn.ne.jp>
 
 
@@ -587,6 +587,7 @@ https://www.thewildbeast.co.uk/claws-mail/bugzilla/index.cgi
 
 GTK 2 Version
 -------------
+2019-07-26	3.17.4
 2018-12-22	3.17.3
 2018-12-14	3.17.2
 2018-08-26	3.17.1
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 91df7c385..a0043f60e 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,4 +1,4 @@
-22nd December 2018                                  Claws Mail 3.17.3
+26th July 2019                                      Claws Mail 3.17.4
 
 		    CLAWS MAIL  RELEASE NOTES
                     http://www.claws-mail.org
@@ -9,28 +9,75 @@ email client.
 New in this release:
 ~~~~~~~~~~~~~~~~~~~~
 
-* Add support for TLS Server Name Indication (SNI). This enables the
-  sending of your hostname, if available, to the server so that it
-  can select the appropriate certificate for your domain. This is
-  useful for servers which host multiple domains on the same IP
-  address.
-  This is a hidden Account preference, 'use_tls_sni', and is enabled
-  by default.
+* New HTML viewer plugin: Litehtml viewer
 
-* SSL/TLS certificate manager: The Delete key will now delete the
-  selected certificate.
+* Added option 'Enable keyboard shortcuts' to the 'Keyboard
+  shortcuts' frame on /Configuration/Preferences/Other/Miscellaneous
 
-* Window sizes are now remembered for the 'Apply tags' and SSL/TLS
-  certificate manager windows.
+* Compose: implemented copying of attached images to clipboard
+
+* Compose: images and text/uri-list (files) can now be attached by
+  pasting into the Compose window
+
+* Python plugin: window sizes are now remembered for the Python
+  console, the 'Open URLs' and the 'Set mailbox order' windows.
+
+* Fancy plugin: the download-link feature now follows redirections
+
+* MBOX export: the Enter key in the dialogue now starts the export
+
+* The date (ISO format) has been added to log timestamps
+
+* Updated translations: Brazilian Portuguese, Catalan, Czech, Danish,
+  Dutch, French, German, Hungarian, Indonesian, Polish, Portuguese,
+  Romanian, Russian, Slovak, Spanish, Swedish, Traditional Chinese,
+  Turkish
 
 * bug fixes:
-	o bug 3519, 'Links including umlauts are broken'
-	o bug 4134, ''Save message to' option not set when it should
-		     be'
-	o prevent the Tools/SSL/TLS Certificates dialogue from
-	  crashing when certificate filenames contain a fingerprint.
-	o build on GNU Hurd.
-	o various build fixes when building without GnuTLS.
+	o bug 1920, 'No automatic NNTP filtering'
+	o bug 2045, 'address book blocks focus on email window'
+	o bug 2131, 'Focus stealing after mail check'
+	o bug 2627, 'Filtering does not work on NNTP'
+	o bug 3070, 'misbehaving text wrapping when URL chars are
+		     present'
+	o bug 3838, 'Canceled right-click on message list leaves UI
+		     in inconsistent state'
+	o bug 3977, 'Fix crashes when some external APIs fail'
+	o bug 3979, 'Hang (with killing needed) during action which
+		     extracts attachments'
+	o bug 4029, 'segfault after deleting message in a window'
+	o bug 4031, 'fingerprint in SSL/TLS certificates for ...
+		     (regress error)'
+	o bug 4037, 'Fix some small issues'
+	o bug 4142, 'Translation error on Russian'
+	o bug 4145, 'proxy server for sending doesn't work'
+	o bug 4155, 'remember directory of last saving'
+	o bug 4166, 'corrupted double-linked list'
+	0 bug 4167, 'Max line length exceeded when forwarding mail'
+	o bug 4188, 'STL file is sent not as an attachment but as its
+		     base64 representation in plaintext'
+	o CID 1442278, 'impossible to trigger buffer overflow'
+	o Make key accelerators from menu work in addressbook window
+	o save checkbox choices of display/summaries/defaults prefs
+	o Do not throw an error when cancelling 'Save email as...'.
+	o occasional crash on drag'n'drop of msgs
+	o possible stack overflow in vcalendar's Curl data handler
+	o crash when LDAP address source is defined in index, but
+	  LDAP support is disabled
+	o crash in Fancy plugin if one of the MIME parts has no
+	  Content-ID
+	o a few small memory leaks in scan_mailto_url()
+	o configure script for rare cases where python is not
+	  installed
+	o incorrect charset conversion in sc_html_read_line().
+	o markup in 'key not fully trusted' warning in pgpcore
+	o use after free in rare code path in rssyl_subscribe()
+	o several memory leaks
+	o verify_folderlist_xml() for fresh starts
+	o printf formats for size_t and goffset arguments.
+	o alertpanel API use in win32 part of mimeview.c
+	o pid handling in debug output of kill_children_cb()
+	o incorrect pointer arithmetic in w32_filesel.c
 
 For further details of the numbered bugs and RFEs listed above
 see https://www.claws-mail.org/bug/[BUG NUMBER]

commit ef64f05e6a50457971531bd54c58517e78214424
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Jul 26 12:51:13 2019 +0200

    Fix leak on error variable

diff --git a/src/plugins/litehtml_viewer/lh_viewer.c b/src/plugins/litehtml_viewer/lh_viewer.c
index bf6435bb3..2d2fc5044 100644
--- a/src/plugins/litehtml_viewer/lh_viewer.c
+++ b/src/plugins/litehtml_viewer/lh_viewer.c
@@ -103,6 +103,7 @@ static void lh_show_mimepart(MimeViewer *_viewer, const gchar *infile,
 		if (error) {
 			g_warning("LH: failed mimepart conversion to UTF-8: %s", error->message);
 			g_free(string);
+			g_error_free(error);
 			return;
 		}
 		debug_print("LH: successfully converted %" G_GSIZE_FORMAT " bytes\n", length);

commit 825be32b2503b4c6138c1df4eeac25d70e84d10c
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Jul 26 12:45:08 2019 +0200

    Add minimalistic plugin description
    
    Thanks Andrej for the inspiration:
    https://lists.claws-mail.org/pipermail/users/2019-March/023861.html

diff --git a/src/plugins/litehtml_viewer/plugin.c b/src/plugins/litehtml_viewer/plugin.c
index 32705d8b3..4fd8b1224 100644
--- a/src/plugins/litehtml_viewer/plugin.c
+++ b/src/plugins/litehtml_viewer/plugin.c
@@ -52,7 +52,7 @@ const gchar *plugin_name(void)
 
 const gchar *plugin_desc(void)
 {
-	return "[description goes here]";
+	return "Viewer plugin for HTML emails, using the litehtml library (http://www.litehtml.com/).";
 }
 
 const gchar *plugin_type(void)

commit 179c736dbf494c20d6812e5310254b65aadb7904
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Jul 26 12:31:57 2019 +0200

    Don't show mojibake when encoding is not UTF-8
    
    Litehtml expect displayed strings in UTF-8, so convert message part
    before displaying.

diff --git a/src/plugins/litehtml_viewer/lh_viewer.c b/src/plugins/litehtml_viewer/lh_viewer.c
index a567d2ccb..bf6435bb3 100644
--- a/src/plugins/litehtml_viewer/lh_viewer.c
+++ b/src/plugins/litehtml_viewer/lh_viewer.c
@@ -86,13 +86,30 @@ static void lh_show_mimepart(MimeViewer *_viewer, const gchar *infile,
 {
 	debug_print("LH: show_mimepart\n");
 	LHViewer *viewer = (LHViewer *)_viewer;
-	gchar *utf8 = procmime_get_part_as_string(partinfo, TRUE);
+	gchar *string = procmime_get_part_as_string(partinfo, TRUE);
+	gchar *utf8 = NULL;
 
-	if (utf8 == NULL) {
+	if (string == NULL) {
 		g_warning("LH: couldn't get MIME part file\n");
 		return;
 	}
 
+	gchar *charset = procmime_mimeinfo_get_parameter(partinfo, "charset");
+	if (charset != NULL && g_ascii_strcasecmp("utf-8", charset) != 0) {
+		gsize length;
+		GError *error = NULL;
+		debug_print("LH: converting mimepart to UTF-8 from %s\n", charset);
+		utf8 = g_convert(string, -1, "utf-8", charset, NULL, &length, &error);
+		if (error) {
+			g_warning("LH: failed mimepart conversion to UTF-8: %s", error->message);
+			g_free(string);
+			return;
+		}
+		debug_print("LH: successfully converted %" G_GSIZE_FORMAT " bytes\n", length);
+	} else {
+		utf8 = string;
+	}
+
 	lh_widget_set_partinfo(viewer->widget, partinfo);
 	lh_widget_open_html(viewer->widget, utf8);
 	g_free(utf8);

commit aba296bd2f1beaa750add7656003d809dc763381
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Jul 26 12:26:02 2019 +0200

    Update list of TLDs for release

diff --git a/src/common/tlds.h b/src/common/tlds.h
index 8c2f13725..159b026c8 100644
--- a/src/common/tlds.h
+++ b/src/common/tlds.h
@@ -6,7 +6,7 @@
 #define __TLDS_H__
 
 static const gchar *toplvl_domains [] = {
-	/* Version 2018122100, Last Updated Fri Dec 21 07:07:02 2018 UTC */
+	/* Version 2019072500, Last Updated Thu Jul 25 07:07:01 2019 UTC */
 	"aaa",
 	"aarp",
 	"abarth",
@@ -23,7 +23,6 @@ static const gchar *toplvl_domains [] = {
 	"accountant",
 	"accountants",
 	"aco",
-	"active",
 	"actor",
 	"ad",
 	"adac",
@@ -153,7 +152,6 @@ static const gchar *toplvl_domains [] = {
 	"bj",
 	"black",
 	"blackfriday",
-	"blanco",
 	"blockbuster",
 	"blog",
 	"bloomberg",
@@ -369,7 +367,6 @@ static const gchar *toplvl_domains [] = {
 	"doctor",
 	"dodge",
 	"dog",
-	"doha",
 	"domains",
 	"dot",
 	"download",
@@ -399,7 +396,6 @@ static const gchar *toplvl_domains [] = {
 	"engineer",
 	"engineering",
 	"enterprises",
-	"epost",
 	"epson",
 	"equipment",
 	"er",
@@ -587,7 +583,6 @@ static const gchar *toplvl_domains [] = {
 	"homes",
 	"homesense",
 	"honda",
-	"honeywell",
 	"horse",
 	"hospital",
 	"host",
@@ -1165,6 +1160,7 @@ static const gchar *toplvl_domains [] = {
 	"sr",
 	"srl",
 	"srt",
+	"ss",
 	"st",
 	"stada",
 	"staples",
@@ -1385,7 +1381,6 @@ static const gchar *toplvl_domains [] = {
 	"zara",
 	"zero",
 	"zip",
-	"zippo",
 	"zm",
 	"zone",
 	"zuerich",

commit 82db6d4cb619d5fff7bb979c3e6515052987d5b9
Author: wwp <subscript at free.fr>
Date:   Mon Jul 22 14:14:48 2019 +0200

    Update French translation.

diff --git a/po/fr.po b/po/fr.po
index a8501b9c0..850bdeaf1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,8 +1,9 @@
 # French translation of Claws Mail
-# Copyright © 1999-2016 The Claws Mail team.
+# Copyright © 1999-2019 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
+# Past maintainers & contributors:
 #   Paul Rolland <rol at as2917.net>, 2000
 #   Sébastien Rodriguez <srodriguez at ifrance.com>
 #   P'tit Lu <ptitlu at ptitlu.org>
@@ -10,14 +11,17 @@
 #   Lol Zimmerli <lol at headbanger.ch>
 #   Melvin Hadasht <melvin.hadasht at free.fr>, 2001 (2001-12-11) - 2004
 #   Fabien Vantard <fzzzzz at gmail.com>, 2004 (2004-08-22) - 2007
+# Current maintainers:
+#   Colin Leroy <colin at colino.net>
+#   Tristan Chabredier (wwp) <wwp at claws-mail.org>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2018-12-07 08:13+0000\n"
-"PO-Revision-Date: 2018-12-10 18:14+0100\n"
-"Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
+"POT-Creation-Date: 2019-07-19 08:25+0100\n"
+"PO-Revision-Date: 2019-07-21 01:02+0100\n"
+"Last-Translator: Tristan Chabredier (wwp) <wwp at claws-mail.org>\n"
 "Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -89,20 +93,20 @@ msgstr ""
 "La fonctionnalité « Relever » récupèrera le courrier des comptes cochés"
 
 #: src/account.c:1609 src/addrduplicates.c:471 src/addressadd.c:222
-#: src/addressbook.c:128 src/compose.c:7462 src/editaddress.c:1473
+#: src/addressbook.c:128 src/compose.c:7467 src/editaddress.c:1473
 #: src/editaddress.c:1502 src/editaddress.c:1518
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:170
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:427
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
-#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:470
+#: src/mimeview.c:303 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1846
 #: src/plugins/pgpcore/select-keys.c:463 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1874 src/prefs_template.c:79 src/prefs_themes.c:990
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:1617 src/prefs_account.c:1196 src/prefs_account.c:4644
+#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4647
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -134,11 +138,11 @@ msgstr ""
 "L'action choisie ne peut être utilisée pour un message en cours\n"
 "de composition car elle contient %%f, %%F, %%as ou %%p."
 
-#: src/action.c:720
+#: src/action.c:728
 msgid "There is no filtering action set"
 msgstr "Il n'y a pas d'action de filtrage définie"
 
-#: src/action.c:722
+#: src/action.c:730
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -147,7 +151,7 @@ msgstr ""
 "Action(s) de filtrage non valide(s) :\n"
 "%s"
 
-#: src/action.c:987
+#: src/action.c:997
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -158,35 +162,35 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:989 src/compose.c:5257 src/compose.c:5262 src/ldaputil.c:333
+#: src/action.c:999 src/compose.c:5262 src/compose.c:5267 src/ldaputil.c:333
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1824
-#: src/plugins/vcalendar/vcal_folder.c:1828
-#: src/plugins/vcalendar/vcal_folder.c:1846
-#: src/plugins/vcalendar/vcal_folder.c:1849 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1827
+#: src/plugins/vcalendar/vcal_folder.c:1831
+#: src/plugins/vcalendar/vcal_folder.c:1849
+#: src/plugins/vcalendar/vcal_folder.c:1852 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/action.c:1207 src/action.c:1379
+#: src/action.c:1218 src/action.c:1390
 msgid "Completed"
 msgstr "Terminé"
 
-#: src/action.c:1243
+#: src/action.c:1254
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- En cours : %s\n"
 
-#: src/action.c:1247
+#: src/action.c:1258
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Terminé : %s\n"
 
-#: src/action.c:1293
+#: src/action.c:1304
 msgid "Action's input/output"
 msgstr "Entrées/Sorties d'Actions"
 
-#: src/action.c:1625
+#: src/action.c:1636
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -197,11 +201,11 @@ msgstr ""
 "(L'argument remplacera « %%h »)\n"
 "  %s"
 
-#: src/action.c:1630
+#: src/action.c:1641
 msgid "Action's hidden user argument"
 msgstr "Argument caché de l'action"
 
-#: src/action.c:1634
+#: src/action.c:1645
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -212,7 +216,7 @@ msgstr ""
 "(L'argument remplacera « %%u »)\n"
 "  %s"
 
-#: src/action.c:1639
+#: src/action.c:1650
 msgid "Action's user argument"
 msgstr "Argument pour l'action"
 
@@ -232,7 +236,7 @@ msgstr ""
 "Il n'est pas possible de déplacer un dossier vers lui-même ou vers un de ses "
 "sous-dossiers."
 
-#: src/addr_compl.c:689 src/addressbook.c:5016
+#: src/addr_compl.c:689 src/addressbook.c:5017
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "Groupe"
@@ -378,11 +382,11 @@ msgstr "Adresse"
 msgid "Address book path"
 msgstr "Chemin dans le carnet"
 
-#: src/addrduplicates.c:790 src/addressbook.c:1441 src/addressbook.c:1494
+#: src/addrduplicates.c:790 src/addressbook.c:1444 src/addressbook.c:1497
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1495
+#: src/addrduplicates.c:791 src/addressbook.c:1498
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous vraiment supprimer la(les) adresse(s) sélectionnée(s) ?"
 
@@ -390,7 +394,7 @@ msgstr "Voulez-vous vraiment supprimer la(les) adresse(s) sélectionnée(s) ?"
 msgid "Delete address"
 msgstr "Supprimer l'adresse"
 
-#: src/addrduplicates.c:841 src/addressbook.c:1442
+#: src/addrduplicates.c:841 src/addressbook.c:1445
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 "Les données de cette adresse sont en lecture seule\n"
@@ -413,7 +417,7 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Sélectionner un dossier"
 
-#: src/addressadd.c:596 src/addressbook.c:3264 src/addressbook.c:3315
+#: src/addressadd.c:596 src/addressbook.c:3267 src/addressbook.c:3318
 msgid "Add address(es)"
 msgstr "Ajout d'adresse(s)"
 
@@ -421,7 +425,7 @@ msgstr "Ajout d'adresse(s)"
 msgid "Can't add the specified address"
 msgstr "Impossible d'ajouter l'adresse spécifiée"
 
-#: src/addressbook.c:129 src/addressbook.c:5004 src/editaddress.c:1246
+#: src/addressbook.c:129 src/addressbook.c:5005 src/editaddress.c:1246
 #: src/editaddress.c:1284 src/editgroup.c:291 src/expldifdlg.c:517
 #: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
 msgid "Email Address"
@@ -432,17 +436,17 @@ msgid "_Book"
 msgstr "_Carnet"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
-#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:515
+#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Édition"
 
-#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:518
+#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "Ou_tils"
 
-#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:520
+#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:528
 #: src/messageview.c:216
 msgid "_Help"
 msgstr "_Aide"
@@ -497,7 +501,7 @@ msgid "C_ut"
 msgstr "Co_uper"
 
 #: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:636 src/mainwindow.c:549 src/messageview.c:228
+#: src/compose.c:636 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copier"
@@ -551,7 +555,7 @@ msgstr "_Chercher les contacts en double.."
 msgid "Edit custom attributes..."
 msgstr "Personnaliser les _attributs.."
 
-#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:814
+#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:825
 #: src/messageview.c:340
 msgid "_About"
 msgstr "À _propos"
@@ -669,20 +673,20 @@ msgstr "Forte authentification obligatoire"
 msgid "Sources"
 msgstr "Sources"
 
-#: src/addressbook.c:920 src/prefs_matcher.c:642 src/prefs_other.c:490
+#: src/addressbook.c:920 src/prefs_matcher.c:642 src/prefs_other.c:492
 #: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:1114 src/editldap.c:793
+#: src/addressbook.c:1117 src/editldap.c:793
 msgid "Search"
 msgstr "Chercher"
 
-#: src/addressbook.c:1486
+#: src/addressbook.c:1489
 msgid "Delete group"
 msgstr "Suppression de groupe(s)"
 
-#: src/addressbook.c:1487
+#: src/addressbook.c:1490
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -690,30 +694,30 @@ msgstr ""
 "Voulez-vous supprimer ce(s) groupe(s) ?\n"
 "Les adresses contenues seront conservées."
 
-#: src/addressbook.c:2214
+#: src/addressbook.c:2217
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 "Impossible de coller. Le carnet d'adresses de destination est en lecture "
 "seule."
 
-#: src/addressbook.c:2224
+#: src/addressbook.c:2227
 msgid "Cannot paste into an address group."
 msgstr "Impossible de coller dans une adresse de groupe."
 
-#: src/addressbook.c:2961
+#: src/addressbook.c:2964
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr ""
 "Voulez-vous effacer les résultats de la recherche et les adresses dans « %s "
 "» ?"
 
-#: src/addressbook.c:2964 src/addressbook.c:2990 src/addressbook.c:2997
+#: src/addressbook.c:2967 src/addressbook.c:2993 src/addressbook.c:3000
 #: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
 #: src/toolbar.c:497
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/addressbook.c:2973
+#: src/addressbook.c:2976
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -723,20 +727,20 @@ msgstr ""
 "uniquement le dossier, les adresses qu'il contient seront déplacées dans le "
 "dossier parent."
 
-#: src/addressbook.c:2976 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/addressbook.c:2979 src/imap_gtk.c:368 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:2977
+#: src/addressbook.c:2980
 msgid "Delete _folder only"
 msgstr "Supprimer le _Dossier uniquement"
 
-#: src/addressbook.c:2977
+#: src/addressbook.c:2980
 msgid "Delete folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:2988
+#: src/addressbook.c:2991
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -745,7 +749,7 @@ msgstr ""
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront conservées."
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2998
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -754,30 +758,30 @@ msgstr ""
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront définitivement perdues."
 
-#: src/addressbook.c:3109
+#: src/addressbook.c:3112
 #, c-format
 msgid "Search '%s'"
 msgstr "Recherche « %s »"
 
-#: src/addressbook.c:3247 src/addressbook.c:3296
+#: src/addressbook.c:3250 src/addressbook.c:3299
 msgid "New Contacts"
 msgstr "Nouveaux contacts"
 
-#: src/addressbook.c:4135
+#: src/addressbook.c:4136
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur·rice. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:4139
+#: src/addressbook.c:4140
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur·rice. Impossible d'enregistrer le fichier de carnet "
 "d'adresses."
 
-#: src/addressbook.c:4149
+#: src/addressbook.c:4150
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:4154
+#: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -785,7 +789,7 @@ msgstr ""
 "Ancien carnet d'adresses converti :\n"
 "Mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:4167
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -793,7 +797,7 @@ msgstr ""
 "Échec lors de la conversion de l'ancien carnet d'adresses :\n"
 "Création d'un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4174
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -801,7 +805,7 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses :\n"
 "Impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4179
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -809,52 +813,52 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses\n"
 "et lors de la création d'un nouveau carnet d'adresses."
 
-#: src/addressbook.c:4185 src/addressbook.c:4191
+#: src/addressbook.c:4186 src/addressbook.c:4192
 msgid "Addressbook conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:4306
+#: src/addressbook.c:4307
 msgid "Addressbook Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:4307
+#: src/addressbook.c:4308
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:4638
+#: src/addressbook.c:4639
 msgid "Busy searching..."
 msgstr "Recherche.."
 
-#: src/addressbook.c:4968 src/prefs_send.c:220
+#: src/addressbook.c:4969 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4980
+#: src/addressbook.c:4981
 msgid "Address Books"
 msgstr "Carnets d'adresses"
 
-#: src/addressbook.c:4992
+#: src/addressbook.c:4993
 msgid "Person"
 msgstr "Contact"
 
-#: src/addressbook.c:5028 src/exporthtml.c:885 src/folderview.c:365
-#: src/folderview.c:453 src/prefs_account.c:3169 src/prefs_folder_column.c:77
+#: src/addressbook.c:5029 src/exporthtml.c:885 src/folderview.c:361
+#: src/folderview.c:449 src/prefs_account.c:3172 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:5040
+#: src/addressbook.c:5041
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5052 src/addressbook.c:5064
+#: src/addressbook.c:5053 src/addressbook.c:5065
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5076
+#: src/addressbook.c:5077
 msgid "LDAP servers"
 msgstr "Serveurs LDAP"
 
-#: src/addressbook.c:5088
+#: src/addressbook.c:5089
 msgid "LDAP Query"
 msgstr "Requête LDAP"
 
@@ -954,28 +958,28 @@ msgstr "Adresse courante"
 msgid "Personal address"
 msgstr "Adresse personnelle"
 
-#: src/addrindex.c:1830
+#: src/addrindex.c:1834
 msgid "Address(es) update"
 msgstr "Mise à jour d'adresses"
 
-#: src/addrindex.c:1831
+#: src/addrindex.c:1835
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "La mise à jour a échoué. Les modifications ne seront pas appliquées au "
 "répertoire."
 
-#: src/alertpanel.c:144 src/compose.c:9783
+#: src/alertpanel.c:144 src/compose.c:9788
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:157 src/compose.c:5848 src/compose.c:6390
-#: src/compose.c:12246 src/file_checker.c:79 src/file_checker.c:102
-#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:807
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5071
+#: src/alertpanel.c:157 src/compose.c:5853 src/compose.c:6395
+#: src/compose.c:12377 src/file_checker.c:84 src/file_checker.c:108
+#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:811
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5111
 msgid "Warning"
 msgstr "Alerte"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5785 src/inc.c:723
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5790 src/inc.c:723
 #: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
 msgid "Error"
 msgstr "Erreur"
@@ -1098,7 +1102,7 @@ msgstr ""
 "La version de Claws Mail actuellement utilisée est trop ancienne pour le "
 "module."
 
-#: src/common/session.c:202 src/imap.c:1226
+#: src/common/session.c:201 src/imap.c:1233
 msgid "SSL/TLS handshake failed\n"
 msgstr "Échec de la négociation SSL/TLS\n"
 
@@ -1118,7 +1122,7 @@ msgstr "Réponse SMTP incorrecte\n"
 msgid "error occurred on SMTP session\n"
 msgstr "Erreur pendant la session SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:906
+#: src/common/smtp.c:535 src/pop.c:907
 msgid "error occurred on authentication\n"
 msgstr "Erreur lors de l'autorisation\n"
 
@@ -1127,116 +1131,116 @@ msgstr "Erreur lors de l'autorisation\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Ce message est trop volumineux (la taille maximale étant de %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:899
+#: src/common/smtp.c:617 src/pop.c:900
 msgid "couldn't start STARTTLS session\n"
 msgstr "Impossible d'initier une session STARTTLS\n"
 
-#: src/common/socket.c:573
+#: src/common/socket.c:571
 msgid "Socket IO timeout.\n"
 msgstr "Dépassement du delai d'attente lors d'entrées/sorties socket.\n"
 
-#: src/common/socket.c:602
+#: src/common/socket.c:600
 msgid "Connection timed out.\n"
 msgstr "Dépassement du délai d'attente de la connexion.\n"
 
-#: src/common/socket.c:742
+#: src/common/socket.c:740
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d : la connexion a échoué (%s).\n"
 
-#: src/common/socket.c:982
+#: src/common/socket.c:980
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d : hôte inconnu.\n"
 
-#: src/common/socket.c:1074
+#: src/common/socket.c:1072
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s : échec de la recherche de l'hôte (%s).\n"
 
-#: src/common/socket.c:1378
+#: src/common/socket.c:1385
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "écriture sur fd%d : %s\n"
 
-#: src/common/ssl_certificate.c:339
+#: src/common/ssl_certificate.c:338
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "Impossible d'accéder au fichier de certificat P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:347
+#: src/common/ssl_certificate.c:346
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "Impossible de lire le fichier de certificat P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:356
+#: src/common/ssl_certificate.c:355
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "Impossible d'importer le fichier de certificat P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:641
+#: src/common/ssl_certificate.c:640
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: src/common/ssl_certificate.c:646
+#: src/common/ssl_certificate.c:645
 msgid "Uncheckable"
 msgstr "Non checkable"
 
-#: src/common/ssl_certificate.c:650
+#: src/common/ssl_certificate.c:649
 msgid "Self-signed certificate"
 msgstr "Certificat auto-signé"
 
-#: src/common/ssl_certificate.c:653
+#: src/common/ssl_certificate.c:652
 msgid "Revoked certificate"
 msgstr "Révoquer le certificat"
 
-#: src/common/ssl_certificate.c:655
+#: src/common/ssl_certificate.c:654
 msgid "No certificate issuer found"
 msgstr "Aucun émetteur de certificat trouvé"
 
-#: src/common/ssl_certificate.c:657
+#: src/common/ssl_certificate.c:656
 msgid "Certificate issuer is not a CA"
 msgstr "L'émetteur du certificat n'est pas une Autorité de Certification (CA)"
 
-#: src/common/ssl_certificate.c:882
+#: src/common/ssl_certificate.c:881
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "Impossible d'ouvrir le fichier de certificat %s : %s\n"
 
-#: src/common/ssl_certificate.c:886
+#: src/common/ssl_certificate.c:885
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "Le fichier de certificat %s est manquant (%s)\n"
 
-#: src/common/ssl_certificate.c:905
+#: src/common/ssl_certificate.c:904
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "Impossible d'ouvrir le fichier de clé %s (%s)\n"
 
-#: src/common/ssl_certificate.c:909
+#: src/common/ssl_certificate.c:908
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "Fichier clé %s manquant (%s)\n"
 
-#: src/common/ssl_certificate.c:1057
+#: src/common/ssl_certificate.c:1056
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "Impossible d'ouvrir le fichier de certificat P12 %s\n"
 
-#: src/common/ssl_certificate.c:1060
+#: src/common/ssl_certificate.c:1059
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "Impossible d'ouvrir le fichier de certificat P12 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1064
+#: src/common/ssl_certificate.c:1063
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "Le fichier de certificat P12 %s est manquant (%s)\n"
 
-#: src/common/ssl_certificate.c:1089 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
+#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:87
+#: src/gtk/sslcertwindow.c:94 src/gtk/sslcertwindow.c:109
+#: src/gtk/sslcertwindow.c:114 src/gtk/sslcertwindow.c:121
+#: src/gtk/sslcertwindow.c:136
 msgid "<not in certificate>"
 msgstr "<non spécifié dans le certificat>"
 
@@ -1244,232 +1248,232 @@ msgstr "<non spécifié dans le certificat>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Sujet supprimé par RegExp)"
 
-#: src/common/utils.c:198
+#: src/common/utils.c:200
 #, c-format
 msgid "%dB"
 msgstr "%do"
 
-#: src/common/utils.c:199
+#: src/common/utils.c:201
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dko"
 
-#: src/common/utils.c:200
+#: src/common/utils.c:202
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMo"
 
-#: src/common/utils.c:201
+#: src/common/utils.c:203
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGo"
 
-#: src/common/utils.c:4009
+#: src/common/utils.c:4028
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: src/common/utils.c:4010
+#: src/common/utils.c:4029
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lundi"
 
-#: src/common/utils.c:4011
+#: src/common/utils.c:4030
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: src/common/utils.c:4012
+#: src/common/utils.c:4031
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: src/common/utils.c:4013
+#: src/common/utils.c:4032
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: src/common/utils.c:4014
+#: src/common/utils.c:4033
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Vendredi"
 
-#: src/common/utils.c:4015
+#: src/common/utils.c:4034
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Samedi"
 
-#: src/common/utils.c:4017
+#: src/common/utils.c:4036
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Janvier"
 
-#: src/common/utils.c:4018
+#: src/common/utils.c:4037
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Février"
 
-#: src/common/utils.c:4019
+#: src/common/utils.c:4038
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Mars"
 
-#: src/common/utils.c:4020
+#: src/common/utils.c:4039
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Avril"
 
-#: src/common/utils.c:4021
+#: src/common/utils.c:4040
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4022
+#: src/common/utils.c:4041
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juin"
 
-#: src/common/utils.c:4023
+#: src/common/utils.c:4042
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juillet"
 
-#: src/common/utils.c:4024
+#: src/common/utils.c:4043
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Août"
 
-#: src/common/utils.c:4025
+#: src/common/utils.c:4044
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septembre"
 
-#: src/common/utils.c:4026
+#: src/common/utils.c:4045
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octobre"
 
-#: src/common/utils.c:4027
+#: src/common/utils.c:4046
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembre"
 
-#: src/common/utils.c:4028
+#: src/common/utils.c:4047
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Décembre"
 
-#: src/common/utils.c:4030
+#: src/common/utils.c:4049
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dim"
 
-#: src/common/utils.c:4031
+#: src/common/utils.c:4050
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4032
+#: src/common/utils.c:4051
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4033
+#: src/common/utils.c:4052
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mer"
 
-#: src/common/utils.c:4034
+#: src/common/utils.c:4053
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jeu"
 
-#: src/common/utils.c:4035
+#: src/common/utils.c:4054
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Ven"
 
-#: src/common/utils.c:4036
+#: src/common/utils.c:4055
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sam"
 
-#: src/common/utils.c:4038
+#: src/common/utils.c:4057
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4039
+#: src/common/utils.c:4058
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Fév"
 
-#: src/common/utils.c:4040
+#: src/common/utils.c:4059
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4041
+#: src/common/utils.c:4060
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Avr"
 
-#: src/common/utils.c:4042
+#: src/common/utils.c:4061
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4043
+#: src/common/utils.c:4062
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4044
+#: src/common/utils.c:4063
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jui"
 
-#: src/common/utils.c:4045
+#: src/common/utils.c:4064
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aoû"
 
-#: src/common/utils.c:4046
+#: src/common/utils.c:4065
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4047
+#: src/common/utils.c:4066
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4048
+#: src/common/utils.c:4067
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4049
+#: src/common/utils.c:4068
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Déc"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4079
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4080
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4081
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4082
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
@@ -1483,11 +1487,11 @@ msgstr "_Ajouter.."
 msgid "_Remove"
 msgstr "Enleve_r"
 
-#: src/compose.c:599 src/folderview.c:258
+#: src/compose.c:599 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Propriétés.."
 
-#: src/compose.c:606 src/mainwindow.c:517 src/messageview.c:214
+#: src/compose.c:606 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "_Message"
 
@@ -1555,7 +1559,7 @@ msgstr "Texte _justifié"
 msgid "_Unwrapped"
 msgstr "Texte _non justifié"
 
-#: src/compose.c:644 src/mainwindow.c:550
+#: src/compose.c:644 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Sélectionner tout"
@@ -1665,47 +1669,47 @@ msgstr "S_ystème de confidentialité"
 msgid "_Priority"
 msgstr "_Priorité"
 
-#: src/compose.c:690 src/mainwindow.c:612 src/messageview.c:267
+#: src/compose.c:690 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "_Jeux de caractères"
 
-#: src/compose.c:695 src/mainwindow.c:617 src/messageview.c:272
+#: src/compose.c:695 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "Europe de l'Ouest"
 
-#: src/compose.c:696 src/mainwindow.c:618 src/messageview.c:273
+#: src/compose.c:696 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Baltique"
 
-#: src/compose.c:697 src/mainwindow.c:619 src/messageview.c:274
+#: src/compose.c:697 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:275
+#: src/compose.c:698 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Arabe"
 
-#: src/compose.c:699 src/mainwindow.c:621 src/messageview.c:276
+#: src/compose.c:699 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
-#: src/compose.c:700 src/mainwindow.c:622 src/messageview.c:277
+#: src/compose.c:700 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japonais"
 
-#: src/compose.c:701 src/mainwindow.c:623 src/messageview.c:278
+#: src/compose.c:701 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Chinois"
 
-#: src/compose.c:702 src/mainwindow.c:624 src/messageview.c:279
+#: src/compose.c:702 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Coréen"
 
-#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:280
+#: src/compose.c:703 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Thaïlandais"
 
-#: src/compose.c:706 src/mainwindow.c:735 src/messageview.c:316
+#: src/compose.c:706 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Carnet d'adresses"
 
@@ -1713,7 +1717,7 @@ msgstr "_Carnet d'adresses"
 msgid "_Template"
 msgstr "_Modèles"
 
-#: src/compose.c:710 src/mainwindow.c:763 src/messageview.c:336
+#: src/compose.c:710 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "_Actions"
 
@@ -1749,13 +1753,13 @@ msgstr "Afficher la _règle"
 msgid "_Normal"
 msgstr "_Normale"
 
-#: src/compose.c:731 src/mainwindow.c:666 src/messageview.c:305
-#: src/summaryview.c:430
+#: src/compose.c:731 src/mainwindow.c:674 src/messageview.c:305
+#: src/summaryview.c:431
 msgid "_All"
 msgstr "À _tous"
 
-#: src/compose.c:732 src/mainwindow.c:667 src/messageview.c:306
-#: src/summaryview.c:431
+#: src/compose.c:732 src/mainwindow.c:675 src/messageview.c:306
+#: src/summaryview.c:432
 msgid "_Sender"
 msgstr "À l'_expéditeur·rice"
 
@@ -1779,27 +1783,27 @@ msgstr "Ba_sse"
 msgid "_Lowest"
 msgstr "La plus _basse"
 
-#: src/compose.c:747 src/mainwindow.c:879 src/messageview.c:353
+#: src/compose.c:747 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Détection automatique"
 
-#: src/compose.c:748 src/mainwindow.c:880 src/messageview.c:354
+#: src/compose.c:748 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASC_II 7 bits (US-ASCII)"
 
-#: src/compose.c:749 src/mainwindow.c:881 src/messageview.c:355
+#: src/compose.c:749 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "_Unicode (UTF-8)"
 
-#: src/compose.c:753 src/mainwindow.c:885 src/messageview.c:359
+#: src/compose.c:753 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europe Centrale (ISO-8859-_2)"
 
-#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:362
+#: src/compose.c:756 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grec (ISO-8859-_7)"
 
-#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:367
+#: src/compose.c:761 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turc (ISO-8859-_9)"
 
@@ -1877,7 +1881,7 @@ msgstr "Cci:"
 msgid "Reply-To:"
 msgstr "Répondre-à:"
 
-#: src/compose.c:2642 src/compose.c:5006 src/compose.c:5008
+#: src/compose.c:2642 src/compose.c:5011 src/compose.c:5013
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Groupe-de-discussion:"
@@ -1890,7 +1894,7 @@ msgstr "Donnant-suite-à:"
 msgid "In-Reply-To:"
 msgstr "En-réponse-à:"
 
-#: src/compose.c:2652 src/compose.c:5003 src/compose.c:5011
+#: src/compose.c:2652 src/compose.c:5008 src/compose.c:5016
 #: src/gtk/headers.h:13 src/summary_search.c:421
 msgid "To:"
 msgstr "À:"
@@ -1901,7 +1905,7 @@ msgstr ""
 "Impossible d'adjoindre le fichier au message (échec de conversion de jeu de "
 "caractères)."
 
-#: src/compose.c:2848
+#: src/compose.c:2848 src/compose.c:10974
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1938,7 +1942,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr·e ?"
 
-#: src/compose.c:3679 src/compose.c:10832 src/compose.c:11726
+#: src/compose.c:3679 src/compose.c:10837 src/compose.c:11857
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -1965,26 +1969,26 @@ msgstr "Impossible de lire %s."
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:4847 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4852 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [modifié]"
 
-#: src/compose.c:4854 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4859 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 
-#: src/compose.c:4857 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4862 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[Pas de sujet] - Composition d'un message%s"
 
-#: src/compose.c:4859 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4864 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Composition d'un message"
 
-#: src/compose.c:4886 src/messageview.c:887
+#: src/compose.c:4891 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1992,61 +1996,61 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez en sélectionner un avant d'envoyer du courrier."
 
-#: src/compose.c:5103 src/compose.c:5140
+#: src/compose.c:5108 src/compose.c:5145
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 "Le/la seul·e destinataire est l'adresse « %s » par défaut. Voulez-vous quand "
 "même envoyer le message ?"
 
-#: src/compose.c:5105 src/compose.c:5142 src/compose.c:5180 src/compose.c:5223
-#: src/prefs_account.c:3778 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5110 src/compose.c:5147 src/compose.c:5185 src/compose.c:5228
+#: src/prefs_account.c:3781 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:5107 src/compose.c:5144 src/compose.c:5181 src/compose.c:5224
-#: src/compose.c:5786 src/folderview.c:2579 src/messageview.c:859
+#: src/compose.c:5112 src/compose.c:5149 src/compose.c:5186 src/compose.c:5229
+#: src/compose.c:5791 src/folderview.c:2546 src/messageview.c:859
 #: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/compose.c:5161
+#: src/compose.c:5166
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:5176
+#: src/compose.c:5181
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Le sujet est vide. %s"
 
-#: src/compose.c:5177 src/compose.c:5220
+#: src/compose.c:5182 src/compose.c:5225
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Voulez-vous quand même l'envoyer ?"
 
-#: src/compose.c:5178 src/compose.c:5221
+#: src/compose.c:5183 src/compose.c:5226
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Voulez-vous quand même le mettre en file d'attente d'envoi ?"
 
-#: src/compose.c:5180 src/compose.c:5223 src/toolbar.c:520
+#: src/compose.c:5185 src/compose.c:5228 src/toolbar.c:520
 msgid "Send later"
 msgstr "Plus tard"
 
-#: src/compose.c:5181 src/compose.c:5224
+#: src/compose.c:5186 src/compose.c:5229
 msgid "_Queue"
 msgstr "_Mettre en file d'attente"
 
-#: src/compose.c:5219
+#: src/compose.c:5224
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Le message sera envoyé à %d destinataires. %s"
 
-#: src/compose.c:5248
+#: src/compose.c:5253
 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:5251
+#: src/compose.c:5256
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2057,7 +2061,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5255
+#: src/compose.c:5260
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2068,7 +2072,7 @@ msgstr ""
 "\n"
 "Sa signature a échoué : %s"
 
-#: src/compose.c:5260
+#: src/compose.c:5265
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2079,7 +2083,7 @@ msgstr ""
 "\n"
 "Le chiffrement a échoué : %s"
 
-#: src/compose.c:5265
+#: src/compose.c:5270
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2089,7 +2093,7 @@ msgstr ""
 "\n"
 "La conversion de jeu de caractères a échoué."
 
-#: src/compose.c:5269
+#: src/compose.c:5274
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2099,7 +2103,7 @@ msgstr ""
 "\n"
 "La clé de chiffrement du destinataire n'est pas disponible."
 
-#: src/compose.c:5329 src/compose.c:5389
+#: src/compose.c:5334 src/compose.c:5394
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2107,7 +2111,7 @@ msgstr ""
 "Le message a été mis dans la file d'attente mais n'a pas pu être envoyé.\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
-#: src/compose.c:5385
+#: src/compose.c:5390
 #, c-format
 msgid ""
 "%s\n"
@@ -2116,7 +2120,7 @@ msgstr ""
 "%s\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
-#: src/compose.c:5782
+#: src/compose.c:5787
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2127,7 +2131,7 @@ msgstr ""
 "message vers le jeu de caractères spécifié (%s).\n"
 "Voulez-vous l'envoyer en %s ?"
 
-#: src/compose.c:5844
+#: src/compose.c:5849
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2141,69 +2145,69 @@ msgstr ""
 "\n"
 "Voulez-vous quand même l'envoyer ?"
 
-#: src/compose.c:6076
+#: src/compose.c:6081
 msgid "Encryption warning"
 msgstr "Avertissement concernant le chiffrement"
 
-#: src/compose.c:6077
+#: src/compose.c:6082
 msgid "C_ontinue"
 msgstr "_Poursuivre"
 
-#: src/compose.c:6126
+#: src/compose.c:6131
 msgid "No account for sending mails available!"
 msgstr "Il n'existe pas de compte pour l'envoi de messages."
 
-#: src/compose.c:6135
+#: src/compose.c:6140
 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:6389
+#: src/compose.c:6394
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "La pièce jointe %s n'existe plus. Ignorer ?"
 
-#: src/compose.c:6391 src/mainwindow.c:657 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6396 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Interrompre l'envoi"
 
-#: src/compose.c:6391
+#: src/compose.c:6396
 msgid "Ignore attachment"
 msgstr "Ignorer cette pièce jointe"
 
-#: src/compose.c:6447
+#: src/compose.c:6452
 #, c-format
 msgid "Original %s part"
 msgstr "Partie %s originale"
 
-#: src/compose.c:7047
+#: src/compose.c:7052
 msgid "Add to address _book"
 msgstr "Ajouter au carnet d'_adresses"
 
-#: src/compose.c:7214
+#: src/compose.c:7219
 msgid "Delete entry contents"
 msgstr "Effacer la zone de saisie"
 
-#: src/compose.c:7218 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7223 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Taper <tab> pour utiliser à la complétion depuis le carnet d'adresse"
 
-#: src/compose.c:7450
+#: src/compose.c:7455
 msgid "Mime type"
 msgstr "Type Mime"
 
-#: src/compose.c:7456 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:451
+#: src/compose.c:7461 src/mimeview.c:302 src/plugins/pgpcore/select-keys.c:451
 #: src/prefs_matcher.c:640 src/prefs_summaries.c:612
-#: src/prefs_summary_column.c:84 src/summaryview.c:469
+#: src/prefs_summary_column.c:84 src/summaryview.c:470
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:7518
+#: src/compose.c:7523
 msgid "Save Message to "
 msgstr "Enregistrer le message dans "
 
-#: src/compose.c:7549 src/editjpilot.c:276 src/editldap.c:517
-#: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
+#: src/compose.c:7554 src/editjpilot.c:276 src/editldap.c:517
+#: src/editvcard.c:192 src/export.c:165 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
@@ -2213,27 +2217,27 @@ msgstr "Enregistrer le message dans "
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: src/compose.c:7565
+#: src/compose.c:7570
 msgid "Select folder to save message to"
 msgstr "Sélection du dossier où enregistrer le message"
 
-#: src/compose.c:8022
+#: src/compose.c:8027
 msgid "Hea_der"
 msgstr "E_n-tête"
 
-#: src/compose.c:8027
+#: src/compose.c:8032
 msgid "_Attachments"
 msgstr "Pièces _jointes"
 
-#: src/compose.c:8041
+#: src/compose.c:8046
 msgid "Othe_rs"
 msgstr "A_utres"
 
-#: src/compose.c:8056
+#: src/compose.c:8061
 msgid "S_ubject:"
 msgstr "S_ujet :"
 
-#: src/compose.c:8280
+#: src/compose.c:8285
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2242,19 +2246,19 @@ msgstr ""
 "Le correcteur orthographique n'a pu être lancé.\n"
 "%s"
 
-#: src/compose.c:8427
+#: src/compose.c:8432
 msgid "_From:"
 msgstr "_De :"
 
-#: src/compose.c:8444
+#: src/compose.c:8449
 msgid "Account to use for this email"
 msgstr "Compte à utiliser pour l'envoi de ce message"
 
-#: src/compose.c:8446
+#: src/compose.c:8451
 msgid "Sender address to be used"
 msgstr "Adresse email à utiliser en tant qu'expéditeur·rice"
 
-#: src/compose.c:8628
+#: src/compose.c:8633
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2263,50 +2267,50 @@ msgstr ""
 "Le système de confidentialité '%s' ne peut être chargé. Il sera impossible "
 "de signer ou chiffrer ce message."
 
-#: src/compose.c:8739 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8744 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "_Aucun"
 
-#: src/compose.c:8840 src/prefs_template.c:751
+#: src/compose.c:8845 src/prefs_template.c:751
 #, 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:8937
+#: src/compose.c:8942
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Erreur de formatage dans l'en-tête « %s » du modèle."
 
-#: src/compose.c:9361
+#: src/compose.c:9366
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:9376
+#: src/compose.c:9381
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:9450
+#: src/compose.c:9455
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:9467
+#: src/compose.c:9472
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:9500
+#: src/compose.c:9505
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:9520
+#: src/compose.c:9525
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:9521
+#: src/compose.c:9526
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:9780
+#: src/compose.c:9785
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2317,19 +2321,19 @@ msgstr ""
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
-#: src/compose.c:10253 src/messageview.c:1088
+#: src/compose.c:10258 src/messageview.c:1088
 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:10446
+#: src/compose.c:10451
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
-#: src/compose.c:10450
+#: src/compose.c:10455
 msgid "Could not save draft"
 msgstr "Impossible d'enregistrer le brouillon"
 
-#: src/compose.c:10451
+#: src/compose.c:10456
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2338,24 +2342,24 @@ msgstr ""
 "Voulez-vous annuler la fermeture de l'application ou simplement interrompre "
 "l'édition de ce message ?"
 
-#: src/compose.c:10453
+#: src/compose.c:10458
 msgid "_Cancel exit"
 msgstr "A_nnuler"
 
-#: src/compose.c:10453
+#: src/compose.c:10458
 msgid "_Discard email"
 msgstr "_Interrompre"
 
-#: src/compose.c:10642 src/compose.c:10656
+#: src/compose.c:10647 src/compose.c:10661
 msgid "Select file"
 msgstr "Sélectionner un fichier"
 
-#: src/compose.c:10670
+#: src/compose.c:10675
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Échec lors de la lecture de « %s »."
 
-#: src/compose.c:10672
+#: src/compose.c:10677
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2364,54 +2368,63 @@ msgstr ""
 "Le fichier « %s » contient des caractères n'appartenant pas\n"
 "à l'encodage courant : l'insertion peut être incorrecte."
 
-#: src/compose.c:10751
+#: src/compose.c:10756
 msgid "Discard message"
 msgstr "Interrompre la composition du message"
 
-#: src/compose.c:10752
+#: src/compose.c:10757
 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:10753 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Interrompre"
 
-#: src/compose.c:10753 src/compose.c:10758
+#: src/compose.c:10758 src/compose.c:10763
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10756 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10761 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: src/compose.c:10757
+#: src/compose.c:10762
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 "Ce message a été modifié. Voulez-vous enregistrer les dernières "
 "modifications ?"
 
-#: src/compose.c:10758
+#: src/compose.c:10763
 msgid "_Don't save"
 msgstr "_Ne pas enregistrer"
 
-#: src/compose.c:10829
+#: src/compose.c:10834
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voulez-vous utiliser le modèle « %s » ?"
 
-#: src/compose.c:10831
+#: src/compose.c:10836
 msgid "Apply template"
 msgstr "Utiliser le modèle"
 
-#: src/compose.c:10832 src/prefs_actions.c:330 src/prefs_filtering_action.c:582
+#: src/compose.c:10837 src/prefs_actions.c:330 src/prefs_filtering_action.c:582
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:794 src/prefs_template.c:310
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:11719
+#: src/compose.c:11024
+#, c-format
+msgid ""
+"The pasted image has been attached as: \n"
+"%s"
+msgstr ""
+"L'image collée a été jointe au message :\n"
+"%s"
+
+#: src/compose.c:11850
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2426,20 +2439,20 @@ msgstr[1] ""
 "Voulez-vous insérer le contenu des %d fichiers directement dans le corps du "
 "message ou les adjoindre en tant que pièces jointes ?"
 
-#: src/compose.c:11725
+#: src/compose.c:11856
 msgid "Insert or attach?"
 msgstr "Insérer ou adjoindre ?"
 
-#: src/compose.c:11726
+#: src/compose.c:11857
 msgid "_Attach"
 msgstr "_Adjoindre"
 
-#: src/compose.c:11944
+#: src/compose.c:12075
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erreur de formatage de la citation à la ligne %d."
 
-#: src/compose.c:12240
+#: src/compose.c:12371
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2657,7 +2670,7 @@ msgid " Check File "
 msgstr " Vérifier 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:2178
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2181
 #: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Fichier"
@@ -2699,20 +2712,20 @@ msgstr "Édition du groupe"
 msgid "Add New Group"
 msgstr "Ajout d'un nouveau groupe"
 
-#: src/editgroup.c:553
+#: src/editgroup.c:552
 msgid "Edit folder"
 msgstr "Édition du dossier"
 
-#: src/editgroup.c:553
+#: src/editgroup.c:552
 msgid "Input the new name of folder:"
 msgstr "Saisir le nouveau nom du dossier :"
 
-#: src/editgroup.c:556 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/editgroup.c:555 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
 #: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:557 src/foldersel.c:571 src/mh_gtk.c:145
+#: src/editgroup.c:556 src/foldersel.c:571 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "Input the name of new folder:"
 msgstr "Saisir le nom du nouveau dossier :"
@@ -2741,13 +2754,13 @@ msgstr "Ajouter une donnée JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "LDAP - Sélection de bases de recherches"
 
-#: src/editldap_basedn.c:172 src/editldap.c:440 src/prefs_account.c:2930
+#: src/editldap_basedn.c:172 src/editldap.c:440 src/prefs_account.c:2933
 #: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "Hôte"
 
 #: src/editldap_basedn.c:182 src/editldap.c:457
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2937
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2940
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2808,7 +2821,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:469 src/prefs_account.c:3851
+#: src/editldap.c:469 src/prefs_account.c:3854
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2972,8 +2985,8 @@ msgstr "Mot de passe de connexion"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Le mot de passe de l'utilisateur·rice « Bind DN »."
 
-#: src/editldap.c:738 src/prefs_account.c:1402 src/prefs_account.c:2023
-#: src/prefs_account.c:2742 src/prefs_account.c:2770 src/prefs_account.c:2975
+#: src/editldap.c:738 src/prefs_account.c:1405 src/prefs_account.c:2026
+#: src/prefs_account.c:2745 src/prefs_account.c:2773 src/prefs_account.c:2978
 #: src/prefs_proxy.c:146
 msgid "Show password"
 msgstr "Afficher le mot de passe"
@@ -2995,7 +3008,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:792 src/prefs_account.c:3742
+#: src/editldap.c:792 src/prefs_account.c:3745
 msgid "Basic"
 msgstr "Général"
 
@@ -3036,16 +3049,16 @@ msgstr "Vous avez saisi un nom de tag réservé, veuillez en saisir un autre."
 msgid "Tag is not set."
 msgstr "Le nom du label n'est pas défini."
 
-#: src/edittags.c:537
+#: src/edittags.c:550
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Appliquer des labels"
 
-#: src/edittags.c:551
+#: src/edittags.c:566
 msgid "New tag:"
 msgstr "Nouveau label :"
 
-#: src/edittags.c:584
+#: src/edittags.c:599
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr ""
 "Veuillez choisir le(s) tag(s) à appliquer/enlever aux messages actuellement\n"
@@ -3071,11 +3084,11 @@ msgstr "Ajouter une entrée vCard"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Impossible de définir le certificat client.\n"
 
-#: src/etpan/nntp-thread.c:939
+#: src/etpan/nntp-thread.c:949
 msgid "couldn't get xover range\n"
 msgstr "impossible d'obtenir le xover range\n"
 
-#: src/etpan/nntp-thread.c:1038
+#: src/etpan/nntp-thread.c:1048
 msgid "couldn't get xhdr range\n"
 msgstr "impossible d'obtenir le xhdr range\n"
 
@@ -3129,7 +3142,7 @@ msgstr "Sélection du fichier HTML destinataire"
 msgid "HTML Output File"
 msgstr "Fichier HTML destinataire"
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
+#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:172 src/import.c:170
 #: src/importldif.c:568
 msgid "B_rowse"
 msgstr "Pa_rcourir"
@@ -3139,16 +3152,16 @@ msgid "Stylesheet"
 msgstr "Feuille de style"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
-#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:123 src/mainwindow.c:1170
+#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:123 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1037
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6244
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1040
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6289
 msgid "None"
 msgstr "Aucun"
 
 #: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
 #: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
-#: src/prefs_other.c:127 src/prefs_other.c:415
+#: src/prefs_other.c:128 src/prefs_other.c:416
 msgid "Default"
 msgstr "Par défaut"
 
@@ -3383,7 +3396,7 @@ msgstr "Exporter le carnet d'adresses vers un ficher LDIF"
 msgid "Distinguished Name"
 msgstr "Nom absolu (DN)"
 
-#: src/export.c:113 src/summaryview.c:8459
+#: src/export.c:113 src/summaryview.c:8504
 msgid "Export to mbox file"
 msgstr "Exporter la sélection au format mbox"
 
@@ -3399,23 +3412,23 @@ msgstr "Dossier source :"
 msgid "Mbox file:"
 msgstr "Fichier mbox :"
 
-#: src/export.c:203
+#: src/export.c:204
 msgid "Target mbox filename can't be left empty."
 msgstr "Le nom du fichier mbox cible n'est pas spécifié."
 
-#: src/export.c:208
+#: src/export.c:209
 msgid "Source folder can't be left empty."
 msgstr "Le dossier source n'est pas spécifié."
 
-#: src/export.c:221
+#: src/export.c:222
 msgid "Couldn't find the source folder."
 msgstr "Impossible de trouver le dossier source."
 
-#: src/export.c:245
+#: src/export.c:246
 msgid "Select exporting file"
 msgstr "Sélection du fichier exporté"
 
-#: src/export.c:268
+#: src/export.c:269
 msgid "Select folder to export"
 msgstr "Sélection du dossier pour l'export"
 
@@ -3448,19 +3461,19 @@ msgstr "Le nom est trop long."
 msgid "Not specified."
 msgstr "Non spécifié."
 
-#: src/file_checker.c:77
+#: src/file_checker.c:82
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr ""
 "Le fichier %s est manquant ! Voulez-vous utiliser le fichier de sauvegarde "
 "du %s ?"
 
-#: src/file_checker.c:86 src/file_checker.c:109
+#: src/file_checker.c:91 src/file_checker.c:115
 #, c-format
 msgid "Could not copy %s to %s"
 msgstr "Impossible de copier %s vers %s"
 
-#: src/file_checker.c:100
+#: src/file_checker.c:106
 #, c-format
 msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3669,35 +3682,35 @@ msgstr "Brouillons"
 msgid "Processing (%s)...\n"
 msgstr "Traitement (%s)..\n"
 
-#: src/folder.c:3287
+#: src/folder.c:3289
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copie de %s vers %s..\n"
 
-#: src/folder.c:3287
+#: src/folder.c:3289
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Déplacement de %s vers %s..\n"
 
-#: src/folder.c:3597
+#: src/folder.c:3599
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Mise à jour du cache pour %s.."
 
-#: src/folder.c:4459
+#: src/folder.c:4461
 msgid "Processing messages..."
 msgstr "Traitement des messages.."
 
-#: src/folder.c:4594
+#: src/folder.c:4596
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniser %s pour une utilisation hors-ligne..\n"
 
-#: src/folder.c:4853
+#: src/folder.c:4855
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Un nom de dossier ne peut commencer ou finir par un point."
 
-#: src/folder.c:4857
+#: src/folder.c:4859
 msgid "A folder name can not end with a space."
 msgstr "Un nom de dossier ne peut pas finir par un espace."
 
@@ -3714,7 +3727,7 @@ msgstr "NouveauDossier"
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
 #: src/plugins/rssyl/rssyl_cb_menu.c:202
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2068
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
@@ -3722,7 +3735,7 @@ msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
 #: src/foldersel.c:595 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
-#: src/plugins/vcalendar/vcal_folder.c:2072
+#: src/plugins/vcalendar/vcal_folder.c:2075
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Le dossier '%s' existe déjà."
@@ -3734,78 +3747,78 @@ 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:251
+#: src/folderview.c:247
 msgid "Mark all re_ad"
 msgstr "Marquer tous comme _lus"
 
-#: src/folderview.c:252
+#: src/folderview.c:248
 msgid "Mark all u_nread"
 msgstr "Marquer tou_s comme non lus"
 
-#: src/folderview.c:253
+#: src/folderview.c:249
 msgid "Mark all read recursi_vely"
 msgstr "Marquer tous comme lus récursivement"
 
-#: src/folderview.c:254
+#: src/folderview.c:250
 msgid "Mark all unread recursi_vely"
 msgstr "Marquer tous comme non lus récursi_vement"
 
-#: src/folderview.c:256
+#: src/folderview.c:252
 msgid "R_un processing rules"
 msgstr "Exéc_uter les règles de traitement"
 
-#: src/folderview.c:257 src/mainwindow.c:554
+#: src/folderview.c:253 src/mainwindow.c:562
 msgid "_Search folder..."
 msgstr "Chercher dans le _dossier.."
 
-#: src/folderview.c:259
+#: src/folderview.c:255
 msgid "Process_ing..."
 msgstr "_Traitement.."
 
-#: src/folderview.c:260
+#: src/folderview.c:256
 msgid "Empty _trash..."
 msgstr "_Vider la corbeille.."
 
-#: src/folderview.c:261
+#: src/folderview.c:257
 msgid "Send _queue..."
 msgstr "_Envoyer les messages.."
 
-#: src/folderview.c:268
+#: src/folderview.c:264
 msgid "Set Displayed columns"
 msgstr "Sélect_ion des colonnes affichées"
 
-#: src/folderview.c:407 src/folderview.c:454
+#: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6518
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6563
 msgid "New"
 msgstr "Nouveau"
 
-#: src/folderview.c:408 src/folderview.c:455
+#: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6520
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6565
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:409 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:405 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:457 src/summaryview.c:470
+#: src/folderview.c:453 src/summaryview.c:471
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:808
+#: src/folderview.c:783
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers.."
 
-#: src/folderview.c:893 src/summaryview.c:4282
+#: src/folderview.c:868 src/summaryview.c:4308
 msgid "Mark all as read"
 msgstr "Marquer tous comme lus"
 
-#: src/folderview.c:894
+#: src/folderview.c:869
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3813,16 +3826,16 @@ msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
 "dossiers comme lus ?"
 
-#: src/folderview.c:896 src/summaryview.c:4283
+#: src/folderview.c:871 src/summaryview.c:4309
 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:899 src/summaryview.c:4328
+#: src/folderview.c:874 src/summaryview.c:4354
 msgid "Mark all as unread"
 msgstr "Marquer tous comme non l_us"
 
-#: src/folderview.c:900
+#: src/folderview.c:875
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
@@ -3830,98 +3843,98 @@ msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
 "dossiers comme non lus ?"
 
-#: src/folderview.c:902 src/summaryview.c:4329
+#: src/folderview.c:877 src/summaryview.c:4355
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier comme non lus ?"
 
-#: src/folderview.c:1092 src/imap.c:4628
+#: src/folderview.c:1067 src/imap.c:4637
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Analyse du dossier %s/%s.."
 
-#: src/folderview.c:1095 src/imap.c:4632 src/mainwindow.c:5247 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4641 src/mainwindow.c:5290 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Analyse du dossier %s.."
 
-#: src/folderview.c:1126
+#: src/folderview.c:1101
 msgid "Rebuild folder tree"
 msgstr "Reconstruction de l'arborescence"
 
-#: src/folderview.c:1127
+#: src/folderview.c:1102
 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:1137
+#: src/folderview.c:1112
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence.."
 
-#: src/folderview.c:1139
+#: src/folderview.c:1114
 msgid "Scanning folder tree..."
 msgstr "Analyse de l'arborescence.."
 
-#: src/folderview.c:1230
+#: src/folderview.c:1205
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Impossible d'ouvrir le dossier '%s'\n"
 
-#: src/folderview.c:1284
+#: src/folderview.c:1259
 msgid "Checking for new messages in all folders..."
 msgstr "Examiner tous les dossiers pour nouveaux messages.."
 
-#: src/folderview.c:2264
+#: src/folderview.c:2233
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fermeture du dossier %s.."
 
-#: src/folderview.c:2359
+#: src/folderview.c:2328
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Ouverture du dossier %s.."
 
-#: src/folderview.c:2377
+#: src/folderview.c:2346
 msgid "Folder could not be opened."
 msgstr "Le dossier n'a pu être ouvert."
 
-#: src/folderview.c:2519 src/mainwindow.c:2882 src/mainwindow.c:2887
+#: src/folderview.c:2486 src/mainwindow.c:2896 src/mainwindow.c:2901
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2520
+#: src/folderview.c:2487
 msgid "Delete all messages in trash?"
 msgstr "Voulez-vous vraiment supprimer tous les messages de la corbeille ?"
 
-#: src/folderview.c:2521
+#: src/folderview.c:2488
 msgid "_Empty trash"
 msgstr "_Vider"
 
-#: src/folderview.c:2565 src/inc.c:1663 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1662 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Mode hors-ligne"
 
-#: src/folderview.c:2566 src/toolbar.c:3033
+#: src/folderview.c:2533 src/toolbar.c:3033
 msgid "You're working offline. Override?"
 msgstr ""
 "Attention, vous êtes en mode hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 
-#: src/folderview.c:2577 src/toolbar.c:3052
+#: src/folderview.c:2544 src/toolbar.c:3052
 msgid "Send queued messages"
 msgstr "Envoyer les messages en file d'attente"
 
-#: src/folderview.c:2578 src/toolbar.c:3053
+#: src/folderview.c:2545 src/toolbar.c:3053
 msgid "Send all queued messages?"
 msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
 
-#: src/folderview.c:2587 src/toolbar.c:3072
+#: src/folderview.c:2554 src/toolbar.c:3072
 msgid "Some errors occurred while sending queued messages."
 msgstr "Une erreur est survenue pendant l'envoi de messages en attente."
 
-#: src/folderview.c:2590 src/main.c:2786 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2811 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3930,67 +3943,67 @@ msgstr ""
 "Une erreur est survenue pendant l'envoi de messages en attente :\n"
 "%s"
 
-#: src/folderview.c:2665
+#: src/folderview.c:2632
 #, 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:2666
+#: src/folderview.c:2633
 #, 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:2668
+#: src/folderview.c:2635
 msgid "Copy folder"
 msgstr "Copie du dossier"
 
-#: src/folderview.c:2668
+#: src/folderview.c:2635
 msgid "Move folder"
 msgstr "Déplacement du dossier"
 
-#: src/folderview.c:2679
+#: src/folderview.c:2646
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copie de %s vers %s.."
 
-#: src/folderview.c:2679
+#: src/folderview.c:2646
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Déplacement de %s vers %s.."
 
-#: src/folderview.c:2713
+#: src/folderview.c:2680
 msgid "Source and destination are the same."
 msgstr "Source et destination identiques."
 
-#: src/folderview.c:2716
+#: src/folderview.c:2683
 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:2717
+#: src/folderview.c:2684
 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:2720
+#: src/folderview.c:2687
 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:2723
+#: src/folderview.c:2690
 msgid "Copy failed!"
 msgstr "La copie a échoué."
 
-#: src/folderview.c:2723
+#: src/folderview.c:2690
 msgid "Move failed!"
 msgstr "Le déplacement a échoué."
 
-#: src/folderview.c:2773
+#: src/folderview.c:2740
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Options de filtrage/traitement du dossier %s"
 
-#: src/folderview.c:3212 src/summaryview.c:4737 src/summaryview.c:4843
+#: src/folderview.c:3175 src/summaryview.c:4763 src/summaryview.c:4869
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 "Le dossier de destination ne peut être utilisé seulement pour stocker des "
@@ -4042,7 +4055,7 @@ msgstr "inconnu"
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
-#: src/grouplistdialog.c:458 src/gtk/gtkutils.c:1857 src/summaryview.c:1669
+#: src/grouplistdialog.c:458 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
 msgid "Done."
 msgstr "Terminé."
 
@@ -4081,11 +4094,11 @@ msgstr ""
 
 #: src/gtk/about.c:163 src/gtk/about.c:851
 msgid ""
-"Copyright (C) 1999-2018\n"
+"Copyright (C) 1999-2019\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2018\n"
+"Copyright (C) 1999-2019\n"
 "L'équipe Claws Mail\n"
 "et Hiroyuki Yamamoto"
 
@@ -4241,44 +4254,44 @@ msgstr ""
 "Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU "
 "avec ce programme. Si ça n'était pas le cas, veuillez consulter "
 
-#: src/gtk/about.c:718 src/main.c:2610
+#: src/gtk/about.c:718 src/main.c:2635
 msgid "Session statistics\n"
 msgstr "Statistiques de la session\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2620 src/main.c:2623
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2645 src/main.c:2648
 #, c-format
 msgid "Started: %s\n"
 msgstr "Démarrée le : %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2629
+#: src/gtk/about.c:738 src/main.c:2654
 msgid "Incoming traffic\n"
 msgstr "Trafic entrant\n"
 
-#: src/gtk/about.c:741 src/main.c:2632
+#: src/gtk/about.c:741 src/main.c:2657
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Messages reçus : %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2638
+#: src/gtk/about.c:748 src/main.c:2663
 msgid "Outgoing traffic\n"
 msgstr "Trafic sortant\n"
 
-#: src/gtk/about.c:751 src/main.c:2641
+#: src/gtk/about.c:751 src/main.c:2666
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nouveaux messages et redirections : %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2645
+#: src/gtk/about.c:756 src/main.c:2670
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Réponses : %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2649
+#: src/gtk/about.c:761 src/main.c:2674
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Messages transférés : %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2653
+#: src/gtk/about.c:766 src/main.c:2678
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total des messages sortants : %d\n"
@@ -4371,17 +4384,17 @@ msgstr "Vert clair"
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/foldersort.c:231
+#: src/gtk/foldersort.c:241
 msgid "Set mailbox order"
 msgstr "Définir l'ordre de tri des boîtes aux lettres"
 
-#: src/gtk/foldersort.c:265
+#: src/gtk/foldersort.c:276
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 "Monter ou descendre les boîtes aux lettres dans la liste pour changer "
 "l'ordre de tri dans la liste des dossiers."
 
-#: src/gtk/foldersort.c:299
+#: src/gtk/foldersort.c:310
 msgid "Mailboxes"
 msgstr "Boîtes aux lettres"
 
@@ -4509,7 +4522,7 @@ msgstr "Configuration.."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1224
 #: src/prefs_matcher.c:645 src/prefs_matcher.c:2213 src/prefs_summaries.c:613
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:468
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:469
 msgid "Date"
 msgstr "Date"
 
@@ -4519,7 +4532,7 @@ msgstr "Date:"
 
 #: src/gtk/headers.h:10 src/prefs_filtering_action.c:1221
 #: src/prefs_matcher.c:2210 src/prefs_summaries.c:615
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:466
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:467
 msgid "From"
 msgstr "De"
 
@@ -4541,7 +4554,7 @@ msgstr "Répondre-à"
 
 #: src/gtk/headers.h:13 src/prefs_filtering_action.c:1222
 #: src/prefs_matcher.c:2211 src/prefs_summaries.c:616
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:467
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:468
 msgid "To"
 msgstr "À"
 
@@ -4578,7 +4591,7 @@ msgstr "Références:"
 
 #: src/gtk/headers.h:19 src/prefs_filtering_action.c:1220
 #: src/prefs_matcher.c:2209 src/prefs_summaries.c:617
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:465
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:466
 msgid "Subject"
 msgstr "Sujet"
 
@@ -4701,9 +4714,9 @@ msgid "Seen:"
 msgstr "Consulté:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:166 src/prefs_summaries.c:621
+#: src/gtk/sslcertwindow.c:190 src/prefs_summaries.c:621
 #: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/ssl_manager.c:124
-#: src/summaryview.c:2897
+#: src/summaryview.c:2918
 msgid "Status"
 msgstr "État"
 
@@ -4747,7 +4760,7 @@ msgstr "Client-de-messagerie:"
 msgid "Content-Type"
 msgstr "Type-de-contenu"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:328
+#: src/gtk/headers.h:42 src/image_viewer.c:338
 msgid "Content-Type:"
 msgstr "Type-de-contenu:"
 
@@ -4775,7 +4788,7 @@ msgstr "Précédence"
 msgid "Precedence:"
 msgstr "Précédence:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1166
+#: src/gtk/headers.h:46 src/prefs_account.c:1169
 msgid "Organization"
 msgstr "Société"
 
@@ -5151,14 +5164,14 @@ msgstr "Modules chargés"
 msgid "Page Index"
 msgstr "Préférences"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:842
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:853
 msgid "_Hide"
 msgstr "_Cacher"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:693
-#: src/prefs_account.c:3741 src/prefs_account.c:3759 src/prefs_account.c:3777
-#: src/prefs_account.c:3795 src/prefs_account.c:3813 src/prefs_account.c:3831
-#: src/prefs_account.c:3850 src/prefs_account.c:3943 src/prefs_account.c:3961
+#: src/prefs_account.c:3744 src/prefs_account.c:3762 src/prefs_account.c:3780
+#: src/prefs_account.c:3798 src/prefs_account.c:3816 src/prefs_account.c:3834
+#: src/prefs_account.c:3853 src/prefs_account.c:3946 src/prefs_account.c:3964
 #: src/prefs_filtering_action.c:1379 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1883
 msgid "Account"
@@ -5441,58 +5454,58 @@ msgstr "É_dition"
 msgid "C_lear"
 msgstr "_Effacer"
 
-#: src/gtk/sslcertwindow.c:157 src/ssl_manager.c:325
+#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:300
 #, c-format
 msgid "Correct%s"
 msgstr "Correct%s"
 
-#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:159
-#: src/ssl_manager.c:325 src/ssl_manager.c:329
+#: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
+#: src/ssl_manager.c:300 src/ssl_manager.c:304
 msgid " (expired)"
 msgstr "(expiré)"
 
-#: src/gtk/sslcertwindow.c:164
+#: src/gtk/sslcertwindow.c:188
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: src/gtk/sslcertwindow.c:165
+#: src/gtk/sslcertwindow.c:189
 msgid "Signer"
 msgstr "Signé par"
 
-#: src/gtk/sslcertwindow.c:172 src/gtk/sslcertwindow.c:196
+#: src/gtk/sslcertwindow.c:196 src/gtk/sslcertwindow.c:220
 msgid "Name: "
 msgstr "Nom : "
 
-#: src/gtk/sslcertwindow.c:180 src/gtk/sslcertwindow.c:204
+#: src/gtk/sslcertwindow.c:204 src/gtk/sslcertwindow.c:228
 msgid "Organization: "
 msgstr "Société : "
 
-#: src/gtk/sslcertwindow.c:188 src/gtk/sslcertwindow.c:212
+#: src/gtk/sslcertwindow.c:212 src/gtk/sslcertwindow.c:236
 msgid "Location: "
 msgstr "Lieu : "
 
-#: src/gtk/sslcertwindow.c:220
+#: src/gtk/sslcertwindow.c:244
 msgid "Fingerprint: \n"
 msgstr "Empreinte : \n"
 
-#: src/gtk/sslcertwindow.c:230
+#: src/gtk/sslcertwindow.c:254
 msgid "Signature status: "
 msgstr "État des signatures : "
 
-#: src/gtk/sslcertwindow.c:237
+#: src/gtk/sslcertwindow.c:261
 msgid "Expired on: "
 msgstr "A expiré le : "
 
-#: src/gtk/sslcertwindow.c:237
+#: src/gtk/sslcertwindow.c:261
 msgid "Expires on: "
 msgstr "Expire le : "
 
-#: src/gtk/sslcertwindow.c:304
+#: src/gtk/sslcertwindow.c:328
 #, c-format
 msgid "SSL/TLS certificate for %s"
 msgstr "Certificat SSL/TLS pour %s"
 
-#: src/gtk/sslcertwindow.c:320
+#: src/gtk/sslcertwindow.c:344
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5504,7 +5517,7 @@ msgstr ""
 "malveillant.\n"
 "\n"
 
-#: src/gtk/sslcertwindow.c:340
+#: src/gtk/sslcertwindow.c:364
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5513,39 +5526,39 @@ msgstr ""
 "Le certificat pour %s est inconnu.\n"
 "%sVoulez-vous l'accepter ?"
 
-#: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
-#: src/gtk/sslcertwindow.c:464
+#: src/gtk/sslcertwindow.c:374 src/gtk/sslcertwindow.c:424
+#: src/gtk/sslcertwindow.c:488
 msgid "Correct"
 msgstr "Correct"
 
-#: src/gtk/sslcertwindow.c:352 src/gtk/sslcertwindow.c:402
-#: src/gtk/sslcertwindow.c:466
+#: src/gtk/sslcertwindow.c:376 src/gtk/sslcertwindow.c:426
+#: src/gtk/sslcertwindow.c:490
 #, c-format
 msgid "Signature status: %s"
 msgstr "État de la signature : %s"
 
-#: src/gtk/sslcertwindow.c:360 src/gtk/sslcertwindow.c:410
+#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:434
 msgid "_View certificate"
 msgstr "_Voir le certificat"
 
-#: src/gtk/sslcertwindow.c:366
+#: src/gtk/sslcertwindow.c:390
 msgid "SSL/TLS certificate is invalid"
 msgstr "Le certificat SSL/TLS est invalide"
 
-#: src/gtk/sslcertwindow.c:368
+#: src/gtk/sslcertwindow.c:392
 msgid "SSL/TLS certificate is unknown"
 msgstr "Le certificat SSL/TLS est inconnu"
 
-#: src/gtk/sslcertwindow.c:371 src/gtk/sslcertwindow.c:421
-#: src/gtk/sslcertwindow.c:483
+#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:445
+#: src/gtk/sslcertwindow.c:507
 msgid "_Cancel connection"
 msgstr "_Interrompre la connexion"
 
-#: src/gtk/sslcertwindow.c:371 src/gtk/sslcertwindow.c:483
+#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:507
 msgid "_Accept and save"
 msgstr "_Accepter et enregistrer"
 
-#: src/gtk/sslcertwindow.c:389
+#: src/gtk/sslcertwindow.c:413
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5554,27 +5567,27 @@ msgstr ""
 "Le certificat pour %s a expiré.\n"
 "%sVoulez-vous continuer ?"
 
-#: src/gtk/sslcertwindow.c:416
+#: src/gtk/sslcertwindow.c:440
 msgid "SSL/TLS certificate is invalid and expired"
 msgstr "Le certificat SSL/TLS est invalide et a expiré"
 
-#: src/gtk/sslcertwindow.c:418
+#: src/gtk/sslcertwindow.c:442
 msgid "SSL/TLS certificate is expired"
 msgstr "Le certificat SSL/TLS a expiré"
 
-#: src/gtk/sslcertwindow.c:421
+#: src/gtk/sslcertwindow.c:445
 msgid "_Accept"
 msgstr "_Accepter"
 
-#: src/gtk/sslcertwindow.c:441
+#: src/gtk/sslcertwindow.c:465
 msgid "New certificate:"
 msgstr "Nouveau certificat :"
 
-#: src/gtk/sslcertwindow.c:446
+#: src/gtk/sslcertwindow.c:470
 msgid "Known certificate:"
 msgstr "Certificat connu :"
 
-#: src/gtk/sslcertwindow.c:453
+#: src/gtk/sslcertwindow.c:477
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5583,15 +5596,15 @@ msgstr ""
 "Le certificat pour %s a changé.\n"
 "%sVoulez-vous l'accepter ?"
 
-#: src/gtk/sslcertwindow.c:474
+#: src/gtk/sslcertwindow.c:498
 msgid "_View certificates"
 msgstr "_Voir les certificats"
 
-#: src/gtk/sslcertwindow.c:479
+#: src/gtk/sslcertwindow.c:503
 msgid "SSL/TLS certificate changed and is invalid"
 msgstr "Le certificat SSL/TLS a changé et est invalide"
 
-#: src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:505
 msgid "SSL/TLS certificate changed"
 msgstr "Le certificat SSL/TLS a changé"
 
@@ -5601,33 +5614,33 @@ msgstr "Labels :"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3498
-#: src/summaryview.c:3516 src/summaryview.c:3555
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3519
+#: src/summaryview.c:3537 src/summaryview.c:3576
 msgid "(No From)"
 msgstr "(Pas d'expéditeur·rice)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3567
-#: src/summaryview.c:3570
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3588
+#: src/summaryview.c:3591
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/image_viewer.c:101
+#: src/image_viewer.c:127
 msgid "Error:"
 msgstr "Erreur : "
 
-#: src/image_viewer.c:300 src/mimeview.c:2614
+#: src/image_viewer.c:310 src/mimeview.c:2657
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: src/image_viewer.c:307
+#: src/image_viewer.c:317
 msgid "Filesize:"
 msgstr "Taille du fichier :"
 
-#: src/image_viewer.c:356
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "Charger l'image"
 
@@ -5635,193 +5648,193 @@ msgstr "Charger l'image"
 msgid "IMAP connection broken\n"
 msgstr "Connexion IMAP rompue\n"
 
-#: src/imap.c:616 src/imap.c:619 src/imap.c:622 src/imap.c:625 src/imap.c:628
-#: src/imap.c:632 src/imap.c:635 src/imap.c:638 src/imap.c:641 src/imap.c:645
-#: src/imap.c:648 src/imap.c:651 src/imap.c:654 src/imap.c:657 src/imap.c:660
-#: src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672 src/imap.c:675
-#: src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687 src/imap.c:690
-#: src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702 src/imap.c:705
-#: src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717 src/imap.c:720
-#: src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732 src/imap.c:735
-#: src/imap.c:739 src/imap.c:743
+#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
+#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
+#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
+#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
+#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
+#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
+#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
+#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
+#: src/imap.c:745 src/imap.c:749
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Erreur IMAP sur %s :"
 
-#: src/imap.c:616
+#: src/imap.c:622
 msgid "authenticated"
 msgstr "authentifié"
 
-#: src/imap.c:619
+#: src/imap.c:625
 msgid "not authenticated"
 msgstr "non authentifié"
 
-#: src/imap.c:622
+#: src/imap.c:628
 msgid "bad state"
 msgstr "état incorrect"
 
-#: src/imap.c:625
+#: src/imap.c:631
 msgid "stream error"
 msgstr "erreur de flux"
 
-#: src/imap.c:628
+#: src/imap.c:634
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "erreur d'analyse (très probablement due au non-respect des RFC de la part du "
 "serveur)"
 
-#: src/imap.c:632
+#: src/imap.c:638
 msgid "connection refused"
 msgstr "connexion refusée"
 
-#: src/imap.c:635
+#: src/imap.c:641
 msgid "memory error"
 msgstr "erreur de mémoire"
 
-#: src/imap.c:638
+#: src/imap.c:644
 msgid "fatal error"
 msgstr "erreur fatale"
 
-#: src/imap.c:641
+#: src/imap.c:647
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 "erreur de protocole (très probablement due au non-respect des RFC de la part "
 "du serveur)"
 
-#: src/imap.c:645
+#: src/imap.c:651
 msgid "connection not accepted"
 msgstr "connexion non acceptée"
 
-#: src/imap.c:648
+#: src/imap.c:654
 msgid "APPEND error"
 msgstr "erreur de la commande « APPEND »"
 
-#: src/imap.c:651
+#: src/imap.c:657
 msgid "NOOP error"
 msgstr "erreur NOOP"
 
-#: src/imap.c:654
+#: src/imap.c:660
 msgid "LOGOUT error"
 msgstr "erreur de la commande « LOGOUT »"
 
-#: src/imap.c:657
+#: src/imap.c:663
 msgid "CAPABILITY error"
 msgstr "erreur de la commande « CAPABILITY »"
 
-#: src/imap.c:660
+#: src/imap.c:666
 msgid "CHECK error"
 msgstr "erreur de la commande « CHECK »"
 
-#: src/imap.c:663
+#: src/imap.c:669
 msgid "CLOSE error"
 msgstr "erreur de la commande « CLOSE »"
 
-#: src/imap.c:666
+#: src/imap.c:672
 msgid "EXPUNGE error"
 msgstr "erreur de la commande « EXPUNGE »"
 
-#: src/imap.c:669
+#: src/imap.c:675
 msgid "COPY error"
 msgstr "erreur de la commande « COPY »"
 
-#: src/imap.c:672
+#: src/imap.c:678
 msgid "UID COPY error"
 msgstr "erreur de la commande « UID COPY »"
 
-#: src/imap.c:675
+#: src/imap.c:681
 msgid "CREATE error"
 msgstr "erreur de la commande « CREATE »"
 
-#: src/imap.c:678
+#: src/imap.c:684
 msgid "DELETE error"
 msgstr "erreur de la commande « DELETE »"
 
-#: src/imap.c:681
+#: src/imap.c:687
 msgid "EXAMINE error"
 msgstr "erreur de la commande « EXAMINE »"
 
-#: src/imap.c:684
+#: src/imap.c:690
 msgid "FETCH error"
 msgstr "erreur de la commande « FETCH »"
 
-#: src/imap.c:687
+#: src/imap.c:693
 msgid "UID FETCH error"
 msgstr "erreur de la commande « UID FETCH »"
 
-#: src/imap.c:690
+#: src/imap.c:696
 msgid "LIST error"
 msgstr "erreur de la commande « LIST »"
 
-#: src/imap.c:693
+#: src/imap.c:699
 msgid "LOGIN error"
 msgstr "erreur de la commande « LOGIN »"
 
-#: src/imap.c:696
+#: src/imap.c:702
 msgid "LSUB error"
 msgstr "erreur de la commande « LSUB »"
 
-#: src/imap.c:699
+#: src/imap.c:705
 msgid "RENAME error"
 msgstr "erreur de la commande « RENAME »"
 
-#: src/imap.c:702
+#: src/imap.c:708
 msgid "SEARCH error"
 msgstr "erreur de la commande « SEARCH »"
 
-#: src/imap.c:705
+#: src/imap.c:711
 msgid "UID SEARCH error"
 msgstr "erreur de la commande « UID SEARCH »"
 
-#: src/imap.c:708
+#: src/imap.c:714
 msgid "SELECT error"
 msgstr "erreur de la commande « SELECT »"
 
-#: src/imap.c:711
+#: src/imap.c:717
 msgid "STATUS error"
 msgstr "erreur de la commande « STATUS »"
 
-#: src/imap.c:714
+#: src/imap.c:720
 msgid "STORE error"
 msgstr "erreur de la commande « STORE »"
 
-#: src/imap.c:717
+#: src/imap.c:723
 msgid "UID STORE error"
 msgstr "erreur de la commande « UID STORE »"
 
-#: src/imap.c:720
+#: src/imap.c:726
 msgid "SUBSCRIBE error"
 msgstr "erreur de la commande « SUBSCRIBE »"
 
-#: src/imap.c:723
+#: src/imap.c:729
 msgid "UNSUBSCRIBE error"
 msgstr "erreur de la commande « UNSUBSCRIBE »"
 
-#: src/imap.c:726
+#: src/imap.c:732
 msgid "STARTTLS error"
 msgstr "erreur de la commande « STARTTLS »"
 
-#: src/imap.c:729
+#: src/imap.c:735
 msgid "INVAL error"
 msgstr "erreur de la commande « INVAL »"
 
-#: src/imap.c:732
+#: src/imap.c:738
 msgid "EXTENSION error"
 msgstr "erreur de la commande « EXTENSION »"
 
-#: src/imap.c:735
+#: src/imap.c:741
 msgid "SASL error"
 msgstr "erreur SASL"
 
-#: src/imap.c:739
+#: src/imap.c:745
 msgid "SSL/TLS error"
 msgstr "erreur SSL/TLS"
 
-#: src/imap.c:743
+#: src/imap.c:749
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Erreur inconnue [%d]"
 
-#: src/imap.c:947
+#: src/imap.c:955
 msgid ""
 "\n"
 "\n"
@@ -5834,7 +5847,7 @@ msgstr ""
 "a été compilée avec le support SASL et si le module CRAM-MD5 SASL est "
 "installé."
 
-#: src/imap.c:953
+#: src/imap.c:961
 msgid ""
 "\n"
 "\n"
@@ -5847,7 +5860,7 @@ msgstr ""
 "'libetpan' a été compilée avec le support SASL et si le module DIGEST-MD5 "
 "SASL est installé."
 
-#: src/imap.c:959
+#: src/imap.c:967
 msgid ""
 "\n"
 "\n"
@@ -5860,7 +5873,7 @@ msgstr ""
 "'libetpan' a été compilée avec le support SASL et si le module SCRAM SASL "
 "est installé."
 
-#: src/imap.c:965
+#: src/imap.c:973
 msgid ""
 "\n"
 "\n"
@@ -5872,7 +5885,7 @@ msgstr ""
 "L'authentification PLAIN fonctionne uniquement si la librairie 'libetpan' a "
 "été compilée avec le support SASL et si le module PLAIN SASL est installé."
 
-#: src/imap.c:971
+#: src/imap.c:979
 msgid ""
 "\n"
 "\n"
@@ -5884,36 +5897,36 @@ msgstr ""
 "L'authentification LOGIN fonctionne uniquement si la librairie 'libetpan' a "
 "été compilée avec le support SASL et si le module LOGIN SASL est installé."
 
-#: src/imap.c:978
+#: src/imap.c:986
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "La connexion vers %s a échoué : nom d'utilisateur·rice refusé.%s"
 
-#: src/imap.c:982
+#: src/imap.c:990
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "La connexion vers %s a échoué : nom d'utilisateur·rice refusé.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:1008
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "La connexion vers %s a échoué."
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:1015 src/imap.c:1018
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP vers %s a été rompue. Reconnexion..\n"
 
-#: src/imap.c:1040 src/imap.c:3678 src/imap.c:4337 src/imap.c:4431
-#: src/imap.c:4609 src/imap.c:5420
+#: src/imap.c:1048 src/imap.c:3687 src/imap.c:4346 src/imap.c:4440
+#: src/imap.c:4618 src/imap.c:5429
 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."
 
-#: src/imap.c:1150 src/inc.c:873 src/news.c:401 src/send_message.c:285
+#: src/imap.c:1158 src/inc.c:873 src/news.c:402 src/send_message.c:286
 msgid "Insecure connection"
 msgstr "Connexion non sécurisée"
 
-#: src/imap.c:1151 src/inc.c:874 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1159 src/inc.c:874 src/news.c:403 src/send_message.c:287
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5927,108 +5940,108 @@ msgstr ""
 "Voulez-vous quand même poursuivre la connexion à ce serveur même si la "
 "communication ne peut pas être sécurisée ?"
 
-#: src/imap.c:1157 src/inc.c:880 src/news.c:408 src/send_message.c:292
+#: src/imap.c:1165 src/inc.c:880 src/news.c:409 src/send_message.c:293
 msgid "Con_tinue connecting"
 msgstr "_Poursuivre la connexion"
 
-#: src/imap.c:1167
+#: src/imap.c:1174
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Compte '%s' : Connexion au serveur IMAP : %s:%d.."
 
-#: src/imap.c:1232
+#: src/imap.c:1239
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Impossible de se connecter au serveur IMAP : %s:%d"
 
-#: src/imap.c:1235
+#: src/imap.c:1242
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP : %s:%d\n"
 
-#: src/imap.c:1267 src/imap.c:4099
+#: src/imap.c:1274 src/imap.c:4108
 msgid "Can't start STARTTLS session.\n"
 msgstr "Impossible d'initier la session STARTTLS.\n"
 
-#: src/imap.c:1334
+#: src/imap.c:1343
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Connexion impossible au serveur IMAP %s.\n"
 
-#: src/imap.c:1337
+#: src/imap.c:1346
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Authentification impossible au serveur IMAP %s."
 
-#: src/imap.c:1765
+#: src/imap.c:1774
 msgid "Adding messages..."
 msgstr "Ajout des messages en cours.."
 
-#: src/imap.c:1970 src/mh.c:530
+#: src/imap.c:1979 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Copie des messages en cours.."
 
-#: src/imap.c:2492
+#: src/imap.c:2501
 msgid "Search failed due to server error."
 msgstr "Échec de la recherche dû à un problème de serveur."
 
-#: src/imap.c:2571
+#: src/imap.c:2580
 msgid "can't set deleted flags\n"
 msgstr "Impossible de marquer pour la suppression\n"
 
-#: src/imap.c:2578 src/imap.c:5050
+#: src/imap.c:2587 src/imap.c:5059
 msgid "can't expunge\n"
 msgstr "Impossible de purger\n"
 
-#: src/imap.c:2929
+#: src/imap.c:2938
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Recherche des dossiers non inscrits dans %s.."
 
-#: src/imap.c:2932
+#: src/imap.c:2941
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Recherche des sous-dossiers de %s.."
 
-#: src/imap.c:3220
+#: 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:3233
+#: src/imap.c:3242
 msgid "can't create mailbox\n"
 msgstr "Impossible de créer la boîte aux lettres\n"
 
-#: src/imap.c:3364
+#: src/imap.c:3373
 #, 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:3477
+#: src/imap.c:3486
 msgid "can't delete mailbox\n"
 msgstr "Impossible de supprimer la boîte aux lettres.\n"
 
-#: src/imap.c:3756
+#: src/imap.c:3765
 msgid "LIST failed\n"
 msgstr "commande LIST échouée\n"
 
-#: src/imap.c:3841
+#: src/imap.c:3850
 msgid "Flagging messages..."
 msgstr "Marquage des messages en cours.."
 
-#: src/imap.c:3944
+#: src/imap.c:3953
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s.\n"
 
-#: src/imap.c:4096
+#: src/imap.c:4105
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Le serveur nécessite STARTTLS pour s'y connecter.\n"
 
-#: src/imap.c:4106
+#: src/imap.c:4115
 msgid "Can't refresh capabilities.\n"
 msgstr "Impossible de rafraîchir la liste des facilités IMAP.\n"
 
-#: src/imap.c:4111
+#: src/imap.c:4120
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6037,20 +6050,20 @@ msgstr ""
 "La connexion vers %s a échoué : le serveur nécessite STARTTLS, mais Claws "
 "Mail a été compilé sans le support STARTTLS.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4128
 msgid "Server logins are disabled.\n"
 msgstr "Les connexions au serveur sont désactivées.\n"
 
-#: src/imap.c:4342
+#: src/imap.c:4351
 msgid "Fetching message..."
 msgstr "Lecture du message en cours.."
 
-#: src/imap.c:5043
+#: src/imap.c:5052
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Impossible de marquer pour la suppression : %d.\n"
 
-#: src/imap.c:6078
+#: src/imap.c:6087
 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"
@@ -6139,20 +6152,20 @@ msgstr "Hériter des options et règles de traitement du dossier parent"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
 #: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
-#: src/plugins/vcalendar/vcal_folder.c:2057
+#: src/plugins/vcalendar/vcal_folder.c:2060
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Saisir le nouveau nom pour '%s' :"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
 #: src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/plugins/vcalendar/vcal_folder.c:2061
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
 #: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:220
-#: src/plugins/vcalendar/vcal_folder.c:2078
+#: src/plugins/vcalendar/vcal_folder.c:2081
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6185,7 +6198,7 @@ msgstr ""
 
 #: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
 #: src/plugins/rssyl/rssyl_cb_menu.c:172
-#: src/plugins/vcalendar/vcal_folder.c:2011
+#: src/plugins/vcalendar/vcal_folder.c:2014
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible de supprimer le dossier '%s'."
@@ -6214,7 +6227,7 @@ msgstr "_Rechercher"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Choisir un sous-dossier de '%s' auquel vous voulez vous inscrire : "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:681
+#: src/imap_gtk.c:536 src/mainwindow.c:689
 msgid "Subscribe"
 msgstr "S'inscrire"
 
@@ -6350,7 +6363,7 @@ msgstr "Sélectionner le fichier LDIF à importer."
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:710 src/summaryview.c:463
+#: src/importldif.c:710 src/summaryview.c:464
 msgid "S"
 msgstr "S"
 
@@ -6496,7 +6509,7 @@ msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
 #: src/inc.c:716 src/prefs_matcher.c:407 src/prefs_summaries.c:624
-#: src/prefs_summary_column.c:87 src/summaryview.c:2893 src/summaryview.c:6544
+#: src/prefs_summary_column.c:87 src/summaryview.c:2914 src/summaryview.c:6589
 msgid "Locked"
 msgstr "Verrouillé"
 
@@ -6520,73 +6533,73 @@ msgstr "Terminé (aucun nouveau message)"
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:887
+#: src/inc.c:886
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Compte '%s' : Connexion au serveur POP3 : %s:%d.."
 
-#: src/inc.c:921
+#: src/inc.c:920
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d"
 
-#: src/inc.c:925
+#: src/inc.c:924
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d.\n"
 
-#: src/inc.c:1005 src/plugins/managesieve/managesieve.c:424
+#: src/inc.c:1004 src/plugins/managesieve/managesieve.c:424
 #: src/send_message.c:515
 msgid "Authenticating..."
 msgstr "Authentification.."
 
-#: src/inc.c:1007
+#: src/inc.c:1006
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Réception des messages de %s (%s).."
 
-#: src/inc.c:1013
+#: src/inc.c:1012
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT).."
 
-#: src/inc.c:1017
+#: src/inc.c:1016
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST).."
 
-#: src/inc.c:1021
+#: src/inc.c:1020
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL).."
 
-#: src/inc.c:1025
+#: src/inc.c:1024
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages"
 
-#: src/inc.c:1032 src/send_message.c:533
+#: src/inc.c:1031 src/send_message.c:533
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:1057
+#: src/inc.c:1056
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s octets)"
 
-#: src/inc.c:1070
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Récupération (%d message (%s) reçu)"
 msgstr[1] "Récupération (%d messages (%s) reçus)"
 
-#: src/inc.c:1229
+#: src/inc.c:1228
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "La connexion vers %s:%d a échoué."
 
-#: src/inc.c:1234
+#: src/inc.c:1233
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1240
+#: src/inc.c:1239
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6595,37 +6608,37 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1246
+#: src/inc.c:1245
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1251
+#: src/inc.c:1250
 msgid "Can't write file."
 msgstr "Impossible d'enregistrer le fichier."
 
-#: src/inc.c:1256
+#: src/inc.c:1255
 msgid "Socket error."
 msgstr "Erreur de « socket »."
 
-#: src/inc.c:1259
+#: src/inc.c:1258
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Erreur de socket lors de la connexion vers %s:%d."
 
-#: src/inc.c:1264 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1263 src/send_message.c:444 src/send_message.c:707
 msgid "Connection closed by the remote host."
 msgstr "Connexion fermée par l'hôte distant."
 
-#: src/inc.c:1267
+#: src/inc.c:1266
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Connexion vers %s:%d fermée par l'hôte distant."
 
-#: src/inc.c:1272
+#: src/inc.c:1271
 msgid "Mailbox is locked."
 msgstr "Boîte aux lettres verrouillée."
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6634,11 +6647,11 @@ msgstr ""
 "La boîte aux lettres est verrouillée :\n"
 "%s"
 
-#: src/inc.c:1282 src/send_message.c:692
+#: src/inc.c:1281 src/send_message.c:692
 msgid "Authentication failed."
 msgstr "L'authentification a échoué."
 
-#: src/inc.c:1288 src/send_message.c:695
+#: src/inc.c:1287 src/send_message.c:695
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6647,7 +6660,7 @@ msgstr ""
 "L'authentification a échoué\n"
 "%s"
 
-#: src/inc.c:1293 src/send_message.c:711
+#: src/inc.c:1292 src/send_message.c:711
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6655,49 +6668,49 @@ msgstr ""
 "La session a expiré. Augmenter la valeur du délai d'expiration dans "
 "Préférences/Autres/Divers peut dans certains cas être une solution."
 
-#: src/inc.c:1298
+#: src/inc.c:1297
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "La connexion vers %s:%d a échoué."
 
-#: src/inc.c:1336
+#: src/inc.c:1335
 msgid "Incorporation cancelled\n"
 msgstr "Relève annulée\n"
 
-#: src/inc.c:1628 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1627 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1786
-#: src/prefs_other.c:572 src/prefs_receive.c:203 src/prefs_summaries.c:530
+#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1789
+#: src/prefs_other.c:577 src/prefs_receive.c:203 src/prefs_summaries.c:530
 msgid "seconds"
 msgstr "secondes"
 
-#: src/inc.c:1638 src/inc.c:1648
+#: src/inc.c:1637 src/inc.c:1647
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/inc.c:1641
+#: src/inc.c:1640
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/inc.c:1653
+#: src/inc.c:1652
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr ""
 "%s%sLe mode hors-ligne est actif. Voulez-vous passer outre pour %d %s ?"
 
-#: src/inc.c:1659
+#: src/inc.c:1658
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
-"%s%sAttention, vous êtes en mode hors-ligne. Voulez-vous continuer et ignorer "
-"l'avertissement ?"
+"%s%sAttention, vous êtes en mode hors-ligne. Voulez-vous continuer et "
+"ignorer l'avertissement ?"
 
-#: src/inc.c:1666
+#: src/inc.c:1665
 msgid "On_ly once"
 msgstr "_Seulement pour cette fois-ci"
 
@@ -6734,7 +6747,7 @@ msgstr "LDAP erreur (recherche) : %d (%s)\n"
 msgid "Nick Name"
 msgstr "Surnom"
 
-#: src/main.c:248
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6743,7 +6756,7 @@ msgstr ""
 "Le fichier '%s' existe déjà.\n"
 "Impossible de créer le dossier."
 
-#: src/main.c:373
+#: src/main.c:375
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6752,7 +6765,7 @@ msgstr ""
 "Une configuration pour %s a été trouvée.\n"
 "Voulez-vous faire migrer cette configuration ?"
 
-#: src/main.c:375
+#: src/main.c:377
 #, c-format
 msgid ""
 "\n"
@@ -6765,11 +6778,11 @@ msgstr ""
 "Vos règles de filtrage pour Sylpheed peuvent être converties\n"
 "par un script disponible ici : %s."
 
-#: src/main.c:387
+#: src/main.c:389
 msgid "Keep old configuration"
 msgstr "Conserver l'ancienne configuration"
 
-#: src/main.c:390
+#: src/main.c:392
 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 "
@@ -6780,31 +6793,31 @@ msgstr ""
 "IMAP ou provenant de serveurs de discussions, et occupera un espace "
 "supplémentaire sur votre disque."
 
-#: src/main.c:398
+#: src/main.c:400
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:409
+#: src/main.c:411
 msgid "Copying configuration... This may take a while..."
 msgstr "Copie de la configuration.. Cela peut prendre du temps.."
 
-#: src/main.c:418
+#: src/main.c:420
 msgid "Migration failed!"
 msgstr "La migration a échoué !"
 
-#: src/main.c:427
+#: src/main.c:429
 msgid "Migrating configuration..."
 msgstr "Migration de la configuration.."
 
-#: src/main.c:1129
+#: src/main.c:1141
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non supporté par glib.\n"
 
-#: src/main.c:1149 src/main.c:1153 src/main.c:1157
+#: src/main.c:1161 src/main.c:1165 src/main.c:1169
 msgid "(or older)"
 msgstr "(ou antérieure)"
 
-#: src/main.c:1496
+#: src/main.c:1510
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6823,7 +6836,7 @@ msgstr[1] ""
 "configuration des modules pour de plus amples informations :\n"
 "%s"
 
-#: src/main.c:1538
+#: src/main.c:1552
 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 "
@@ -6834,7 +6847,7 @@ msgstr ""
 "Veuillez utiliser « Reconstruire l'_arborescence » depuis le menu contextuel "
 "du dossier principal de la boîte aux lettres pour tenter de le résoudre."
 
-#: src/main.c:1544
+#: src/main.c:1558
 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 "
@@ -6844,36 +6857,36 @@ msgstr ""
 "est probablement dû à la caducité d'un module externe. Veuillez ré-installer "
 "le module et essayer à nouveau."
 
-#: src/main.c:1784
+#: src/main.c:1798
 msgid "Missing filename\n"
 msgstr "Nom de fichier manquant\n"
 
-#: src/main.c:1791
+#: src/main.c:1805
 msgid "Cannot open filename for reading\n"
 msgstr "Impossible d'ouvrir le fichier en lecture\n"
 
-#: src/main.c:1802
+#: src/main.c:1816
 msgid "Malformed header\n"
 msgstr "En-tête non conforme\n"
 
-#: src/main.c:1809
+#: src/main.c:1823
 msgid "Duplicated 'To:' header\n"
 msgstr "En-tête « À: » en plusieurs exemplaires\n"
 
-#: src/main.c:1820
+#: src/main.c:1834
 msgid "Missing required 'To:' header\n"
 msgstr "L'en-tête « À: » est manquant\n"
 
-#: src/main.c:1965
+#: src/main.c:1979
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]..\n"
 
-#: src/main.c:1967
+#: src/main.c:1981
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:1968
+#: src/main.c:1982
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6893,7 +6906,7 @@ msgstr ""
 "                         jusqu'à une ligne vide, puis le corps de message "
 "jusqu'à la fin de fichier"
 
-#: src/main.c:1973
+#: src/main.c:1987
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      s'abonner au flux RSS ou WebCal donné (requiert\n"
@@ -6901,7 +6914,7 @@ msgstr ""
 "                         de nouvelles, ou « vCalendar » , gestionnaire de\n"
 "                         rendez-vous et calendriers en ligne)"
 
-#: src/main.c:1974
+#: src/main.c:1988
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6911,7 +6924,7 @@ msgstr ""
 "                         ouvrir une fenêtre de composition avec les\n"
 "                         fichiers spécifiés attachés"
 
-#: src/main.c:1977
+#: src/main.c:1991
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6921,25 +6934,25 @@ msgstr ""
 "                         ouvrir une fenêtre de composition avec les\n"
 "                         fichiers spécifiés insérés"
 
-#: src/main.c:1980
+#: src/main.c:1994
 msgid "  --receive              receive new messages"
 msgstr ""
 "  --receive              récupérer les nouveaux messages (du compte courant)"
 
-#: src/main.c:1981
+#: src/main.c:1995
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 
-#: src/main.c:1982
+#: src/main.c:1996
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     annuler la récupération des messages"
 
-#: src/main.c:1983
+#: src/main.c:1997
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       annuler l'envoi des messages"
 
-#: src/main.c:1984
+#: src/main.c:1998
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6959,17 +6972,17 @@ msgstr ""
 "                         récursif: aucune si l'argument commence par 0, n, "
 "N, f ou F"
 
-#: src/main.c:1991
+#: src/main.c:2005
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:1992
+#: src/main.c:2006
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 "  --status [dossier]..   afficher le nombre de messages\n"
 "                         (nouveaux, non lus, total)"
 
-#: src/main.c:1993
+#: src/main.c:2007
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6977,15 +6990,15 @@ msgstr ""
 "  --status-full [dossier]..\n"
 "                         afficher le nombre de messages de chaque dossier"
 
-#: src/main.c:1995
+#: src/main.c:2009
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           affiche les statistiques de la session"
 
-#: src/main.c:1996
+#: src/main.c:2010
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     réinitialise les statistiques de la session"
 
-#: src/main.c:1997
+#: src/main.c:2011
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6996,35 +7009,35 @@ msgstr ""
 "voici\n"
 "                         un exemple de syntaxe : 'dossier/sous_dossier'"
 
-#: src/main.c:1999
+#: src/main.c:2013
 msgid "  --online               switch to online mode"
 msgstr "  --online               travailler en ligne"
 
-#: src/main.c:2000
+#: src/main.c:2014
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              travailler hors-ligne"
 
-#: src/main.c:2001
+#: src/main.c:2015
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       quitter Claws Mail"
 
-#: src/main.c:2002
+#: src/main.c:2016
 msgid "  --debug                debug mode"
 msgstr "  --debug                lancer Claws Mail en mode de déboguage"
 
-#: src/main.c:2003
+#: src/main.c:2017
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         changer le mode debug"
 
-#: src/main.c:2004
+#: src/main.c:2018
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              afficher cette aide et terminer"
 
-#: src/main.c:2005
+#: src/main.c:2019
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           afficher la version et terminer"
 
-#: src/main.c:2006
+#: src/main.c:2020
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -7032,12 +7045,12 @@ msgstr ""
 "  --version-full -V      afficher la version et les informations concernant\n"
 "                         les options intégrées et terminer"
 
-#: src/main.c:2007
+#: src/main.c:2021
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 "  --config-dir           afficher le dossier contenant la configuration"
 
-#: src/main.c:2008
+#: src/main.c:2022
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -7045,7 +7058,7 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         utiliser le dossier de configuration spécifié"
 
-#: src/main.c:2010
+#: src/main.c:2024
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -7053,855 +7066,858 @@ msgstr ""
 "  --geometry -geometry LxH+X+Y\n"
 "                         définir la géométrie de la fenêtre principale"
 
-#: src/main.c:2063
-msgid "Unknown option\n"
+#: src/main.c:2077
+msgid "Unknown option. Try -h or --help for usage.\n"
 msgstr ""
-"claws-mail: option non reconnue.\n"
-"Pour en savoir davantage, faites: « claws-mail --help ».\n"
+"Option inconnue. Utilisez -h ou --help pour voir les options possibles.\n"
 
-#: src/main.c:2081
+#: src/main.c:2095
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Traitement (%s).."
 
-#: src/main.c:2084
+#: src/main.c:2098
 msgid "top level folder"
 msgstr "dossier racine"
 
-#: src/main.c:2166
+#: src/main.c:2180
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:2167
+#: src/main.c:2181
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Voulez-vous "
 "quitter maintenant ?"
 
-#: src/main.c:2914
+#: src/main.c:2939
 msgid "NetworkManager: network is online.\n"
 msgstr "Gestionnaire réseau : le réseau est activé.\n"
 
-#: src/main.c:2920
+#: src/main.c:2945
 msgid "NetworkManager: network is offline.\n"
 msgstr "Gestionnaire réseau : le réseau est désactivé.\n"
 
-#: src/mainwindow.c:514 src/messageview.c:211
+#: src/mainwindow.c:522 src/messageview.c:211
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/mainwindow.c:516 src/messageview.c:213 src/summaryview.c:444
+#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:445
 msgid "_View"
 msgstr "_Vue"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:527
 msgid "_Configuration"
 msgstr "_Configuration"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:531
 msgid "_Add mailbox"
 msgstr "_Ajouter une boîte aux lettres"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:532
 msgid "MH..."
 msgstr "_MH.."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:535
 msgid "Change mailbox order..."
 msgstr "Changer l'ordre des boîtes aux lettres.."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:538
 msgid "_Import mbox file..."
 msgstr "I_mporter un fichier mbox.."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:539
 msgid "_Export to mbox file..."
 msgstr "E_xporter vers un fichier mbox.."
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:540
 msgid "_Export selected to mbox file..."
 msgstr "_Exporter la sélection en fichier mbox.."
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:542
 msgid "Empty all _Trash folders"
 msgstr "_Vider toutes les corbeilles"
 
-#: src/mainwindow.c:537 src/messageview.c:220
+#: src/mainwindow.c:545 src/messageview.c:220
 msgid "_Save email as..."
 msgstr "Enregi_strer le message sous.."
 
-#: src/mainwindow.c:538 src/messageview.c:221
+#: src/mainwindow.c:546 src/messageview.c:221
 msgid "_Save part as..."
 msgstr "Enregi_strer la partie sous.."
 
-#: src/mainwindow.c:541 src/messageview.c:222
+#: src/mainwindow.c:549 src/messageview.c:222
 msgid "Page setup..."
 msgstr "Mise en _page.."
 
-#: src/mainwindow.c:542 src/messageview.c:223
+#: src/mainwindow.c:550 src/messageview.c:223
 msgid "_Print..."
 msgstr "_Imprimer.."
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:552
 msgid "Synchronise folders"
 msgstr "S_ynchroniser les dossiers distants"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:554
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:559
 msgid "Select _thread"
 msgstr "Sélectionner la discussi_on"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:561
 msgid "_Find in current message..."
 msgstr "Chercher dans le _message.."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:563
 msgid "_Quick search"
 msgstr "_Recherche rapide"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:566
 msgid "Show or hi_de"
 msgstr "Afficher _ou cacher"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:567
 msgid "_Toolbar"
 msgstr "Barre d'_outils"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:569
 msgid "Set displayed _columns"
 msgstr "Sélect_ion des éléments affichés"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:570
 msgid "In _folder list..."
 msgstr "Dans la liste des _dossiers.."
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:571
 msgid "In _message list..."
 msgstr "Dans la liste des _messages.."
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:576
 msgid "La_yout"
 msgstr "_Disposition"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:578
 msgid "_Sort"
 msgstr "_Trier"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:580
 msgid "_Attract by subject"
 msgstr "Attirer par s_ujet"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:582
 msgid "E_xpand all threads"
 msgstr "Déplo_yer les fils de discussion"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:583
 msgid "Co_llapse all threads"
 msgstr "Re_plier les fils de discussion"
 
-#: src/mainwindow.c:577 src/messageview.c:234
+#: src/mainwindow.c:585 src/messageview.c:234
 msgid "_Go to"
 msgstr "_Aller à"
 
-#: src/mainwindow.c:578 src/messageview.c:235
+#: src/mainwindow.c:586 src/messageview.c:235
 msgid "_Previous message"
 msgstr "Message _précédent"
 
-#: src/mainwindow.c:579 src/messageview.c:236
+#: src/mainwindow.c:587 src/messageview.c:236
 msgid "_Next message"
 msgstr "Message suiva_nt"
 
-#: src/mainwindow.c:581 src/messageview.c:238
+#: src/mainwindow.c:589 src/messageview.c:238
 msgid "P_revious unread message"
 msgstr "Non l_u précédent"
 
-#: src/mainwindow.c:582 src/messageview.c:239
+#: src/mainwindow.c:590 src/messageview.c:239
 msgid "N_ext unread message"
 msgstr "Non _lu suivant"
 
-#: src/mainwindow.c:584 src/messageview.c:241
+#: src/mainwindow.c:592 src/messageview.c:241
 msgid "Previous ne_w message"
 msgstr "Message nouv_eau précédent"
 
-#: src/mainwindow.c:585 src/messageview.c:242
+#: src/mainwindow.c:593 src/messageview.c:242
 msgid "Ne_xt new message"
 msgstr "Message nou_veau suivant"
 
-#: src/mainwindow.c:587 src/messageview.c:244
+#: src/mainwindow.c:595 src/messageview.c:244
 msgid "Previous _marked message"
 msgstr "M_arqué précédent"
 
-#: src/mainwindow.c:588 src/messageview.c:245
+#: src/mainwindow.c:596 src/messageview.c:245
 msgid "Next m_arked message"
 msgstr "_Marqué suivant"
 
-#: src/mainwindow.c:590 src/messageview.c:247
+#: src/mainwindow.c:598 src/messageview.c:247
 msgid "Previous _labeled message"
 msgstr "C_olorié précédent"
 
-#: src/mainwindow.c:591 src/messageview.c:248
+#: src/mainwindow.c:599 src/messageview.c:248
 msgid "Next la_beled message"
 msgstr "_Colorié suivant"
 
-#: src/mainwindow.c:593 src/messageview.c:250
+#: src/mainwindow.c:601 src/messageview.c:250
 msgid "Previous opened message"
 msgstr "Message ouvert précédent"
 
-#: src/mainwindow.c:594 src/messageview.c:251
+#: src/mainwindow.c:602 src/messageview.c:251
 msgid "Next opened message"
 msgstr "Message ouvert suivant"
 
-#: src/mainwindow.c:596 src/messageview.c:253
+#: src/mainwindow.c:604 src/messageview.c:253
 msgid "Parent message"
 msgstr "Message paren_t"
 
-#: src/mainwindow.c:598 src/messageview.c:255
+#: src/mainwindow.c:606 src/messageview.c:255
 msgid "Next unread _folder"
 msgstr "Do_ssier non lu suivant"
 
-#: src/mainwindow.c:599 src/messageview.c:256
+#: src/mainwindow.c:607 src/messageview.c:256
 msgid "F_older..."
 msgstr "Dossier..."
 
-#: src/mainwindow.c:601 src/messageview.c:258 src/mimeview.c:201
+#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:229
 msgid "Next part"
 msgstr "Partie suivante"
 
-#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:202
+#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:230
 msgid "Previous part"
 msgstr "Partie précédente"
 
-#: src/mainwindow.c:605 src/messageview.c:260
+#: src/mainwindow.c:613 src/messageview.c:260
 msgid "Message scroll"
 msgstr "Défilement du message"
 
-#: src/mainwindow.c:606 src/messageview.c:261
+#: src/mainwindow.c:614 src/messageview.c:261
 msgid "Previous line"
 msgstr "Ligne précédente"
 
-#: src/mainwindow.c:607 src/messageview.c:262
+#: src/mainwindow.c:615 src/messageview.c:262
 msgid "Next line"
 msgstr "Ligne suivante"
 
-#: src/mainwindow.c:608 src/messageview.c:263 src/printing.c:475
+#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:475
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
+#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:481
 msgid "Next page"
 msgstr "Page suivante"
 
-#: src/mainwindow.c:627 src/messageview.c:282
+#: src/mainwindow.c:635 src/messageview.c:282
 msgid "Decode"
 msgstr "Décoda_ge"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:642
 msgid "Open in new _window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: src/mainwindow.c:635 src/messageview.c:289
+#: src/mainwindow.c:643 src/messageview.c:289
 msgid "Mess_age source"
 msgstr "Code _source du message.."
 
-#: src/mainwindow.c:637 src/messageview.c:290
+#: src/mainwindow.c:645 src/messageview.c:290
 msgid "Message part"
 msgstr "Message"
 
-#: src/mainwindow.c:638 src/messageview.c:291
+#: src/mainwindow.c:646 src/messageview.c:291
 msgid "View as text"
 msgstr "Afficher comme du texte"
 
-#: src/mainwindow.c:639 src/messageview.c:292 src/toolbar.c:494
+#: src/mainwindow.c:647 src/messageview.c:292 src/toolbar.c:494
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/mainwindow.c:641 src/messageview.c:294
+#: src/mainwindow.c:649 src/messageview.c:294
 msgid "Open with..."
 msgstr "Ouvrir avec.."
 
-#: src/mainwindow.c:645 src/messageview.c:297
+#: src/mainwindow.c:653 src/messageview.c:297
 msgid "Quotes"
 msgstr "_Citations"
 
-#: src/mainwindow.c:647
+#: src/mainwindow.c:655
 msgid "_Update summary"
 msgstr "Mettre à jo_ur"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:658
 msgid "Recei_ve"
 msgstr "Réce_ption"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:659
 msgid "Get from _current account"
 msgstr "Relever le courrier du compte _courant"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:660
 msgid "Get from _all accounts"
 msgstr "Relever le courrier de _tous les comptes"
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:661
 msgid "Cancel receivin_g"
 msgstr "_Interrompre la relève du courrier"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:664
 msgid "_Send queued messages"
 msgstr "En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:669
 msgid "Compose a_n email message"
 msgstr "Composer un _nouveau message"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:670
 msgid "Compose a news message"
 msgstr "Composer un _article de groupe de discussion"
 
-#: src/mainwindow.c:664 src/messageview.c:303
-#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:428
+#: src/mainwindow.c:672 src/messageview.c:303
+#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:429
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: src/mainwindow.c:665 src/messageview.c:304 src/summaryview.c:429
+#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:430
 msgid "Repl_y to"
 msgstr "Rép_ondre à"
 
-#: src/mainwindow.c:668 src/messageview.c:307 src/summaryview.c:432
+#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:433
 msgid "Mailing _list"
 msgstr "_Liste de diffusion"
 
-#: src/mainwindow.c:669
+#: src/mainwindow.c:677
 msgid "Follow-up and reply to"
 msgstr "Donner suite _et répondre à"
 
-#: src/mainwindow.c:672 src/messageview.c:310 src/summaryview.c:434
+#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:435
 #: src/toolbar.c:2449
 msgid "_Forward"
 msgstr "_Transférer"
 
-#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:435
+#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:436
 #: src/toolbar.c:2450
 msgid "For_ward as attachment"
 msgstr "Transférer en _pièce jointe"
 
-#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:436
+#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:437
 #: src/toolbar.c:2451
 msgid "Redirec_t"
 msgstr "Rediri_ger"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:684
 msgid "Mailing-_List"
 msgstr "_Liste de diffusion"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:685
 msgid "Post"
 msgstr "Écrire à la liste"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:687
 msgid "Help"
 msgstr "_Aide"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:691
 msgid "Unsubscribe"
 msgstr "Se _désinscrire"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:693
 msgid "View archive"
 msgstr "Voir l'archive"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:695
 msgid "Contact owner"
 msgstr "Contacter le _propriétaire"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:699
 msgid "M_ove..."
 msgstr "_Déplacer.."
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:700
 msgid "_Copy..."
 msgstr "_Copier.."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:701
 msgid "Move to _trash"
 msgstr "Déplacer ver_s la corbeille"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:702
 msgid "_Delete..."
 msgstr "S_upprimer définitivement.."
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:703
 msgid "Move thread to tr_ash"
 msgstr "Déplacer ver_s la corbeille"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:704
 msgid "Delete t_hread"
 msgstr "S_upprimer la discussion"
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:705
 msgid "Cancel a news message"
 msgstr "E_ffacer un article du serveur"
 
-#: src/mainwindow.c:700 src/mainwindow.c:701 src/summaryview.c:437
+#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:438
 msgid "_Mark"
 msgstr "_Marquer"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:710
 msgid "_Unmark"
 msgstr "_Démarquer"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:713
 msgid "Mark as rea_d"
 msgstr "Marquer comme _lu"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:714
 msgid "Mark as unr_ead"
 msgstr "Marquer comme _non lu"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:716
 msgid "Mark all read"
 msgstr "Marquer _tous comme lus"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:717
 msgid "Mark all unread"
 msgstr "Marquer _tous comme non lus"
 
-#: src/mainwindow.c:711 src/prefs_filtering_action.c:193 src/toolbar.c:242
+#: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
 #: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr "Ignorer du fil de discussion"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:720
 msgid "Unignore thread"
 msgstr "Inclure dans fil de discussion"
 
-#: src/mainwindow.c:713 src/prefs_filtering_action.c:194 src/toolbar.c:243
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:194 src/toolbar.c:243
 #: src/toolbar.c:504
 msgid "Watch thread"
 msgstr "Suivre le fil de discussion"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:722
 msgid "Unwatch thread"
 msgstr "Ne plus sui_vre le fil"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:725
 msgid "Mark as _spam"
 msgstr "Marquer comme _pourriel"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:726
 msgid "Mark as _ham"
 msgstr "Marquer comme courrier _légitime"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:177 src/toolbar.c:507
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:177 src/toolbar.c:507
 msgid "Lock"
 msgstr "Bloquer"
 
-#: src/mainwindow.c:722 src/prefs_filtering_action.c:178 src/toolbar.c:508
+#: src/mainwindow.c:730 src/prefs_filtering_action.c:178 src/toolbar.c:508
 msgid "Unlock"
 msgstr "Débloquer"
 
-#: src/mainwindow.c:724 src/summaryview.c:438
+#: src/mainwindow.c:732 src/summaryview.c:439
 msgid "Color la_bel"
 msgstr "C_olorier"
 
-#: src/mainwindow.c:725 src/summaryview.c:439
+#: src/mainwindow.c:733 src/summaryview.c:440
 msgid "Ta_gs"
 msgstr "La_bels"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:736
 msgid "Re-_edit"
 msgstr "Rééd_iter"
 
-#: src/mainwindow.c:731 src/messageview.c:313 src/mimeview.c:1016
+#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1047
 msgid "Check signature"
 msgstr "Vérifier la signature"
 
-#: src/mainwindow.c:736 src/messageview.c:317
+#: src/mainwindow.c:744 src/messageview.c:317
 msgid "Add sender to address boo_k"
 msgstr "A_jouter l'expéditeur·rice au carnet d'adresses"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:746
 msgid "C_ollect addresses"
 msgstr "Récupération des adresses"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:747
 msgid "From current _folder..."
 msgstr "À partir du dossier actuel.."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:748
 msgid "From selected _messages..."
 msgstr "À partir des _messages sélectionnés.."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:751
 msgid "_Filter all messages in folder"
 msgstr "_Filtrer tous les messages du dossier"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:752
 msgid "Filter _selected messages"
 msgstr "Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:753
 msgid "Run folder pr_ocessing rules"
 msgstr "Exéc_uter les règles de traitement du dossier courant"
 
-#: src/mainwindow.c:747 src/messageview.c:320
+#: src/mainwindow.c:755 src/messageview.c:320
 msgid "_Create filter rule"
 msgstr "Créer une _règle de filtrage"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
+#: src/mainwindow.c:756 src/mainwindow.c:762 src/messageview.c:321
 #: src/messageview.c:327
 msgid "_Automatically"
 msgstr "_Automatiquement"
 
-#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
+#: src/mainwindow.c:757 src/mainwindow.c:763 src/mainwindow.c:870
 #: src/messageview.c:322 src/messageview.c:328
 msgid "By _From"
 msgstr "Par « De: »"
 
-#: src/mainwindow.c:750 src/mainwindow.c:756 src/mainwindow.c:860
+#: src/mainwindow.c:758 src/mainwindow.c:764 src/mainwindow.c:871
 #: src/messageview.c:323 src/messageview.c:329
 msgid "By _To"
 msgstr "Par « À: »"
 
-#: src/mainwindow.c:751 src/mainwindow.c:757 src/messageview.c:324
+#: src/mainwindow.c:759 src/mainwindow.c:765 src/messageview.c:324
 #: src/messageview.c:330
 msgid "By _Subject"
 msgstr "Par _Sujet"
 
-#: src/mainwindow.c:753 src/messageview.c:326 src/summaryview.c:442
+#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:443
 msgid "Create processing rule"
 msgstr "Créer une règle de traite_ment"
 
-#: src/mainwindow.c:760 src/messageview.c:333
+#: src/mainwindow.c:768 src/messageview.c:333
 msgid "List _URLs..."
 msgstr "_Liste d'URLs.."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:775
 msgid "Ch_eck for new messages in all folders"
 msgstr "Recherche de _nouveaux messages dans tous les dossiers"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:776
 msgid "Delete du_plicated messages"
 msgstr "Supprimer les messages en _double"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:777
 msgid "In selected folder"
 msgstr "Dans le dossier sélectionné"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:778
 msgid "In all folders"
 msgstr "Dans tous les dossiers"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:781
 msgid "E_xecute"
 msgstr "E_xécuter"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:782
 msgid "Exp_unge"
 msgstr "P_urger"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:785
 msgid "SSL/TLS cer_tificates"
 msgstr "C_ertificats SSL/TLS"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:788
 msgid "Filtering Lo_g"
 msgstr "Traces de _filtrage"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:789
 msgid "Network _Log"
 msgstr "Traces _réseau"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:791
+msgid "Debug _Log"
+msgstr "Traces de débogage"
+
+#: src/mainwindow.c:794
 msgid "_Forget all session passwords"
 msgstr "Oublier tous mots de passe des sessions"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "Forget _master passphrase"
 msgstr "Oublier la phrase secrète principale"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "C_hange current account"
 msgstr "_Sélectionner un autre compte"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "_Preferences for current account..."
 msgstr "_Configuration du compte courant.."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "Create _new account..."
 msgstr "Création d'un _nouveau compte.."
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "_Edit accounts..."
 msgstr "Édition des _comptes.."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "P_references..."
 msgstr "_Préférences.."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "Pre-pr_ocessing..."
 msgstr "P_ré-traitement.."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "Post-pro_cessing..."
 msgstr "P_ost-traitement.."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:810
 msgid "_Filtering..."
 msgstr "_Filtrage des messages.."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:811
 msgid "_Templates..."
 msgstr "_Modèles.."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:812
 msgid "_Actions..."
 msgstr "_Actions.."
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:813
 msgid "Tag_s..."
 msgstr "_Labels.."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:815
 msgid "Plu_gins..."
 msgstr "Mo_dules.."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:818
 msgid "_Manual"
 msgstr "_Manuel"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:819
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ en ligne autogérée"
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:820
 msgid "Icon _Legend"
 msgstr "_Légende des icônes"
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:822
 msgid "Set as default client"
 msgstr "Définir comme client par défaut"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:829
 msgid "Offline _mode"
 msgstr "_Mode hors-ligne"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:830
 msgid "Men_ubar"
 msgstr "Barre de Men_u"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:831
 msgid "_Message view"
 msgstr "Vue du _message"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:833
 msgid "Status _bar"
 msgstr "_Barre d'état"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:835
 msgid "Column headers"
 msgstr "_En-tête de colonnes"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:836
 msgid "Th_read view"
 msgstr "Vue par _fil de discussion"
 
-#: src/mainwindow.c:826 src/prefs_summaries.c:646
+#: src/mainwindow.c:837 src/prefs_summaries.c:646
 msgid "Hide read threads"
 msgstr "Cacher les fils lus"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:838
 msgid "_Hide read messages"
 msgstr "Cacher les messages _lus"
 
-#: src/mainwindow.c:828 src/prefs_summaries.c:652
+#: src/mainwindow.c:839 src/prefs_summaries.c:652
 msgid "Hide deleted messages"
 msgstr "Cacher les messages supprimés"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:840
 msgid "_Fullscreen"
 msgstr "Plei_n écran"
 
-#: src/mainwindow.c:830 src/messageview.c:345
+#: src/mainwindow.c:841 src/messageview.c:345
 msgid "Show all _headers"
 msgstr "Tous les _en-têtes"
 
-#: src/mainwindow.c:831 src/messageview.c:346
+#: src/mainwindow.c:842 src/messageview.c:346
 msgid "_Collapse all"
 msgstr "Re_plier tout"
 
-#: src/mainwindow.c:832 src/messageview.c:347
+#: src/mainwindow.c:843 src/messageview.c:347
 msgid "Collapse from level _2"
 msgstr "Replier à partir du niveau _2"
 
-#: src/mainwindow.c:833 src/messageview.c:348
+#: src/mainwindow.c:844 src/messageview.c:348
 msgid "Collapse from level _3"
 msgstr "Replier à partir du niveau _3"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:848
 msgid "Text _below icons"
 msgstr "Texte _sous les icônes"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:849
 msgid "Text be_side icons"
 msgstr "Texte _contre les icônes"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:850
 msgid "_Icons only"
 msgstr "_Icônes seules"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:851
 msgid "_Text only"
 msgstr "_Texte seul"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:858
 msgid "_Standard"
 msgstr "_Classique"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:859
 msgid "_Three columns"
 msgstr "_Trois colonnes"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:860
 msgid "_Wide message"
 msgstr "Vue des _messages étendue"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:861
 msgid "W_ide message list"
 msgstr "_Liste des messages étendue"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:862
 msgid "S_mall screen"
 msgstr "_Petit écran"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:866
 msgid "By _number"
 msgstr "Par _numéro"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:867
 msgid "By s_ize"
 msgstr "Par taille"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:868
 msgid "By _date"
 msgstr "Par da_te"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:869
 msgid "By thread date"
 msgstr "Par date du _fil"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:872
 msgid "By s_ubject"
 msgstr "Par s_ujet"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:873
 msgid "By _color label"
 msgstr "Par _couleur"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:874
 msgid "By tag"
 msgstr "Par _label"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:875
 msgid "By _mark"
 msgstr "Par _marque"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:876
 msgid "By _status"
 msgstr "Par ét_at"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:877
 msgid "By a_ttachment"
 msgstr "Par _pièce jointe"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:878
 msgid "By score"
 msgstr "Par sc_ore"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:879
 msgid "By locked"
 msgstr "Par _verrouillés"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:880
 msgid "D_on't sort"
 msgstr "Ne pas tr_ier"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:633
+#: src/mainwindow.c:884 src/prefs_summaries.c:633
 msgid "Ascending"
 msgstr "Ascendant"
 
-#: src/mainwindow.c:874 src/prefs_summaries.c:634
+#: src/mainwindow.c:885 src/prefs_summaries.c:634
 msgid "Descending"
 msgstr "Descendant"
 
-#: src/mainwindow.c:916 src/messageview.c:390
+#: src/mainwindow.c:927 src/messageview.c:390
 msgid "_Auto detect"
 msgstr "Détection _automatique"
 
-#: src/mainwindow.c:1294 src/summaryview.c:6470
+#: src/mainwindow.c:1305 src/summaryview.c:6515
 msgid "Apply tags..."
 msgstr "Appliquer des labels.."
 
-#: src/mainwindow.c:1947
+#: src/mainwindow.c:1961
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "Une ou plusieurs erreurs sont survenues. Cliquer ici pour voir les traces."
 
-#: src/mainwindow.c:1962
+#: src/mainwindow.c:1976
 msgid "You are online. Click the icon to go offline"
 msgstr "Vous êtes en ligne. Cliquer sur l'icône pour aller hors-ligne."
 
-#: src/mainwindow.c:1965
+#: src/mainwindow.c:1979
 msgid "You are offline. Click the icon to go online"
 msgstr "Vous êtes hors-ligne. Cliquer sur l'icône pour aller en ligne."
 
-#: src/mainwindow.c:1979
+#: src/mainwindow.c:1993
 msgid "Select account"
 msgstr "Sélectionner un compte"
 
-#: src/mainwindow.c:2006 src/prefs_logging.c:136
+#: src/mainwindow.c:2020 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Traces réseau"
 
-#: src/mainwindow.c:2010
+#: src/mainwindow.c:2024
 msgid "Filtering/Processing debug log"
 msgstr "Traces de débogage du filtrage/traitement"
 
-#: src/mainwindow.c:2029 src/prefs_logging.c:378
+#: src/mainwindow.c:2043 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "Le traçage du filtrage est activé.\n"
 
-#: src/mainwindow.c:2031 src/prefs_logging.c:380
+#: src/mainwindow.c:2045 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "Le traçage du filtrage est désactivé.\n"
 
-#: src/mainwindow.c:2465 src/mainwindow.c:2472 src/mainwindow.c:2515
-#: src/mainwindow.c:2548 src/mainwindow.c:2580 src/mainwindow.c:2625
+#: src/mainwindow.c:2479 src/mainwindow.c:2486 src/mainwindow.c:2529
+#: src/mainwindow.c:2562 src/mainwindow.c:2594 src/mainwindow.c:2639
 #: src/plugins/notification/notification_trayicon.c:372
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1087
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:2626 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2640 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "rien"
 
-#: src/mainwindow.c:2883 src/mainwindow.c:2888
+#: src/mainwindow.c:2897 src/mainwindow.c:2902
 msgid "Delete all messages in trash folders?"
 msgstr ""
 "Voulez-vous vraiment supprimer tous les messages de toutes les corbeilles ?"
 
-#: src/mainwindow.c:2884
+#: src/mainwindow.c:2898
 msgid "Don't quit"
 msgstr "Ne pas quitter"
 
-#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:2916
+#: src/mainwindow.c:2930
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7914,18 +7930,18 @@ msgstr ""
 "de l'utilisateur.\n"
 "Si elle existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2938 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La boîte aux lettres '%s' existe déjà."
 
-#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:742
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2948 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 "
@@ -7935,55 +7951,55 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:3415
+#: src/mainwindow.c:3430
 msgid "No posting allowed"
 msgstr "Envoi de message non autorisé"
 
-#: src/mainwindow.c:3997
+#: src/mainwindow.c:4012
 msgid "Mbox import has failed."
 msgstr "L'importation mbox a échoué."
 
-#: src/mainwindow.c:4006 src/mainwindow.c:4015
+#: src/mainwindow.c:4021 src/mainwindow.c:4030
 msgid "Export to mbox has failed."
 msgstr "L'exportation mbox a échoué."
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4071 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4071 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Voulez-vous vraiment quitter Claws Mail ?"
 
-#: src/mainwindow.c:4257
+#: src/mainwindow.c:4272
 msgid "Folder synchronisation"
 msgstr "Synchronisation de dossiers distants"
 
-#: src/mainwindow.c:4258
+#: src/mainwindow.c:4273
 msgid "Do you want to synchronise your folders now?"
 msgstr "Voulez-vous vraiment synchroniser vos dossiers distants ?"
 
-#: src/mainwindow.c:4259
+#: src/mainwindow.c:4274
 msgid "_Synchronise"
 msgstr "_Synchroniser"
 
-#: src/mainwindow.c:4704
+#: src/mainwindow.c:4747
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double.."
 
-#: src/mainwindow.c:4714
+#: src/mainwindow.c:4757
 msgid "No duplicate message found in selected folder.\n"
 msgstr ""
 "Aucun message en double n'a pu être trouvé dans le dossier sélectionné.\n"
 
-#: src/mainwindow.c:4720
+#: src/mainwindow.c:4763
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "%d message en double supprimé dans le dossier sélectionné.\n"
 msgstr[1] "%d messages en double supprimés dans le dossier sélectionné.\n"
 
-#: src/mainwindow.c:4724
+#: src/mainwindow.c:4767
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
@@ -7992,61 +8008,61 @@ msgstr[0] ""
 msgstr[1] ""
 "%d messages en double marqués pour suppression dans le dossier sélectionné.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4805
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Suppression des messages en double dans tous les dossiers.."
 
-#: src/mainwindow.c:4768
+#: src/mainwindow.c:4811
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d message en double supprimé dans %d dossier.\n"
 msgstr[1] "%d messages en double supprimés dans %d dossiers.\n"
 
-#: src/mainwindow.c:4773
+#: src/mainwindow.c:4816
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Aucune message en double trouvé dans %d dossiers.\n"
 
-#: src/mainwindow.c:4935 src/messageview.c:2662
+#: src/mainwindow.c:4978 src/messageview.c:2622
 msgid "Select folder to go to"
 msgstr "Sélection du dossier à atteindre"
 
-#: src/mainwindow.c:5036 src/summaryview.c:5913
+#: src/mainwindow.c:5079 src/summaryview.c:5958
 msgid "Processing rules to apply before folder rules"
 msgstr "Règles de traitement à appliquer avant le filtrage des dossiers"
 
-#: src/mainwindow.c:5044
+#: src/mainwindow.c:5087
 msgid "Processing rules to apply after folder rules"
 msgstr "Règles de traitement à appliquer après le filtrage des dossiers"
 
-#: src/mainwindow.c:5052 src/summaryview.c:5924
+#: src/mainwindow.c:5095 src/summaryview.c:5969
 msgid "Filtering configuration"
 msgstr "Règles de filtrage"
 
-#: src/mainwindow.c:5167
+#: src/mainwindow.c:5210
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Impossible d'enregistrer le client par défaut : impossible de récupérer le "
 "chemin du binaire."
 
-#: src/mainwindow.c:5226
+#: src/mainwindow.c:5269
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail est maintenant le client par défaut."
 
-#: src/mainwindow.c:5228
+#: src/mainwindow.c:5271
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Impossible d'enregistrer le client par défaut : écriture impossible dans la "
 "base de registre."
 
-#: src/mainwindow.c:5242 src/setup.c:91
+#: src/mainwindow.c:5285 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Analyse du dossier %s%c%s.."
 
-#: src/mainwindow.c:5386
+#: src/mainwindow.c:5429
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8126,8 +8142,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:541 src/messageview.c:1846 src/mimeview.c:1845
-#: src/prefs_themes.c:596 src/textview.c:3129
+#: src/mbox.c:541 src/mimeview.c:1888 src/prefs_themes.c:596
 msgid "Overwrite"
 msgstr "Écraser"
 
@@ -8172,7 +8187,7 @@ msgstr "Fin de message atteint, reprendre depuis le début ?"
 msgid "Search finished"
 msgstr "Recherche terminée"
 
-#: src/messageview.c:300 src/textview.c:253
+#: src/messageview.c:300 src/textview.c:249
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
@@ -8208,7 +8223,7 @@ msgstr "_Ne pas envoyer"
 msgid "Fetching message (%s)..."
 msgstr "Lecture du message (%s) en cours.."
 
-#: src/messageview.c:1402 src/procmime.c:956
+#: src/messageview.c:1402 src/procmime.c:957
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Déchiffrement impossible : %s"
@@ -8218,32 +8233,16 @@ 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:1838 src/messageview.c:1841 src/mimeview.c:2050
-#: src/plugins/fancy/fancy_viewer.c:692 src/summaryview.c:5016
-#: src/summaryview.c:5019 src/textview.c:3117
-msgid "Save as"
-msgstr "Enregistrer sous"
-
-#: src/messageview.c:1847
-msgid "Overwrite existing file?"
-msgstr "Écraser le fichier existant ?"
-
-#: src/messageview.c:1855 src/summaryview.c:5036 src/summaryview.c:5039
-#: src/summaryview.c:5054
-#, c-format
-msgid "Couldn't save the file '%s'."
-msgstr "Impossible d'enregistrer le fichier « %s »."
-
-#: src/messageview.c:1908
+#: src/messageview.c:1868
 #, c-format
 msgid "Show all %s."
 msgstr "Afficher l'ensemble des %s."
 
-#: src/messageview.c:1910
+#: src/messageview.c:1870
 msgid "Only the first megabyte of text is shown."
 msgstr "Seul le premier méga-octet de texte est affiché."
 
-#: src/messageview.c:1941
+#: src/messageview.c:1901
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8251,19 +8250,19 @@ msgstr ""
 "Vous avez demandé un accusé de réception pour ce message : le message a été "
 "affiché par le/la destinataire."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1904
 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:1950
+#: src/messageview.c:1910
 msgid "This message asks for a return receipt."
 msgstr "Ce message demande l'envoi d'un accusé de réception."
 
-#: src/messageview.c:1951
+#: src/messageview.c:1911
 msgid "Send receipt"
 msgstr "Envoyer"
 
-#: src/messageview.c:1994
+#: src/messageview.c:1954
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8271,7 +8270,7 @@ msgstr ""
 "Ce message a été partiellement récupéré,\n"
 "et a été supprimé du serveur."
 
-#: src/messageview.c:2000
+#: src/messageview.c:1960
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8280,16 +8279,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:2004 src/messageview.c:2026
+#: src/messageview.c:1964 src/messageview.c:1986
 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:2005 src/messageview.c:2017
+#: src/messageview.c:1965 src/messageview.c:1977
 msgid "Mark for deletion"
 msgstr "Supprimer"
 
-#: src/messageview.c:2010
+#: src/messageview.c:1970
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8298,12 +8297,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:2015 src/messageview.c:2028
+#: src/messageview.c:1975 src/messageview.c:1988
 #: src/prefs_filtering_action.c:176 src/toolbar.c:506
 msgid "Unmark"
 msgstr "Démarquer"
 
-#: src/messageview.c:2021
+#: src/messageview.c:1981
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8312,7 +8311,7 @@ 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:2098
+#: src/messageview.c:2058
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -8326,20 +8325,20 @@ msgstr ""
 "destinataire officiel.\n"
 "Il est conseillé de ne pas envoyer cet accusé de réception."
 
-#: src/messageview.c:2106 src/messageview.c:2114
+#: src/messageview.c:2066 src/messageview.c:2074
 msgid "Return Receipt Notification"
 msgstr "Accusé de réception."
 
-#: src/messageview.c:2108 src/messageview.c:2119
+#: src/messageview.c:2068 src/messageview.c:2079
 #: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: src/messageview.c:2108 src/messageview.c:2119
+#: src/messageview.c:2068 src/messageview.c:2079
 msgid "_Send Notification"
 msgstr "_Envoyer"
 
-#: src/messageview.c:2115
+#: src/messageview.c:2075
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8351,11 +8350,11 @@ msgstr ""
 "Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accusé "
 "de réception :"
 
-#: src/messageview.c:2211
+#: src/messageview.c:2171
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossible d'imprimer : le message ne contient pas de texte."
 
-#: src/messageview.c:2972
+#: src/messageview.c:2932
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8363,7 +8362,7 @@ msgstr ""
 "\n"
 " Il n'y a pas de messages dans ce dossier"
 
-#: src/messageview.c:2980
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8371,7 +8370,7 @@ msgstr ""
 "\n"
 " Le message a été supprimé"
 
-#: src/messageview.c:2981
+#: src/messageview.c:2941
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8379,8 +8378,8 @@ msgstr ""
 "\n"
 " Le message a été supprimé ou déplacé vers un autre dossier"
 
-#: src/messageview.c:3014 src/messageview.c:3020 src/summaryview.c:4414
-#: src/summaryview.c:7275
+#: src/messageview.c:2974 src/messageview.c:2980 src/summaryview.c:4440
+#: src/summaryview.c:7320
 msgid "An error happened while learning.\n"
 msgstr "Erreur lors de l'opération d'apprentissage du module SpamAssassin.\n"
 
@@ -8421,60 +8420,64 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Enlèvement de boîte aux lettres"
 
-#: src/mimeview.c:193
+#: src/mimeview.c:220
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: src/mimeview.c:195
+#: src/mimeview.c:222
 msgid "Open _with..."
 msgstr "Ouvrir a_vec.."
 
-#: src/mimeview.c:197
+#: src/mimeview.c:224 src/prefs_filtering_action.c:172
+msgid "Copy"
+msgstr "Copier"
+
+#: src/mimeview.c:225
 msgid "Send to..."
 msgstr "Envoyer à.."
 
-#: src/mimeview.c:198
+#: src/mimeview.c:226
 msgid "_Display as text"
 msgstr "_Afficher comme du texte"
 
-#: src/mimeview.c:199
+#: src/mimeview.c:227
 msgid "_Save as..."
 msgstr "Enregi_strer sous.."
 
-#: src/mimeview.c:200
+#: src/mimeview.c:228
 msgid "Save _all..."
 msgstr "_Enregistrer tout sous.."
 
-#: src/mimeview.c:273
+#: src/mimeview.c:301
 msgid "MIME Type"
 msgstr "Type MIME"
 
-#: src/mimeview.c:1021 src/mimeview.c:1026 src/mimeview.c:1031
-#: src/mimeview.c:1036
+#: src/mimeview.c:1052 src/mimeview.c:1057 src/mimeview.c:1062
+#: src/mimeview.c:1067
 msgid "View full information"
 msgstr "Voir l'ensemble des informations"
 
-#: src/mimeview.c:1042
+#: src/mimeview.c:1073
 msgid "Check again"
 msgstr "Vérifier à nouveau"
 
-#: src/mimeview.c:1054
+#: src/mimeview.c:1085
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Cliquer sur l'icône pour la vérifier."
 
-#: src/mimeview.c:1056
+#: src/mimeview.c:1087
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Cliquer sur l'icône ou presser la touche '%s' pour la vérifier."
 
-#: src/mimeview.c:1066
+#: src/mimeview.c:1097
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Délai d'attente dépassé durant la vérification de la signature. Cliquer sur "
 "l'icône pour essayer à nouveau."
 
-#: src/mimeview.c:1068
+#: src/mimeview.c:1099
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8482,27 +8485,27 @@ msgstr ""
 "Délai d'attente dépassé durant la vérification de la signature. Cliquer sur "
 "l'icône ou appuyer sur '%s' pour essayer à nouveau."
 
-#: src/mimeview.c:1308
+#: src/mimeview.c:1344
 msgid "Checking signature..."
 msgstr "Vérification de la signature en cours.."
 
-#: src/mimeview.c:1349
+#: src/mimeview.c:1385
 msgid "Go back to email"
 msgstr "Revenir à l'email"
 
-#: src/mimeview.c:1763 src/mimeview.c:1855 src/mimeview.c:2097
-#: src/mimeview.c:2133 src/mimeview.c:2245 src/plugins/fancy/fancy_viewer.c:440
+#: src/mimeview.c:1806 src/mimeview.c:1898 src/mimeview.c:2140
+#: src/mimeview.c:2176 src/mimeview.c:2288 src/plugins/fancy/fancy_viewer.c:440
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 "Échec lors de l'enregistrement d'une partie d'un message multipart : %s"
 
-#: src/mimeview.c:1842 src/textview.c:3127
+#: src/mimeview.c:1885
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Écraser le fichier existant « %s » ?"
 
-#: src/mimeview.c:1866
+#: src/mimeview.c:1909
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8511,54 +8514,59 @@ msgstr ""
 "Une erreur est survenue lors de l'enregistrement de la partie #%d du "
 "message. Voulez-vous annuler l'opération, ou ignorer l'erreur et continuer ?"
 
-#: src/mimeview.c:1869
+#: src/mimeview.c:1912
 msgid "Error saving all message parts"
 msgstr "Erreur lors de l'enregistrement des parties du message"
 
-#: src/mimeview.c:1870
+#: src/mimeview.c:1913
 msgid "Skip"
 msgstr "Ignorer"
 
-#: src/mimeview.c:1870
+#: src/mimeview.c:1913
 msgid "Skip all"
 msgstr "Tout ignorer"
 
-#: src/mimeview.c:1880
+#: src/mimeview.c:1923
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d fichier enregistré avec succès."
 msgstr[1] "%d fichiers enregistrés avec succès."
 
-#: src/mimeview.c:1888
+#: src/mimeview.c:1931
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d fichier enregistré avec succès"
 msgstr[1] "%d fichiers enregistrés avec succès."
 
-#: src/mimeview.c:1893
+#: src/mimeview.c:1936
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d fichier en échec."
 msgstr[1] "%s, %d fichiers en échec."
 
-#: src/mimeview.c:1926 src/plugins/archive/archiver_prefs.c:142
+#: src/mimeview.c:1969 src/plugins/archive/archiver_prefs.c:142
 #: src/prefs_filtering_action.c:1262
 msgid "Select destination folder"
 msgstr "Sélection du dossier de destination"
 
-#: src/mimeview.c:1933 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1976 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "« %s » n'est pas un dossier."
 
-#: src/mimeview.c:2180 src/mimeview.c:2187 src/textview.c:3044
+#: src/mimeview.c:2093 src/plugins/fancy/fancy_viewer.c:693
+#: src/summaryview.c:5052
+msgid "Save as"
+msgstr "Enregistrer sous"
+
+#: src/mimeview.c:2223 src/mimeview.c:2230
 msgid "Open with"
 msgstr "Ouvrir avec"
 
-#: src/mimeview.c:2181 src/mimeview.c:2188 src/textview.c:3045
+#: src/mimeview.c:2224 src/mimeview.c:2231
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8567,7 +8575,7 @@ msgstr ""
 "Sisir la ligne de commande pour ouvrir le fichier :\n"
 "('%s' sera remplacé par le chemin du fichier)"
 
-#: src/mimeview.c:2283
+#: src/mimeview.c:2326
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8578,11 +8586,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2291
+#: src/mimeview.c:2334
 msgid "Execute untrusted binary?"
 msgstr "Exécuter un binaire inconnu ?"
 
-#: src/mimeview.c:2292
+#: src/mimeview.c:2335
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8595,20 +8603,20 @@ msgstr ""
 "\n"
 "Voulez-vous exécuter ce binaire ?"
 
-#: src/mimeview.c:2296
+#: src/mimeview.c:2339
 msgid "Run binary"
 msgstr "Exécuter le binaire"
 
-#: src/mimeview.c:2599 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2642 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "Type :"
 
-#: src/mimeview.c:2600 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2787
+#: src/mimeview.c:2643 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2808
 msgid "Size:"
 msgstr "Taille :"
 
-#: src/mimeview.c:2614 src/plugins/vcalendar/vcalendar.c:1254
+#: src/mimeview.c:2657 src/plugins/vcalendar/vcalendar.c:1240
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 msgid "Description:"
@@ -8624,7 +8632,7 @@ msgstr "La connexion NNTP vers %s:%d a été coupée.\n"
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Compte '%s' : Connexion au serveur SMTP : %s:%d..\n"
 
-#: src/news.c:371
+#: src/news.c:372
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Erreur de connexion à %s:%d..\n"
@@ -8661,7 +8669,7 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "Impossible de sélectionner le groupe : %s\n"
 
-#: src/news.c:1067 src/news.c:1245
+#: src/news.c:1067 src/news.c:1253
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "Impossible de définir le groupe : %s\n"
@@ -8671,24 +8679,24 @@ msgstr "Impossible de définir le groupe : %s\n"
 msgid "invalid article range: %d - %d\n"
 msgstr "Intervalle d'articles invalide : %d - %d\n"
 
-#: src/news.c:1146 src/news.c:1173 src/news.c:1200
+#: src/news.c:1154 src/news.c:1181 src/news.c:1208
 msgid "couldn't get xhdr\n"
 msgstr "Impossible d'obtenir xhdr\n"
 
-#: src/news.c:1238
+#: src/news.c:1246
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Exécution de xover %d - %d sur %s..\n"
 
-#: src/news.c:1253
+#: src/news.c:1261
 msgid "couldn't get xover\n"
 msgstr "Impossible de faire un xover.\n"
 
-#: src/news.c:1270
+#: src/news.c:1278
 msgid "invalid xover line\n"
 msgstr "Ligne xover invalide\n"
 
-#: src/news.c:1472
+#: src/news.c:1480
 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"
@@ -9409,7 +9417,7 @@ msgid "Remove"
 msgstr "Supprimer"
 
 #: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:622
-#: src/prefs_summary_column.c:79 src/summaryview.c:2881
+#: src/prefs_summary_column.c:79 src/summaryview.c:2902
 msgid "Attachment"
 msgstr "Pièces jointes"
 
@@ -9710,7 +9718,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:386 src/prefs_account.c:1636
+#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1639
 msgid "KB"
 msgstr "ko"
 
@@ -10237,15 +10245,14 @@ msgid "Render embedded objects using plugins"
 msgstr "Afficher les objets multimédia joints à l'aide des modules"
 
 #: src/plugins/fancy/fancy_prefs.c:170
-msgid "Open in viewer (remote content is enabled)"
-msgstr ""
-"Ouvrir dans le module (le chargement des données distantes est activé) "
+msgid "Open in Viewer (remote content is enabled)"
+msgstr "Ouvrir dans le module (le chargement des données distantes est activé)"
 
 #: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "Ne rien faire (le chargement des données distantes est désactivé) "
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3944
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3947
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Serveur mandataire"
@@ -10286,8 +10293,8 @@ msgid "When clicking on a link, by default"
 msgstr "Lorsqu'un lien est cliqué, par défaut"
 
 #: src/plugins/fancy/fancy_prefs.c:285
-msgid "Open in external browser"
-msgstr "Ouvrir dans le navigateur"
+msgid "Open in External Browser"
+msgstr "Ouvrir dans le navigateur externe"
 
 #: src/plugins/fancy/fancy_prefs.c:299
 msgid "The CSS in this file will be applied to all HTML parts"
@@ -10296,7 +10303,7 @@ msgstr "Le CSS de ce fichiers sera appliqué à toutes les parties HTML"
 #: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
 #: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1570 src/prefs_account.c:1659 src/prefs_account.c:2210
+#: src/prefs_account.c:1573 src/prefs_account.c:1662 src/prefs_account.c:2213
 #: src/prefs_customheader.c:235
 msgid "Bro_wse"
 msgstr "Pa_rcourir"
@@ -10333,65 +10340,61 @@ msgstr "Activer Java"
 msgid "Open links with external browser"
 msgstr "Ouvrir les liens avec le navigateur externe"
 
-#: src/plugins/fancy/fancy_viewer.c:672
+#: src/plugins/fancy/fancy_viewer.c:673
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Une erreur s'est produite : %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:728
+#: src/plugins/fancy/fancy_viewer.c:733
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s est un flux invalide ou non supporté"
 
-#: src/plugins/fancy/fancy_viewer.c:739
+#: src/plugins/fancy/fancy_viewer.c:744
 msgid "Search the Web"
 msgstr "Chercher sur le Web"
 
-#: src/plugins/fancy/fancy_viewer.c:751
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Open in Viewer"
 msgstr "Ouvrir ici"
 
-#: src/plugins/fancy/fancy_viewer.c:753
-msgid "Open in Viewer (enable remote content)"
-msgstr "Ouvrir ici (activer le contenu distant)"
-
-#: src/plugins/fancy/fancy_viewer.c:762
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Open in Browser"
 msgstr "Ouvrir avec le navigateur"
 
-#: src/plugins/fancy/fancy_viewer.c:772
+#: src/plugins/fancy/fancy_viewer.c:774
 msgid "Open Image"
 msgstr "Ouvrir l'image"
 
-#: src/plugins/fancy/fancy_viewer.c:781
+#: src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Link"
 msgstr "Copier le lien"
 
-#: src/plugins/fancy/fancy_viewer.c:785
+#: src/plugins/fancy/fancy_viewer.c:787
 msgid "Download Link"
 msgstr "Télécharger le lien"
 
-#: src/plugins/fancy/fancy_viewer.c:796
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Save Image As"
 msgstr "Enregistrer l'image sous"
 
-#: src/plugins/fancy/fancy_viewer.c:806
+#: src/plugins/fancy/fancy_viewer.c:808
 msgid "Copy Image"
 msgstr "Copier l'image"
 
-#: src/plugins/fancy/fancy_viewer.c:846
+#: src/plugins/fancy/fancy_viewer.c:848
 msgid "Import feed"
 msgstr "Importer le flux"
 
-#: src/plugins/fancy/fancy_viewer.c:1128
+#: src/plugins/fancy/fancy_viewer.c:1130
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1156
+#: src/plugins/fancy/fancy_viewer.c:1158
 msgid "Fancy HTML Viewer"
 msgstr "Fancy - rendu HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1161
+#: src/plugins/fancy/fancy_viewer.c:1163
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10625,7 +10628,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:199 src/prefs_account.c:1941
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1944
 msgid "Authentication"
 msgstr "Authentification"
 
@@ -10813,8 +10816,8 @@ msgid "Cache refresh interval"
 msgstr "Intervalle de rafraîchissement du cache"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1615
-#: src/prefs_account.c:1772 src/prefs_matcher.c:340 src/prefs_receive.c:180
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1618
+#: src/prefs_account.c:1775 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "heure(s)"
 
@@ -11004,20 +11007,20 @@ msgstr "erreur pendant la session Sieve. Données : %s\n"
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "message non reconnu lors de la session Sieve : %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1152
+#: src/plugins/managesieve/managesieve.c:1153
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve : nouvel essai d'authentification\n"
 
-#: src/plugins/managesieve/managesieve.c:1154
+#: src/plugins/managesieve/managesieve.c:1155
 msgid "Auth method not available"
 msgstr "Méthode d'authentification non disponible"
 
-#: src/plugins/managesieve/managesieve.c:1171
+#: src/plugins/managesieve/managesieve.c:1172
 #, c-format
 msgid "sending error on Sieve session: %s\n"
 msgstr "erreur d'envoi lors de la session Sieve : %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5810
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5850
 msgid "_Filter"
 msgstr "_Filtrer"
 
@@ -11150,7 +11153,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Activer Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1190
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
 msgid "Server information"
 msgstr "Configuration des serveurs"
 
@@ -11202,28 +11205,28 @@ msgstr "Utiliser l'authentification"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1385
-#: src/prefs_account.c:1987
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1388
+#: src/prefs_account.c:1990
 msgid "User ID"
 msgstr "Nom d'utilisateur·rice"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1391
-#: src/prefs_account.c:2010 src/prefs_account.c:2738 src/prefs_account.c:2766
-#: src/prefs_account.c:2963 src/prefs_proxy.c:134 src/wizard.c:1216
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1394
+#: src/prefs_account.c:2013 src/prefs_account.c:2741 src/prefs_account.c:2769
+#: src/prefs_account.c:2966 src/prefs_proxy.c:134 src/wizard.c:1216
 #: src/wizard.c:1636
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1698
-#: src/prefs_account.c:1959
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1701
+#: src/prefs_account.c:1962
 msgid "Authentication method"
 msgstr "Authentification"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1708
-#: src/prefs_account.c:1968 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1711
+#: src/prefs_account.c:1971 src/prefs_send.c:265 src/prefs_send.c:336
 #: src/prefs_themes.c:1114
 msgid "Automatic"
 msgstr "Automatique"
@@ -12155,8 +12158,8 @@ 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:182 src/plugins/rssyl/rssyl_feed_props.c:464
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1779
-#: src/prefs_account.c:2076 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1782
+#: src/prefs_account.c:2079 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minute(s)"
 
@@ -12217,7 +12220,7 @@ msgid "GPG"
 msgstr "GPG"
 
 #: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:918
+#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:920
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -12285,17 +12288,17 @@ msgid ""
 "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 ""
 "La clé de chiffrement n'est pas totalement de confiance.\n"
 "Si vous choisissez de chiffrer le message avec cette clé, vous\n"
-"ne serez pas sûr·e qu'elle sera remise au/à la destinataire désiré.\n"
+"ne serez pas sûr·e qu'elle sera remise au/à la destinataire désiré·e.\n"
 "\n"
-"Clé: ID %s, identité primaire %s <%s>\n"
+"Clé: ID %s, identité primaire %s <%s>\n"
 "\n"
-"Lui faites-vous assez confiance pour pouvoir quand même l'utiliser ?"
+"Avez-vous assez confiance en cette clé pour l'utiliser quand même ?"
 
 #: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
 #: src/privacy.c:270 src/privacy.c:274
@@ -12368,110 +12371,110 @@ msgstr "Mauvaise signature de « %s »"
 msgid "The signature has not been checked"
 msgstr "La signature n'a pas été vérifiée"
 
-#: src/plugins/pgpcore/sgpgme.c:326
+#: src/plugins/pgpcore/sgpgme.c:330
 msgid "Error checking signature: no status\n"
 msgstr "Erreur de vérification de la signature : pas de statut\n"
 
-#: src/plugins/pgpcore/sgpgme.c:344
+#: src/plugins/pgpcore/sgpgme.c:348
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Erreur de vérification de la signature : %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:362
+#: src/plugins/pgpcore/sgpgme.c:366
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la clé (type %s) ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Signature correcte de « %s » (Confiance : %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "UID de clé « %s » expiré\n"
 
-#: src/plugins/pgpcore/sgpgme.c:378
+#: src/plugins/pgpcore/sgpgme.c:382
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Signature expirée de « %s » (Confiance : %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:383
+#: src/plugins/pgpcore/sgpgme.c:387
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "UID de clé « %s » revoqué\n"
 
-#: src/plugins/pgpcore/sgpgme.c:388
+#: src/plugins/pgpcore/sgpgme.c:392
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Mauvaise signature de « %s »\n"
 
-#: src/plugins/pgpcore/sgpgme.c:401
+#: src/plugins/pgpcore/sgpgme.c:405
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid « %s » (Confiance : %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:403
+#: src/plugins/pgpcore/sgpgme.c:407
 msgid "Revoked"
 msgstr "Révoqué"
 
-#: src/plugins/pgpcore/sgpgme.c:408
+#: src/plugins/pgpcore/sgpgme.c:412
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Confiance dans le/la possesseur·euse : %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:409
+#: src/plugins/pgpcore/sgpgme.c:413
 msgid "No key!"
 msgstr "Pas de clé !"
 
-#: src/plugins/pgpcore/sgpgme.c:411
+#: src/plugins/pgpcore/sgpgme.c:415
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de la clé primaire :"
 
-#: src/plugins/pgpcore/sgpgme.c:429
+#: src/plugins/pgpcore/sgpgme.c:433
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "ATTENTION : L'adresse « %s » du signataire ne correspond pas à l'entrée DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:435
+#: src/plugins/pgpcore/sgpgme.c:439
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "L'adresse vérifiée du signataire est « %s »\n"
 
-#: src/plugins/pgpcore/sgpgme.c:469
+#: src/plugins/pgpcore/sgpgme.c:473
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Échec lors de la récupération du contenu du message, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:485
+#: src/plugins/pgpcore/sgpgme.c:489
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Échec lors de l'initialisation des données, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:662
+#: src/plugins/pgpcore/sgpgme.c:666
 msgid "Secret key specification is ambiguous"
 msgstr "La spécification de la clé privée est ambiguë."
 
-#: src/plugins/pgpcore/sgpgme.c:672
+#: src/plugins/pgpcore/sgpgme.c:676
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Clé privée non trouvée (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:685
+#: src/plugins/pgpcore/sgpgme.c:689
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Échec lors de la mise en place de la clé privée : %s"
 
-#: src/plugins/pgpcore/sgpgme.c:778
+#: src/plugins/pgpcore/sgpgme.c:782
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Le protocole Gpgme '%s' est inutilisable : le moteur '%s' n'est pas "
 "correctement installé."
 
-#: src/plugins/pgpcore/sgpgme.c:784
+#: src/plugins/pgpcore/sgpgme.c:788
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12480,12 +12483,12 @@ msgstr ""
 "Le protocole Gpgme '%s' est inutilisable : la version %s du moteur '%s' est "
 "installée alors que la version %s est nécessaire.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:792
+#: src/plugins/pgpcore/sgpgme.c:796
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Le protocole Gpgme '%s' est inutilisable (problème inconnu)."
 
-#: src/plugins/pgpcore/sgpgme.c:808
+#: src/plugins/pgpcore/sgpgme.c:812
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12493,7 +12496,7 @@ msgstr ""
 "GnuPG n'est pas correctement installé ou doit être mis à jour.\n"
 "Support OpenPGP désactivé."
 
-#: src/plugins/pgpcore/sgpgme.c:885
+#: src/plugins/pgpcore/sgpgme.c:889
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12501,11 +12504,11 @@ msgstr ""
 "Vous devez enregistrer les paramètres du compte par « OK » avant de pouvoir "
 "générer une paire de clé.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:890
+#: src/plugins/pgpcore/sgpgme.c:894
 msgid "No PGP key found"
 msgstr "Pas de clé PGP trouvée"
 
-#: src/plugins/pgpcore/sgpgme.c:891
+#: src/plugins/pgpcore/sgpgme.c:895
 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"
@@ -12515,12 +12518,12 @@ msgstr ""
 "impossible de signer des messages ou en recevoir des chiffrés.\n"
 "Voulez-vous créer maintenant une nouvelle paire de clés ?"
 
-#: src/plugins/pgpcore/sgpgme.c:980 src/plugins/pgpcore/sgpgme.c:1002
+#: src/plugins/pgpcore/sgpgme.c:984 src/plugins/pgpcore/sgpgme.c:1006
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Impossible de générer une nouvelle paire de clés : %s"
 
-#: src/plugins/pgpcore/sgpgme.c:990
+#: src/plugins/pgpcore/sgpgme.c:994
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12528,11 +12531,11 @@ msgstr ""
 "Génération de votre nouvelle paire de clés en cours.. Veuillez déplacer "
 "votre souris pour aider à générer de l'entropie.."
 
-#: src/plugins/pgpcore/sgpgme.c:1008
+#: src/plugins/pgpcore/sgpgme.c:1012
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Impossible de générer une nouvelle paire de clés : erreur inconnue"
 
-#: src/plugins/pgpcore/sgpgme.c:1012
+#: src/plugins/pgpcore/sgpgme.c:1016
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12545,15 +12548,15 @@ msgstr ""
 "\n"
 "Voulez-vous l'exporter vers un serveur de clés ?"
 
-#: src/plugins/pgpcore/sgpgme.c:1016
+#: src/plugins/pgpcore/sgpgme.c:1020
 msgid "Key generated"
 msgstr "Clé générée"
 
-#: src/plugins/pgpcore/sgpgme.c:1092
+#: src/plugins/pgpcore/sgpgme.c:1096
 msgid "Key exported."
 msgstr "Clé exportée."
 
-#: src/plugins/pgpcore/sgpgme.c:1094
+#: src/plugins/pgpcore/sgpgme.c:1098
 msgid "Couldn't export key."
 msgstr "Échec lors de l'exportation de la clé."
 
@@ -12576,7 +12579,7 @@ msgstr "Échec lors de la conversion du texte dans un jeu de caractère adapté.
 #: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
 #: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
 #: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
-#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:655
+#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:656
 #: src/plugins/smime/smime.c:418
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
@@ -12631,7 +12634,7 @@ msgid "Malformed message"
 msgstr "Message non conforme"
 
 #: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
-#: src/plugins/pgpmime/pgpmime.c:695
+#: src/plugins/pgpmime/pgpmime.c:696
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Impossible de créer un fichier temporaire, %s"
@@ -12664,12 +12667,12 @@ msgstr ""
 "le système PGP/Inline, ni les en-têtes de message, comme par exemple l'en-"
 "tête Sujet."
 
-#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:665
+#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:666
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Impossible d'ajouter la clé GPG %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:723
+#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:724
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Le chiffrement a échoué, %s"
@@ -12731,7 +12734,7 @@ msgstr "Impossible de créer un fichier temporaire : %s"
 msgid "OpenPGP digital signature"
 msgstr "Signature digitale OpenPGP"
 
-#: src/plugins/pgpmime/pgpmime.c:621
+#: src/plugins/pgpmime/pgpmime.c:622
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -12739,7 +12742,7 @@ msgstr ""
 "Veuillez prendre en compte que les en-têtes de message, comme par exemple "
 "l'en-tête Sujet, ne sont pas chiffrés par le système PGP/Mime."
 
-#: src/plugins/pgpmime/pgpmime.c:795
+#: src/plugins/pgpmime/pgpmime.c:798
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12773,38 +12776,38 @@ msgstr ""
 "\n"
 "GPGME est copyright 2001 par Werner Koch <dd9jn at gnu.org>."
 
-#: src/plugins/python/python_plugin.c:359
-#: src/plugins/python/python_plugin.c:503
+#: src/plugins/python/python_plugin.c:379
+#: src/plugins/python/python_plugin.c:523
 msgid "Python scripts"
 msgstr "Scripts Python"
 
-#: src/plugins/python/python_plugin.c:498
+#: src/plugins/python/python_plugin.c:518
 msgid "Show Python console..."
 msgstr "Afficher la console Python.."
 
-#: src/plugins/python/python_plugin.c:504
+#: src/plugins/python/python_plugin.c:524
 #: src/plugins/rssyl/rssyl_feed_props.c:471
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/plugins/python/python_plugin.c:506 src/prefs_account.c:2727
-#: src/prefs_account.c:2755 src/prefs_account.c:3192 src/wizard.c:1206
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:2730
+#: src/prefs_account.c:2758 src/prefs_account.c:3195 src/wizard.c:1206
 #: src/wizard.c:1626
 msgid "Browse"
 msgstr "Pa_rcourir"
 
-#: src/plugins/python/python_plugin.c:652
-#: src/plugins/python/python_plugin.c:736
+#: src/plugins/python/python_plugin.c:672
+#: src/plugins/python/python_plugin.c:762
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:658
+#: src/plugins/python/python_plugin.c:681
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr ""
 "Impossible d'enregistrer le connecteur 'compose create hook' dans le module "
 "Python"
 
-#: src/plugins/python/python_plugin.c:741
+#: src/plugins/python/python_plugin.c:767
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12893,7 +12896,7 @@ msgstr ""
 "Les remarques et suggestions sont les bienvenues à l'adresse <berndth at gmx."
 "de>."
 
-#: src/plugins/python/python_plugin.c:792
+#: src/plugins/python/python_plugin.c:818
 msgid "Python integration"
 msgstr "Intégration à Python"
 
@@ -12961,7 +12964,7 @@ msgstr ""
 msgid "RSS feed"
 msgstr "flux RSS"
 
-#: src/plugins/rssyl/rssyl_add_item.c:297
+#: src/plugins/rssyl/rssyl_add_item.c:304
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(vide)"
@@ -13118,7 +13121,7 @@ msgstr "Récupérer les commentaires des articles de moins de"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1605 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
+#: src/prefs_account.c:1608 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "jour(s)"
 
@@ -13269,17 +13272,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Mise à jour des commentaires pour %s.."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1621
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Autorisation requise)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:110
-#: src/plugins/vcalendar/vcal_folder.c:1624
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "403 (Unauthorised)"
 msgstr "403 (Non autorisé)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1627
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (Non trouvé)"
 
@@ -13405,7 +13408,7 @@ msgstr "Impossible d'écrire dans un fichier temporaire"
 msgid "Couldn't close temporary file"
 msgstr "Impossible de fermer un fichier temporaire"
 
-#: src/plugins/smime/smime.c:713
+#: src/plugins/smime/smime.c:714
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -13413,21 +13416,21 @@ msgstr ""
 "Veuillez prendre en compte que les en-têtes de message, comme par exemple "
 "l'en-tête Sujet, ne sont pas signés par le système S/Mime."
 
-#: src/plugins/spam_report/spam_report.c:302
+#: src/plugins/spam_report/spam_report.c:307
 msgid "Reporting spam..."
 msgstr "Soumission du pourriel.."
 
-#: src/plugins/spam_report/spam_report.c:337
+#: src/plugins/spam_report/spam_report.c:342
 msgid "Report spam online..."
 msgstr "Soumettre le(s) pourriel(s) en ligne"
 
-#: src/plugins/spam_report/spam_report.c:348
-#: src/plugins/spam_report/spam_report.c:386
+#: src/plugins/spam_report/spam_report.c:353
+#: src/plugins/spam_report/spam_report.c:391
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "SpamReport"
 
-#: src/plugins/spam_report/spam_report.c:391
+#: src/plugins/spam_report/spam_report.c:396
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13443,7 +13446,7 @@ msgstr ""
 " * spamcop.net\n"
 " * Système de nomination de lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:416
+#: src/plugins/spam_report/spam_report.c:421
 msgid "Spam reporting"
 msgstr "Soumission de pourriel"
 
@@ -13835,7 +13838,7 @@ msgstr "Vous avez une tâche à effectuer."
 
 #: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
 #: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
-#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:730
+#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:716
 msgid "Details follow:"
 msgstr "En voici les détails :"
 
@@ -13863,11 +13866,11 @@ msgstr "(cet évènement est récurrent)"
 msgid "(this event is part of a recurring event)"
 msgstr "(cet évènement fait partie d'un évènement récurrent)"
 
-#: src/plugins/vcalendar/vcalendar.c:729
+#: src/plugins/vcalendar/vcalendar.c:715
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Vous avez reçu une réponse à un rendez-vous inconnu. "
 
-#: src/plugins/vcalendar/vcalendar.c:733
+#: src/plugins/vcalendar/vcalendar.c:719
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13876,35 +13879,35 @@ msgstr ""
 "Vous avez reçu une réponse à un rendez-vous.\n"
 "%s a %s l'invitation dont les détails suivent :"
 
-#: src/plugins/vcalendar/vcalendar.c:812
+#: src/plugins/vcalendar/vcalendar.c:798
 msgid "Error - could not get the calendar MIME part."
 msgstr "Erreur - impossible de trouver la partie MIME calendrier"
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:805
 msgid "Error - no calendar part found."
 msgstr "Erreur - aucune partie calendrier trouvée."
 
-#: src/plugins/vcalendar/vcalendar.c:833
+#: src/plugins/vcalendar/vcalendar.c:819
 msgid "Error - Unknown calendar component type."
 msgstr "Error - Le composant calendrier n'est pas d'un type connu."
 
-#: src/plugins/vcalendar/vcalendar.c:965
+#: src/plugins/vcalendar/vcalendar.c:951
 msgid "Send a notification to the attendees"
 msgstr "Envoyer une notification aux invité·e·s"
 
-#: src/plugins/vcalendar/vcalendar.c:974
+#: src/plugins/vcalendar/vcalendar.c:960
 msgid "Cancel meeting"
 msgstr "Annuler le rendez-vous"
 
-#: src/plugins/vcalendar/vcalendar.c:975
+#: src/plugins/vcalendar/vcalendar.c:961
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Voulez-vous réellement annuler ce rendez-vous ?"
 
-#: src/plugins/vcalendar/vcalendar.c:1070
+#: src/plugins/vcalendar/vcalendar.c:1056
 msgid "No account found"
 msgstr "Pas de compte trouvé"
 
-#: src/plugins/vcalendar/vcalendar.c:1071
+#: src/plugins/vcalendar/vcalendar.c:1057
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13912,68 +13915,68 @@ msgstr ""
 "Vous n'avez pas de compte correspondant à un·e invité·e. Voulez-vous tout de "
 "même répondre ?"
 
-#: src/plugins/vcalendar/vcalendar.c:1073
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid "Reply anyway"
 msgstr "Répondre tout de même"
 
-#: src/plugins/vcalendar/vcalendar.c:1202
+#: src/plugins/vcalendar/vcalendar.c:1188
 msgid "Answer"
 msgstr "Réponse"
 
-#: src/plugins/vcalendar/vcalendar.c:1203
+#: src/plugins/vcalendar/vcalendar.c:1189
 msgid "Edit meeting..."
 msgstr "Modifier le rendez-vous.."
 
-#: src/plugins/vcalendar/vcalendar.c:1204
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Cancel meeting..."
 msgstr "Annuler le rendez-vous.."
 
-#: src/plugins/vcalendar/vcalendar.c:1205
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Launch website"
 msgstr "Ouvrir le site web"
 
-#: src/plugins/vcalendar/vcalendar.c:1209
+#: src/plugins/vcalendar/vcalendar.c:1195
 msgid "You are already busy at this time."
 msgstr "Vous n'êtes pas disponible actuellement."
 
-#: src/plugins/vcalendar/vcalendar.c:1248
+#: src/plugins/vcalendar/vcalendar.c:1234
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Évènement :"
 
-#: src/plugins/vcalendar/vcalendar.c:1249
+#: src/plugins/vcalendar/vcalendar.c:1235
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organisateur·rice :"
 
-#: src/plugins/vcalendar/vcalendar.c:1250
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Endroit :"
 
-#: src/plugins/vcalendar/vcalendar.c:1251
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Résumé :"
 
-#: src/plugins/vcalendar/vcalendar.c:1252
+#: src/plugins/vcalendar/vcalendar.c:1238
 msgid "Starting:"
 msgstr "Début :"
 
-#: src/plugins/vcalendar/vcalendar.c:1253
+#: src/plugins/vcalendar/vcalendar.c:1239
 msgid "Ending:"
 msgstr "Fin :"
 
-#: src/plugins/vcalendar/vcalendar.c:1255
+#: src/plugins/vcalendar/vcalendar.c:1241
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Invité·e·s :"
 
-#: src/plugins/vcalendar/vcalendar.c:1257
+#: src/plugins/vcalendar/vcalendar.c:1243
 msgid "Action:"
 msgstr "Action :"
 
@@ -14042,17 +14045,17 @@ msgstr ""
 "\n"
 "Voici les évènements planifiés %s :\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1612
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Délai d'attente dépassé (%d secondes) lors de la connexion à %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1630
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "Erreur %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1812
+#: src/plugins/vcalendar/vcal_folder.c:1815
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14065,7 +14068,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1843
+#: src/plugins/vcalendar/vcal_folder.c:1846
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14076,47 +14079,47 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1874
 #: src/plugins/vcalendar/vcal_folder.c:1877
+#: src/plugins/vcalendar/vcal_folder.c:1880
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Impossible de créer le dossier %s."
 
-#: src/plugins/vcalendar/vcal_folder.c:1917
+#: src/plugins/vcalendar/vcal_folder.c:1920
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws Mail nécessite un accès réseau pour accéder au calendrier Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1931
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Récupération du calendrier pour %s.."
 
-#: src/plugins/vcalendar/vcal_folder.c:1929
+#: src/plugins/vcalendar/vcal_folder.c:1932
 msgid "new subscription"
 msgstr "Nouvelle inscription"
 
-#: src/plugins/vcalendar/vcal_folder.c:1940
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail nécessite un accès réseau pour mettre à jour l'abonnement."
 
-#: src/plugins/vcalendar/vcal_folder.c:1952
+#: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Subscribe to Webcal"
 msgstr "Souscrire à un calendrier en ligne (Webcal)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1952
+#: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Enter the Webcal URL:"
 msgstr "Saisir l'URL du calendrier en ligne (Webcal) :"
 
-#: src/plugins/vcalendar/vcal_folder.c:1964
+#: src/plugins/vcalendar/vcal_folder.c:1967
 msgid "Could not parse the URL."
 msgstr "Impossible de comprendre l'URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1992
+#: src/plugins/vcalendar/vcal_folder.c:1995
 msgid "Do you really want to unsubscribe?"
 msgstr "Voulez-vous vraiment vous désinscrire ?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1993
+#: src/plugins/vcalendar/vcal_folder.c:1996
 msgid "Delete subscription"
 msgstr "Supprimer la souscription"
 
@@ -14603,41 +14606,41 @@ msgstr "Erreur de protocole POP\n"
 msgid "invalid UIDL response: %s\n"
 msgstr "Réponse UIDL invalide : %s\n"
 
-#: src/pop.c:842
+#: src/pop.c:843
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP : Suppression du message expiré %d [%s]\n"
 
-#: src/pop.c:858
+#: src/pop.c:859
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP : Message %d ignoré [%s] (%d octets)\n"
 
-#: src/pop.c:890
+#: src/pop.c:891
 msgid "mailbox is locked\n"
 msgstr "la boîte aux lettres est verrouillée\n"
 
-#: src/pop.c:893
+#: src/pop.c:894
 msgid "Session timeout\n"
 msgstr "Session expirée\n"
 
-#: src/pop.c:912
+#: src/pop.c:913
 msgid "command not supported\n"
 msgstr "Commande non supportée\n"
 
-#: src/pop.c:917
+#: src/pop.c:918
 msgid "error occurred on POP session\n"
 msgstr "Erreur pendant la session POP\n"
 
-#: src/pop.c:1112
+#: src/pop.c:1113
 msgid "TOP command unsupported\n"
 msgstr "Commande TOP non supportée\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1579 src/prefs_account.c:2655
+#: src/prefs_account.c:364 src/prefs_account.c:1582 src/prefs_account.c:2658
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1692 src/prefs_account.c:2670
+#: src/prefs_account.c:365 src/prefs_account.c:1695 src/prefs_account.c:2673
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP4"
@@ -14654,35 +14657,35 @@ msgstr "Fichier mbox local"
 msgid "None (SMTP only)"
 msgstr "Aucun (SMTP seulement)"
 
-#: src/prefs_account.c:1128
+#: src/prefs_account.c:1131
 msgid "Name of account"
 msgstr "Nom du compte"
 
-#: src/prefs_account.c:1137
+#: src/prefs_account.c:1140
 msgid "Set as default"
 msgstr "Définir comme compte par défaut"
 
-#: src/prefs_account.c:1145
+#: src/prefs_account.c:1148
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: src/prefs_account.c:1154
+#: src/prefs_account.c:1157
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/prefs_account.c:1160
+#: src/prefs_account.c:1163
 msgid "Mail address"
 msgstr "Adresse email"
 
-#: src/prefs_account.c:1223 src/wizard.c:1525
+#: src/prefs_account.c:1226 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Auto-configurer"
 
-#: src/prefs_account.c:1225 src/wizard.c:1526
+#: src/prefs_account.c:1228 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/prefs_account.c:1242
+#: src/prefs_account.c:1245
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14690,77 +14693,77 @@ msgstr ""
 "Attention : la version de Claws Mail actuellement\n"
 "utilisée a été compilée sans les supports IMAP et NNTP."
 
-#: src/prefs_account.c:1273
+#: src/prefs_account.c:1276
 msgid "This server requires authentication"
 msgstr "Ce serveur nécessite une authentification"
 
-#: src/prefs_account.c:1280
+#: src/prefs_account.c:1283
 msgid "Authenticate on connect"
 msgstr "Authentification à la connexion"
 
-#: src/prefs_account.c:1342
+#: src/prefs_account.c:1345
 msgid "News server"
 msgstr "Serveur de groupes de discussion"
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1351
 msgid "Server for receiving"
 msgstr "Serveur de réception"
 
-#: src/prefs_account.c:1354
+#: src/prefs_account.c:1357
 msgid "Local mailbox"
 msgstr "Fichier mbox local"
 
-#: src/prefs_account.c:1361
+#: src/prefs_account.c:1364
 msgid "SMTP server (send)"
 msgstr "Serveur d'envoi (SMTP)"
 
-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1372
 msgid "Use mail command rather than SMTP server"
 msgstr "Utiliser une commande externe plutôt que le serveur SMTP"
 
-#: src/prefs_account.c:1378
+#: src/prefs_account.c:1381
 msgid "command to send mails"
 msgstr "Commande externe :"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account.c:1553
+#: src/prefs_account.c:1556
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1559 src/prefs_account.c:1648
+#: src/prefs_account.c:1562 src/prefs_account.c:1651
 msgid "Default Inbox"
 msgstr "Dossier de réception par défaut"
 
-#: src/prefs_account.c:1566 src/prefs_account.c:1573 src/prefs_account.c:1655
-#: src/prefs_account.c:1662
+#: src/prefs_account.c:1569 src/prefs_account.c:1576 src/prefs_account.c:1658
+#: src/prefs_account.c:1665
 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:1581
+#: src/prefs_account.c:1584
 msgid "Use secure authentication (APOP)"
 msgstr "Authentification sécurisée (APOP)"
 
-#: src/prefs_account.c:1584
+#: src/prefs_account.c:1587
 msgid "Remove messages on server when received"
 msgstr "Suppression des messages du serveur après réception"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "Remove after"
 msgstr "Suppression après"
 
-#: src/prefs_account.c:1602 src/prefs_account.c:1612
+#: src/prefs_account.c:1605 src/prefs_account.c:1615
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 jour et 0 heure : suppression immédiate"
 
-#: src/prefs_account.c:1625
+#: src/prefs_account.c:1628
 msgid "Receive size limit"
 msgstr "Taille maximale pour la réception"
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1631
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14770,97 +14773,97 @@ msgstr ""
 "de les marquer pour un téléchargement complet ou une suppression (effectif "
 "qu'à la relève suivante)."
 
-#: src/prefs_account.c:1668 src/prefs_account.c:2685
+#: src/prefs_account.c:1671 src/prefs_account.c:2688
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1675
+#: src/prefs_account.c:1678
 msgid "Maximum number of articles to download"
 msgstr "Nombre maximum d'articles à récupérer"
 
-#: src/prefs_account.c:1685
+#: src/prefs_account.c:1688
 msgid "unlimited if 0 is specified"
 msgstr "pas de limite si 0 est spécifié"
 
-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1713
 msgid "Plain text"
 msgstr "Texte simple"
 
-#: src/prefs_account.c:1723
+#: src/prefs_account.c:1726
 msgid "IMAP server directory"
 msgstr "Répertoire sur le serveur IMAP4"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "(usually empty)"
 msgstr "(généralement nul)"
 
-#: src/prefs_account.c:1741
+#: src/prefs_account.c:1744
 msgid "Show subscribed folders only"
 msgstr "Afficher seulement les dossiers inscrits"
 
-#: src/prefs_account.c:1748
+#: src/prefs_account.c:1751
 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:1750
+#: src/prefs_account.c:1753
 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:1757 src/prefs_receive.c:164
+#: src/prefs_account.c:1760 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Relève automatique du courriel"
 
-#: src/prefs_account.c:1760
+#: src/prefs_account.c:1763
 msgid "Use global settings"
 msgstr "Utiliser les paramètres globaux"
 
-#: src/prefs_account.c:1766 src/prefs_receive.c:171
+#: src/prefs_account.c:1769 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Relever automatiquement toutes les"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1808
 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages à la réception"
 
-#: src/prefs_account.c:1821
+#: src/prefs_account.c:1824
 msgid "Allow filtering using plugins on receiving"
 msgstr "Autoriser les modules à filtrer les messages à la réception"
 
-#: src/prefs_account.c:1825
+#: src/prefs_account.c:1828
 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:1914 src/prefs_customheader.c:209
+#: src/prefs_account.c:1917 src/prefs_customheader.c:209
 #: src/prefs_matcher.c:633 src/prefs_matcher.c:2010 src/prefs_matcher.c:2038
 msgid "Header"
 msgstr "En-tête"
 
-#: src/prefs_account.c:1916
+#: src/prefs_account.c:1919
 msgid "Generate Message-ID"
 msgstr "Génération de l'en-tête « Message-ID »"
 
-#: src/prefs_account.c:1919
+#: src/prefs_account.c:1922
 msgid "Send account mail address in Message-ID"
 msgstr "Mettre l'adresse email dans le « Message-ID »"
 
-#: src/prefs_account.c:1922
+#: src/prefs_account.c:1925
 msgid "Add user agent header"
 msgstr "Ajouter l'en-tête « User-Agent »"
 
-#: src/prefs_account.c:1929
+#: src/prefs_account.c:1932
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account.c:1944
+#: src/prefs_account.c:1947
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2042
+#: src/prefs_account.c:2045
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14868,173 +14871,173 @@ msgstr ""
 "Laisser ces champs vides pour utiliser le nom d'utilisateur·rice et le mot "
 "de passe spécifiés pour la réception."
 
-#: src/prefs_account.c:2053
+#: src/prefs_account.c:2056
 msgid "Authenticate with POP before sending"
 msgstr "S'authentifier sur le POP avant l'envoi"
 
-#: src/prefs_account.c:2068
+#: src/prefs_account.c:2071
 msgid "POP authentication timeout"
 msgstr "Délai d'attente maximal pour l'authentification POP"
 
-#: src/prefs_account.c:2156 src/prefs_account.c:2202
+#: src/prefs_account.c:2159 src/prefs_account.c:2205
 msgid "Signature"
 msgstr "Signature"
 
-#: src/prefs_account.c:2159
+#: src/prefs_account.c:2162
 msgid "Automatically insert signature"
 msgstr "Insérer automatiquement la signature"
 
-#: src/prefs_account.c:2164
+#: src/prefs_account.c:2167
 msgid "Signature separator"
 msgstr "Séparateur de signature"
 
-#: src/prefs_account.c:2189
+#: src/prefs_account.c:2192
 msgid "Command output"
 msgstr "Résultat d'une commande"
 
-#: src/prefs_account.c:2222
+#: src/prefs_account.c:2225
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2277
 msgid "Spell check dictionaries"
 msgstr "Dictionnaires de correction orthographique"
 
-#: src/prefs_account.c:2284 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2287 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Dictionnaire par défaut"
 
-#: src/prefs_account.c:2297 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2300 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Dictionnaire alternatif par défaut"
 
-#: src/prefs_account.c:2383 src/prefs_account.c:3796
+#: src/prefs_account.c:2386 src/prefs_account.c:3799
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
 #: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Composition"
 
-#: src/prefs_account.c:2398 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2401 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/prefs_account.c:2413 src/prefs_filtering_action.c:185
+#: src/prefs_account.c:2416 src/prefs_filtering_action.c:185
 #: src/prefs_folder_item.c:1595 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/prefs_account.c:2460
+#: src/prefs_account.c:2463
 msgid "Default privacy system"
 msgstr "Système de confidentialité par défaut"
 
-#: src/prefs_account.c:2489 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2492 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Toujours signer les messages"
 
-#: src/prefs_account.c:2491 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2494 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Toujours chiffrer les messages"
 
-#: src/prefs_account.c:2493
+#: src/prefs_account.c:2496
 msgid "Always sign messages when replying to a signed message"
 msgstr "Toujours signer la réponse à un message signé"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2499
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Toujours chiffrer la réponse à un message chiffré"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2502
 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/de "
 "la destinataire"
 
-#: src/prefs_account.c:2501
+#: src/prefs_account.c:2504
 msgid "Save sent encrypted messages as clear text"
 msgstr "Enregistrer les messages chiffrés envoyés en texte clair"
 
-#: src/prefs_account.c:2659 src/prefs_account.c:2674 src/prefs_account.c:2688
+#: src/prefs_account.c:2662 src/prefs_account.c:2677 src/prefs_account.c:2691
 msgid "Don't use SSL/TLS"
 msgstr "Ne pas utiliser SSL/TLS"
 
-#: src/prefs_account.c:2662 src/prefs_account.c:2677 src/prefs_account.c:2697
-#: src/prefs_account.c:2708
+#: src/prefs_account.c:2665 src/prefs_account.c:2680 src/prefs_account.c:2700
+#: src/prefs_account.c:2711
 msgid "Use SSL/TLS"
 msgstr "Utiliser SSL/TLS"
 
-#: src/prefs_account.c:2665 src/prefs_account.c:2680 src/prefs_account.c:2711
+#: src/prefs_account.c:2668 src/prefs_account.c:2683 src/prefs_account.c:2714
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session chiffrée"
 
-#: src/prefs_account.c:2701
+#: src/prefs_account.c:2704
 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 
-#: src/prefs_account.c:2705
+#: src/prefs_account.c:2708
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Ne pas utiliser SSL/TLS (mais utiliser STARTTLS si nécessaire)"
 
-#: src/prefs_account.c:2716
+#: src/prefs_account.c:2719
 msgid "Client certificates"
 msgstr "Certificats client"
 
-#: src/prefs_account.c:2724
+#: src/prefs_account.c:2727
 msgid "Certificate for receiving"
 msgstr "Certificat pour la réception"
 
-#: src/prefs_account.c:2729 src/prefs_account.c:2731 src/prefs_account.c:2757
-#: src/prefs_account.c:2759
+#: src/prefs_account.c:2732 src/prefs_account.c:2734 src/prefs_account.c:2760
+#: src/prefs_account.c:2762
 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:2752
+#: src/prefs_account.c:2755
 msgid "Certificate for sending"
 msgstr "Certificat pour l'envoi"
 
-#: src/prefs_account.c:2792
+#: src/prefs_account.c:2795
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Accepter automatiquement les certificats SSL/TLS valides"
 
-#: src/prefs_account.c:2795
+#: src/prefs_account.c:2798
 msgid "Use non-blocking SSL/TLS"
 msgstr "Utiliser la communication SSL/TLS non bloquante"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2810
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "À désactiver en cas de problème de connexion SSL/TLS"
 
-#: src/prefs_account.c:2899 src/prefs_proxy.c:73
+#: src/prefs_account.c:2902 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Utiliser un serveur mandataire"
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2911
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Remise à zéro des réglages"
 
-#: src/prefs_account.c:2910
+#: src/prefs_account.c:2913
 msgid "Use global proxy server settings"
 msgstr "Utiliser les paramètres de serveur mandataire globaux"
 
-#: src/prefs_account.c:2947 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:2950 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Utiliser l'authentification (SMTP AUTH)"
 
-#: src/prefs_account.c:2952 src/prefs_proxy.c:123
+#: src/prefs_account.c:2955 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Utilisateur·rice"
 
-#: src/prefs_account.c:2986
+#: src/prefs_account.c:2989
 msgid "Use proxy server for sending"
 msgstr "Utiliser le serveur mandataire pour l'envoi"
 
-#: src/prefs_account.c:2988
+#: src/prefs_account.c:2991
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15042,27 +15045,27 @@ msgstr ""
 "Si l'option est désactivée, les messages seront envoyés directement au "
 "serveur d'envoi, sans utiliser les paramètres de serveur mandataire."
 
-#: src/prefs_account.c:3099
+#: src/prefs_account.c:3102
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3109
 msgid "POP port"
 msgstr "Port POP"
 
-#: src/prefs_account.c:3113
+#: src/prefs_account.c:3116
 msgid "IMAP port"
 msgstr "Port IMAP"
 
-#: src/prefs_account.c:3120
+#: src/prefs_account.c:3123
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:3126
+#: src/prefs_account.c:3129
 msgid "Domain name"
 msgstr "Nom de domaine"
 
-#: src/prefs_account.c:3129
+#: src/prefs_account.c:3132
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15070,154 +15073,154 @@ 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:3143
+#: src/prefs_account.c:3146
 msgid "Use command to communicate with server"
 msgstr "Utiliser une commande externe pour communiquer avec le serveur"
 
-#: src/prefs_account.c:3152
+#: src/prefs_account.c:3155
 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:3205
+#: src/prefs_account.c:3208
 msgid "Put sent messages in"
 msgstr "Sauvegarder les messages envoyés dans "
 
-#: src/prefs_account.c:3207
+#: src/prefs_account.c:3210
 msgid "Put queued messages in"
 msgstr "Sauvegarder les messages à envoyer (file d'attente) dans "
 
-#: src/prefs_account.c:3209
+#: src/prefs_account.c:3212
 msgid "Put draft messages in"
 msgstr "Sauvegarder les brouillons dans "
 
-#: src/prefs_account.c:3211
+#: src/prefs_account.c:3214
 msgid "Put deleted messages in"
 msgstr "Sauvegarder les messages supprimés dans "
 
-#: src/prefs_account.c:3268
+#: src/prefs_account.c:3271
 msgid "Account name is not entered."
 msgstr "Le nom du compte est non spécifié."
 
-#: src/prefs_account.c:3272
+#: src/prefs_account.c:3275
 msgid "Mail address is not entered."
 msgstr "L'adresse email est non spécifiée."
 
-#: src/prefs_account.c:3280
+#: src/prefs_account.c:3283
 msgid "SMTP server is not entered."
 msgstr "Le serveur d'envoi (SMTP) est non spécifié."
 
-#: src/prefs_account.c:3285
+#: src/prefs_account.c:3288
 msgid "User ID is not entered."
 msgstr "Le nom d'utilisateur·rice est non spécifié."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3293
 msgid "POP server is not entered."
 msgstr "Le serveur POP est non spécifié."
 
-#: src/prefs_account.c:3310
+#: src/prefs_account.c:3313
 msgid "The default Inbox folder doesn't exist."
 msgstr "Le dossier de réception par défaut n'existe pas."
 
-#: src/prefs_account.c:3316
+#: src/prefs_account.c:3319
 msgid "IMAP server is not entered."
 msgstr "Le serveur IMAP est non spécifié."
 
-#: src/prefs_account.c:3321
+#: src/prefs_account.c:3324
 msgid "NNTP server is not entered."
 msgstr "Le serveur NNTP est non spécifié."
 
-#: src/prefs_account.c:3327
+#: src/prefs_account.c:3330
 msgid "local mailbox filename is not entered."
 msgstr "Le fichier local mbox est non spécifié."
 
-#: src/prefs_account.c:3333
+#: src/prefs_account.c:3336
 msgid "mail command is not entered."
 msgstr "La commande externe d'envoi est non spécifiée."
 
-#: src/prefs_account.c:3343
+#: src/prefs_account.c:3346
 msgid "User ID cannot contain a newline character."
 msgstr ""
 "L'identifiant d'utilisateur·rice ne doit pas contenir de caractère de retour "
 "à la ligne."
 
-#: src/prefs_account.c:3348
+#: src/prefs_account.c:3351
 msgid "Password cannot contain a newline character."
 msgstr ""
 "Le mot de passe ne doit pas contenir de caractère de retour à la ligne."
 
-#: src/prefs_account.c:3376
+#: src/prefs_account.c:3379
 msgid "SMTP user ID cannot contain a newline character."
 msgstr ""
 "L'identifiant d'utilisateur·rice SMTP ne doit pas contenir de caractère de "
 "retour à la ligne."
 
-#: src/prefs_account.c:3381
+#: src/prefs_account.c:3384
 msgid "SMTP password cannot contain a newline character."
 msgstr ""
 "Le mot de passe SMTP ne doit pas contenir de caractère de retour à la ligne."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3460
 msgid "domain is not specified."
 msgstr "domaine non spécifié."
 
-#: src/prefs_account.c:3462
+#: src/prefs_account.c:3465
 msgid "sent folder is not selected."
 msgstr "le dossier 'Envoyés' n'est pas défini."
 
-#: src/prefs_account.c:3467
+#: src/prefs_account.c:3470
 msgid "queue folder is not selected."
 msgstr "le dossier 'File d'attente' n'est pas défini."
 
-#: src/prefs_account.c:3472
+#: src/prefs_account.c:3475
 msgid "draft folder is not selected."
 msgstr "le dossier 'Brouillons' n'est pas défini."
 
-#: src/prefs_account.c:3477
+#: src/prefs_account.c:3480
 msgid "trash folder is not selected."
 msgstr "le dossier 'Corbeille' n'est pas défini."
 
-#: src/prefs_account.c:3760
+#: src/prefs_account.c:3763
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account.c:3814 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:3817 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modèles"
 
-#: src/prefs_account.c:3832
+#: src/prefs_account.c:3835
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: src/prefs_account.c:3962
+#: src/prefs_account.c:3965
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/prefs_account.c:4311
+#: src/prefs_account.c:4314
 msgid "Preferences for new account"
 msgstr "Configuration du nouveau compte"
 
-#: src/prefs_account.c:4313
+#: src/prefs_account.c:4316
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Configuration du compte"
 
-#: src/prefs_account.c:4432 src/wizard.c:1390
+#: src/prefs_account.c:4435 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Échec (adresse incorrecte)"
 
-#: src/prefs_account.c:4517
+#: src/prefs_account.c:4520
 msgid "Select signature file"
 msgstr "Sélection du fichier signature"
 
-#: src/prefs_account.c:4535 src/prefs_account.c:4552 src/wizard.c:1067
+#: src/prefs_account.c:4538 src/prefs_account.c:4555 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Choisir le fichier de certificat"
 
-#: src/prefs_account.c:4648
+#: src/prefs_account.c:4651
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: src/prefs_account.c:4819
+#: src/prefs_account.c:4822
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (module non chargé)"
@@ -15608,7 +15611,7 @@ msgstr "Composer"
 msgid "Custom header configuration"
 msgstr "Configuration des en-têtes supplémentaires"
 
-#: src/prefs_customheader.c:503 src/prefs_display_header.c:590
+#: src/prefs_customheader.c:503 src/prefs_display_header.c:588
 #: src/prefs_matcher.c:1633 src/prefs_matcher.c:1648
 msgid "Header name is not set."
 msgstr "Le nom de l'en-tête n'est pas défini."
@@ -15685,18 +15688,18 @@ msgid "Header name"
 msgstr "En-tête"
 
 #: src/prefs_display_header.c:312
-msgid "Displayed Headers"
-msgstr "En-têtes affichés"
-
-#: src/prefs_display_header.c:374
 msgid "Hidden headers"
 msgstr "En-têtes cachés"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:353
+msgid "Displayed Headers"
+msgstr "En-têtes affichés"
+
+#: src/prefs_display_header.c:398
 msgid "Show all unspecified headers"
 msgstr "Afficher tous les en-têtes non spécifiés"
 
-#: src/prefs_display_header.c:600
+#: src/prefs_display_header.c:598
 msgid "This header is already in the list."
 msgstr "Cet en-tête est déjà dans la liste."
 
@@ -15747,10 +15750,6 @@ msgstr "Programmes externes"
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/prefs_filtering_action.c:172
-msgid "Copy"
-msgstr "Copier"
-
 #: src/prefs_filtering_action.c:174
 msgid "Hide"
 msgstr "Cacher"
@@ -15763,7 +15762,7 @@ msgid "Message flags"
 msgstr "États de message"
 
 #: src/prefs_filtering_action.c:175 src/prefs_summaries.c:620
-#: src/prefs_summary_column.c:77 src/summaryview.c:2887 src/toolbar.c:505
+#: src/prefs_summary_column.c:77 src/summaryview.c:2908 src/toolbar.c:505
 msgid "Mark"
 msgstr "Marquer"
 
@@ -15804,7 +15803,7 @@ msgstr "Rediriger"
 #: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
 #: src/prefs_filtering_action.c:1398 src/prefs_matcher.c:639
 #: src/prefs_summaries.c:623 src/prefs_summary_column.c:86
-#: src/summaryview.c:471
+#: src/summaryview.c:472
 msgid "Score"
 msgstr "Score"
 
@@ -15818,7 +15817,7 @@ msgstr "Définir le score"
 
 #: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
 #: src/prefs_filtering_action.c:192 src/prefs_matcher.c:643
-#: src/prefs_summary_column.c:88 src/summaryview.c:473
+#: src/prefs_summary_column.c:88 src/summaryview.c:474
 msgid "Tags"
 msgstr "Labels"
 
@@ -16276,7 +16275,7 @@ msgstr "Utiliser une police différente pour l'impression"
 msgid "Message Printing"
 msgstr "Impression d'un message"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:830
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:842
 #: src/prefs_themes.c:422
 msgid "Display"
 msgstr "Affichage"
@@ -16432,7 +16431,7 @@ msgstr "Messages d'erreur"
 msgid "Status messages for filtering/processing log"
 msgstr "Informations de déboguage du filtrage/traitement"
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:784
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:814
 msgid "Other"
 msgstr "Autres"
 
@@ -16516,11 +16515,11 @@ msgstr "corps du message"
 msgid "whole message"
 msgstr "tout le message"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6534
+#: src/prefs_matcher.c:403 src/summaryview.c:6579
 msgid "Marked"
 msgstr "Marqué"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6532
+#: src/prefs_matcher.c:404 src/summaryview.c:6577
 msgid "Deleted"
 msgstr "Supprimé"
 
@@ -16528,11 +16527,11 @@ msgstr "Supprimé"
 msgid "Replied"
 msgstr "Répondu"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6526
+#: src/prefs_matcher.c:406 src/summaryview.c:6571
 msgid "Forwarded"
 msgstr "Transféré"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6516 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6561 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Pourriel"
@@ -16541,7 +16540,7 @@ msgstr "Pourriel"
 msgid "Has attachment"
 msgstr "Contient une ou plusieurs pièces jointes"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6552
+#: src/prefs_matcher.c:410 src/summaryview.c:6597
 msgid "Signed"
 msgstr "Signé"
 
@@ -17110,15 +17109,15 @@ msgstr "Sélection de la couleur n°%d"
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/prefs_other.c:108
+#: src/prefs_other.c:109
 msgid "Choose preset keyboard shortcuts"
 msgstr "Pré-sélections de raccourcis clavier"
 
-#: src/prefs_other.c:122
+#: src/prefs_other.c:123
 msgid "Select preset:"
 msgstr "Sélectionner une configuration :"
 
-#: src/prefs_other.c:137
+#: src/prefs_other.c:138
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -17127,35 +17126,39 @@ msgstr ""
 "de menu en pressant une combinaison de touches juste après\n"
 "lui avoir fait prendre le focus (sans cliquer)."
 
-#: src/prefs_other.c:494
+#: src/prefs_other.c:496
 msgid "Add address to destination when double-clicked"
 msgstr "Un double-clic sur une adresse l'ajoute à la liste des destinataires"
 
-#: src/prefs_other.c:497
+#: src/prefs_other.c:499
 msgid "On exit"
 msgstr "En quittant"
 
-#: src/prefs_other.c:500
+#: src/prefs_other.c:502
 msgid "Confirm on exit"
 msgstr "Demander confirmation"
 
-#: src/prefs_other.c:507
+#: src/prefs_other.c:509
 msgid "Empty trash on exit"
 msgstr "Vider la corbeille"
 
-#: src/prefs_other.c:510
+#: src/prefs_other.c:512
 msgid "Warn if there are queued messages"
 msgstr "Avertir s'il y a des messages à envoyer en file d'attente"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:514
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: src/prefs_other.c:515
+#: src/prefs_other.c:517
+msgid "Enable keyboard shortcuts"
+msgstr "Activer les raccourcis clavier"
+
+#: src/prefs_other.c:520
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Permettre de modifier les raccourcis clavier"
 
-#: src/prefs_other.c:518
+#: src/prefs_other.c:523
 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"
@@ -17167,15 +17170,15 @@ msgstr ""
 "Désactivez cette option si vous voulez figer les raccourcis de clavier "
 "existants (et ainsi éviter de les modifier par inadvertance)."
 
-#: src/prefs_other.c:525
+#: src/prefs_other.c:530
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Pré-sélections de raccourcis clavier.."
 
-#: src/prefs_other.c:535
+#: src/prefs_other.c:540
 msgid "Metadata handling"
 msgstr "Gestion des métadonnées"
 
-#: src/prefs_other.c:536
+#: src/prefs_other.c:541
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -17185,23 +17188,23 @@ msgstr ""
 "Ce mode de fonctionnement réduit le risque de pertes de données\n"
 "en cas de crash système, mais peut se montrer plus lent."
 
-#: src/prefs_other.c:540
+#: src/prefs_other.c:545
 msgid "Safer"
 msgstr "Moins risqué"
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:547
 msgid "Faster"
 msgstr "Plus rapide"
 
-#: src/prefs_other.c:560
+#: src/prefs_other.c:565
 msgid "Socket I/O timeout"
 msgstr "Délai d'attente maximal de communication"
 
-#: src/prefs_other.c:581
+#: src/prefs_other.c:586
 msgid "Translate header names"
 msgstr "Traduire les en-têtes"
 
-#: src/prefs_other.c:583
+#: src/prefs_other.c:588
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
@@ -17209,21 +17212,21 @@ msgstr ""
 "L'affichage des en-têtes courants (comme « From: », « Subject: ») sera "
 "traduit dans le language présentement utilisé."
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:591
 msgid "Ask before emptying trash"
 msgstr "Demander une confirmation pour vider la ou les corbeilles"
 
-#: src/prefs_other.c:588
+#: src/prefs_other.c:593
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Lors d'un filtrage manuel, demander comment appliquer les régles liées à des "
 "comptes"
 
-#: src/prefs_other.c:593
+#: src/prefs_other.c:598
 msgid "Use secure file deletion if possible"
 msgstr "Utiliser la suppression de fichiers sécurisée si possible"
 
-#: src/prefs_other.c:597
+#: src/prefs_other.c:602
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -17231,7 +17234,7 @@ msgstr ""
 "Utiliser la suppression de fichiers sécurisée si possible\n"
 "(le programme 'shred' n'est pas disponible)"
 
-#: src/prefs_other.c:602
+#: src/prefs_other.c:607
 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."
@@ -17240,19 +17243,19 @@ msgstr ""
 "aléatoire avant de les effacer. Cela peut ralentir la suppression de façon "
 "significative. Consultez la documentation de shread pour en savoir plus."
 
-#: src/prefs_other.c:606
+#: src/prefs_other.c:611
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchroniser les dossiers en ligne dès que possible"
 
-#: src/prefs_other.c:609
+#: src/prefs_other.c:614
 msgid "Master passphrase"
 msgstr "Phrase secrète principale"
 
-#: src/prefs_other.c:612
+#: src/prefs_other.c:617
 msgid "Use a master passphrase"
 msgstr "Utiliser une phrase secrète principale"
 
-#: src/prefs_other.c:615
+#: src/prefs_other.c:620
 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."
@@ -17261,11 +17264,11 @@ msgstr ""
 "principal. Si aucun mot de passe principal n'est défini, il vous sera "
 "demandé de le saisir."
 
-#: src/prefs_other.c:620
+#: src/prefs_other.c:625
 msgid "Change master passphrase"
 msgstr "Changer la phrase secrète principale"
 
-#: src/prefs_other.c:785
+#: src/prefs_other.c:815
 msgid "Miscellaneous"
 msgstr "Divers"
 
@@ -17819,7 +17822,7 @@ msgstr "Replier les fils de discussion"
 msgid "Hide read messages"
 msgstr "Cacher les messages lus"
 
-#: src/prefs_summaries.c:831
+#: src/prefs_summaries.c:843
 msgid "Summaries"
 msgstr "Liste des messages"
 
@@ -18311,10 +18314,14 @@ msgstr "Aucune d'information trouvée"
 msgid "No recipient keys defined."
 msgstr "Pas de clé de destinataire spécifiée."
 
-#: src/procmime.c:401 src/procmime.c:403 src/procmime.c:404
+#: src/procmime.c:402 src/procmime.c:404 src/procmime.c:405
 msgid "[Error decoding BASE64]\n"
 msgstr "[Erreur de décodage BASE64]\n"
 
+#: src/procmime.c:2755
+msgid "Could not decode part"
+msgstr "Échec du décodage de la partie du message."
+
 #: src/procmsg.c:935 src/procmsg.c:938
 msgid "Already trying to send."
 msgstr "Les messages en file d'attente sont déjà en cours d'envoi."
@@ -18801,15 +18808,15 @@ msgstr "%s - Code source"
 msgid "Expiry"
 msgstr "ultérieure à"
 
-#: src/ssl_manager.c:183
+#: src/ssl_manager.c:195
 msgid "Saved SSL/TLS certificates"
 msgstr "Certificats SSL/TLS enregistrés"
 
-#: src/ssl_manager.c:463
+#: src/ssl_manager.c:444
 msgid "Delete certificate"
 msgstr "Supprimer le certificat"
 
-#: src/ssl_manager.c:464
+#: src/ssl_manager.c:445
 msgid "Do you really want to delete this certificate?"
 msgstr "Voulez-vous vraiment supprimer le certificat sélectionné ?"
 
@@ -18839,7 +18846,7 @@ msgstr "Condition :"
 msgid "Find _all"
 msgstr "Chercher _tous"
 
-#: src/summary_search.c:691 src/summaryview.c:1134 src/summaryview.c:1397
+#: src/summary_search.c:691 src/summaryview.c:1148 src/summaryview.c:1411
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Recherche en cours dans le dossier %s.. \n"
@@ -18852,270 +18859,275 @@ msgstr "Début de liste atteinte, reprise à la fin ?"
 msgid "End of list reached; continue from beginning?"
 msgstr "Fin de liste atteinte, reprise au début ?"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "Create _filter rule"
 msgstr "Créer une _règle de filtrage"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "_Set displayed columns"
 msgstr "Sélect_ion des colonnes affichées"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:459
 msgid "_Lock column headers"
 msgstr "_Verrouiller les en-têtes de colonnes"
 
-#: src/summaryview.c:582
+#: src/summaryview.c:596
 msgid "Toggle quick search bar"
 msgstr "Affiche/cache la barre de recherche rapide"
 
-#: src/summaryview.c:619
+#: src/summaryview.c:633
 msgid "Toggle multiple selection"
 msgstr "Activer la sélection multiple"
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1339
 msgid "Process mark"
 msgstr "Traitement des messages marqués"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1340
 msgid "Some marks are left. Process them?"
 msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 
-#: src/summaryview.c:1376
+#: src/summaryview.c:1390
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s).."
 
-#: src/summaryview.c:1956 src/summaryview.c:2004
+#: src/summaryview.c:1971 src/summaryview.c:2019
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1957
+#: src/summaryview.c:1972
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1969 src/summaryview.c:2017 src/summaryview.c:2054
-#: src/summaryview.c:2102 src/summaryview.c:2169
+#: src/summaryview.c:1984 src/summaryview.c:2032 src/summaryview.c:2069
+#: src/summaryview.c:2117 src/summaryview.c:2184
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Erreur interne : valeur inattendue de prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1981
+#: src/summaryview.c:1996
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:2005
+#: src/summaryview.c:2020
 msgid "No unread message found. Go to next folder?"
 msgstr "Plus de messages non lus. Aller au dossier suivant ?"
 
-#: src/summaryview.c:2041 src/summaryview.c:2089
+#: src/summaryview.c:2056 src/summaryview.c:2104
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:2042
+#: src/summaryview.c:2057
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:2066
+#: src/summaryview.c:2081
 msgid "No new messages."
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2105
 msgid "No new message found. Go to next folder?"
 msgstr "Pas de nouveaux messages. Aller au dossier suivant ?"
 
-#: src/summaryview.c:2123 src/summaryview.c:2156
+#: src/summaryview.c:2138 src/summaryview.c:2171
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:2124
+#: src/summaryview.c:2139
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2148
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2172
 msgid "No marked message found. Go to next folder?"
 msgstr "Plus de messages marqués. Aller au dossier suivant ?"
 
-#: src/summaryview.c:2190 src/summaryview.c:2219
+#: src/summaryview.c:2205 src/summaryview.c:2234
 msgid "No more labeled messages"
 msgstr "Plus de messages coloriés"
 
-#: src/summaryview.c:2191
+#: src/summaryview.c:2206
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages coloriés. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:2200 src/summaryview.c:2233
+#: src/summaryview.c:2215 src/summaryview.c:2248
 msgid "No labeled messages."
 msgstr "Plus de messages coloriés."
 
-#: src/summaryview.c:2220
+#: src/summaryview.c:2235
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages coloriés. Rechercher depuis le début ?"
 
-#: src/summaryview.c:2538
+#: src/summaryview.c:2557
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet.."
 
-#: src/summaryview.c:2723
+#: src/summaryview.c:2742
 #, c-format
 msgid "%d deleted"
 msgstr "%d détruit(s)"
 
-#: src/summaryview.c:2727
+#: src/summaryview.c:2746
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé(s)"
 
-#: src/summaryview.c:2728 src/summaryview.c:2735
+#: src/summaryview.c:2747 src/summaryview.c:2754
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2752
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié(s)"
 
-#: src/summaryview.c:2747
+#: src/summaryview.c:2766
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " objet sélectionné"
 msgstr[1] " sélection"
 
-#: src/summaryview.c:2765 src/summaryview.c:2808
+#: src/summaryview.c:2784 src/summaryview.c:2829
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2804
 msgid "Message summary"
 msgstr "Liste des messages"
 
-#: src/summaryview.c:2784
+#: src/summaryview.c:2805
 msgid "New:"
 msgstr "Nouveaux :"
 
-#: src/summaryview.c:2785
+#: src/summaryview.c:2806
 msgid "Unread:"
 msgstr "Non lus :"
 
-#: src/summaryview.c:2786
+#: src/summaryview.c:2807
 msgid "Total:"
 msgstr "Total :"
 
-#: src/summaryview.c:2788
+#: src/summaryview.c:2809
 msgid "Marked:"
 msgstr "Marqués :"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2810
 msgid "Replied:"
 msgstr "Répondus :"
 
-#: src/summaryview.c:2790
+#: src/summaryview.c:2811
 msgid "Forwarded:"
 msgstr "Transférés :"
 
-#: src/summaryview.c:2791
+#: src/summaryview.c:2812
 msgid "Locked:"
 msgstr "Verrouillés :"
 
-#: src/summaryview.c:2792
+#: src/summaryview.c:2813
 msgid "Ignored:"
 msgstr "Ignorés :"
 
-#: src/summaryview.c:2793
+#: src/summaryview.c:2814
 msgid "Watched:"
 msgstr "Suivis :"
 
-#: src/summaryview.c:2803
+#: src/summaryview.c:2824
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d sélection(s) (%s/%s), %d non lu(s)"
 
-#: src/summaryview.c:3096
+#: src/summaryview.c:3117
 msgid "Sorting summary..."
 msgstr "Tri de la liste des messages.."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3285
 msgid "Setting summary from message data..."
 msgstr "Définition de la liste des messages à partir des données du message.."
 
-#: src/summaryview.c:3470
+#: src/summaryview.c:3491
 msgid "(No Date)"
 msgstr "(Pas de date)"
 
-#: src/summaryview.c:3527
+#: src/summaryview.c:3548
 msgid "(No Recipient)"
 msgstr "(Pas de destinataire)"
 
-#: src/summaryview.c:3575
+#: src/summaryview.c:3596
 #, c-format
 msgid "From: %s, on %s"
 msgstr "De : %s, le %s"
 
-#: src/summaryview.c:3584
+#: src/summaryview.c:3605
 #, c-format
 msgid "To: %s, on %s"
 msgstr "À : %s, le %s"
 
-#: src/summaryview.c:4475
+#: src/summaryview.c:4501
 msgid "You're not the author of the article."
 msgstr "Vous n'êtes pas l'auteur·rice de cet article."
 
-#: src/summaryview.c:4565
+#: src/summaryview.c:4591
 #, 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] "Voulez-vous vraiment supprimer le message sélectionné ?"
 msgstr[1] "Voulez-vous vraiment supprimer les %d messages sélectionnés ?"
 
-#: src/summaryview.c:4568
+#: src/summaryview.c:4594
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Supprimer le message"
 msgstr[1] "Supprimer le(s) message(s) sélectionné(s)"
 
-#: src/summaryview.c:4732
+#: src/summaryview.c:4758
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:4787
+#: src/summaryview.c:4813
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Sélection du dossier où déplacer le message sélectionné"
 msgstr[1] "Sélection du dossier où déplacer les messages sélectionnés"
 
-#: src/summaryview.c:4838
+#: src/summaryview.c:4864
 msgid "Destination to copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques"
 
-#: src/summaryview.c:4872
+#: src/summaryview.c:4898
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Sélection du dossier où copier le message sélectionné"
 msgstr[1] "Sélection du dossier où copier les messages sélectionnés"
 
-#: src/summaryview.c:5023
+#: src/summaryview.c:5056
 msgid "Append or Overwrite"
 msgstr "Ajouter ou écraser"
 
-#: src/summaryview.c:5024
+#: src/summaryview.c:5057
 msgid "Append or overwrite existing file?"
 msgstr ""
 "Le fichier existe déjà. Ajouter au fichier existant ou bien l'écraser ?"
 
-#: src/summaryview.c:5025
+#: src/summaryview.c:5058
 msgid "_Append"
 msgstr "_Ajouter"
 
-#: src/summaryview.c:5025
+#: src/summaryview.c:5058
 msgid "_Overwrite"
 msgstr "_Écraser"
 
-#: src/summaryview.c:5066
+#: src/summaryview.c:5069 src/summaryview.c:5072 src/summaryview.c:5087
+#, c-format
+msgid "Couldn't save the file '%s'."
+msgstr "Impossible d'enregistrer le fichier « %s »."
+
+#: src/summaryview.c:5106
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
@@ -19123,29 +19135,29 @@ msgstr ""
 "Vous êtes sur le point d'imprimer %d messages un par un. Voulez-vous "
 "continuer ?"
 
-#: src/summaryview.c:5524
+#: src/summaryview.c:5564
 msgid "Building threads..."
 msgstr "Construction des threads.."
 
-#: src/summaryview.c:5772
+#: src/summaryview.c:5812
 msgid "Skip these rules"
 msgstr "Ignorer ces règles"
 
-#: src/summaryview.c:5775
+#: src/summaryview.c:5815
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 "Appliquer ces règles sans se soucier des comptes auxquels elles sont "
 "rattachées"
 
-#: src/summaryview.c:5778
+#: src/summaryview.c:5818
 msgid "Apply these rules if they apply to the current account"
 msgstr "Appliquer ces règles si elles s'appliquent au compte courant"
 
-#: src/summaryview.c:5807
+#: src/summaryview.c:5847
 msgid "Filtering"
 msgstr "Filtrage"
 
-#: src/summaryview.c:5808
+#: src/summaryview.c:5848
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19153,71 +19165,71 @@ msgstr ""
 "Il y a des règles de filtrage rattachées à des comptes.\n"
 "Veuillez sélectionner ce que vous voulez faire avec ces règles :"
 
-#: src/summaryview.c:5839
+#: src/summaryview.c:5880
 msgid "Filtering..."
 msgstr "Filtrage des messages.."
 
-#: src/summaryview.c:5918
+#: src/summaryview.c:5963
 msgid "Processing configuration"
 msgstr "Configuration du filtrage/traitement"
 
-#: src/summaryview.c:6066
+#: src/summaryview.c:6111
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr "Voulez-vous vraiment effacer la couleur des messages sélectionnés ?"
 
-#: src/summaryview.c:6068
+#: src/summaryview.c:6113
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr "Voulez-vous vraiment remplacer la couleur des messages sélectionnés ?"
 
-#: src/summaryview.c:6069
+#: src/summaryview.c:6114
 msgid "Reset color label"
 msgstr "Effacer la couleur de message"
 
-#: src/summaryview.c:6069
+#: src/summaryview.c:6114
 msgid "Set color label"
 msgstr "Assigner une couleur de message"
 
-#: src/summaryview.c:6512
+#: src/summaryview.c:6557
 msgid "Ignored thread"
 msgstr "Fil de discussion ignoré"
 
-#: src/summaryview.c:6514
+#: src/summaryview.c:6559
 msgid "Watched thread"
 msgstr "Fil de discussion suivi"
 
-#: src/summaryview.c:6522
+#: src/summaryview.c:6567
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Répondu mais aussi transféré - cliquer pour voir la réponse"
 
-#: src/summaryview.c:6524
+#: src/summaryview.c:6569
 msgid "Replied - click to see reply"
 msgstr "Répondu - cliquer pour voir la réponse"
 
-#: src/summaryview.c:6536
+#: src/summaryview.c:6581
 msgid "To be moved"
 msgstr "À deplacer"
 
-#: src/summaryview.c:6538
+#: src/summaryview.c:6583
 msgid "To be copied"
 msgstr "À copier"
 
-#: src/summaryview.c:6550
+#: src/summaryview.c:6595
 msgid "Signed, has attachment(s)"
 msgstr "Signé et contenant une ou plusieurs pièces jointes"
 
-#: src/summaryview.c:6554
+#: src/summaryview.c:6599
 msgid "Encrypted, has attachment(s)"
 msgstr "Chiffré et contenant une ou plusieurs pièces jointes"
 
-#: src/summaryview.c:6556
+#: src/summaryview.c:6601
 msgid "Encrypted"
 msgstr "Chiffré"
 
-#: src/summaryview.c:6558
+#: src/summaryview.c:6603
 msgid "Has attachment(s)"
 msgstr "Contient une ou plusieurs pièces jointes"
 
-#: src/summaryview.c:8272
+#: src/summaryview.c:8317
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19226,53 +19238,45 @@ msgstr ""
 "Erreur dans l'expression régulière (regexp) :\n"
 "%s"
 
-#: src/summaryview.c:8375
+#: src/summaryview.c:8420
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Revenir à la liste des dossiers (vous avez des messages non lus)"
 
-#: src/summaryview.c:8380
+#: src/summaryview.c:8425
 msgid "Go back to the folder list"
 msgstr "Revenir à la liste des dossiers"
 
-#: src/textview.c:246
+#: src/textview.c:242
 msgid "_Open in web browser"
 msgstr "_Ouvrir avec le navigateur web"
 
-#: src/textview.c:247
+#: src/textview.c:243
 msgid "Copy this _link"
 msgstr "Copier l'adresse du _lien"
 
-#: src/textview.c:254
+#: src/textview.c:250
 msgid "_Reply to this address"
 msgstr "Répondre à cette ad_resse"
 
-#: src/textview.c:255
+#: src/textview.c:251
 msgid "Add to _Address book"
 msgstr "Ajouter au carnet d'_adresses"
 
-#: src/textview.c:256
+#: src/textview.c:252
 msgid "Copy this add_ress"
 msgstr "Copier cette ad_resse"
 
-#: src/textview.c:262
-msgid "_Open image"
-msgstr "_Ouvrir l'image"
-
-#: src/textview.c:263
-msgid "_Save image..."
-msgstr "Enregi_strer l'image sous.."
-
-#: src/textview.c:725
+#: src/textview.c:702
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d octets)]"
 
-#: src/textview.c:728
+#: src/textview.c:705
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d octets)]"
 
-#: src/textview.c:918
+#: src/textview.c:876
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -19286,74 +19290,73 @@ msgstr ""
 "\n"
 "  Pour plus d'informations, sélectionner "
 
-#: src/textview.c:923
+#: src/textview.c:881
 msgid "'Network Log'"
 msgstr "'Traces réseau'"
 
-#: src/textview.c:924
+#: src/textview.c:882
 msgid " in the Tools menu for more information."
 msgstr " dans le menu Outils."
 
-#: src/textview.c:990
+#: src/textview.c:948
 msgid "  The following can be performed on this part\n"
 msgstr ""
 "  Les actions suivantes peuvent être effectuées sur l'élément actuellement "
 "sélectionné\n"
 
-#: src/textview.c:992
+#: src/textview.c:950
 msgid "  by right-clicking the icon or list item:"
 msgstr ""
 "  en cliquant avec le bouton droit sur l'icône ou l'élément de la liste :"
 
-#: src/textview.c:996
+#: src/textview.c:954
 msgid "     - To save, select "
 msgstr "     - Pour l'enregistrer, sélectionner « "
 
-#: src/textview.c:997
+#: src/textview.c:955
 msgid "'Save as...'"
 msgstr "Enregistrer sous.."
 
-#: src/textview.c:999 src/textview.c:1011 src/textview.c:1023
-#: src/textview.c:1033
+#: src/textview.c:957 src/textview.c:969 src/textview.c:981 src/textview.c:991
 msgid " (Shortcut key: '"
 msgstr " (raccourci : '"
 
-#: src/textview.c:1007
+#: src/textview.c:965
 msgid "     - To display as text, select "
 msgstr "     - Pour l'afficher en tant que texte, sélectionner « "
 
-#: src/textview.c:1008
+#: src/textview.c:966
 msgid "'Display as text'"
 msgstr "Afficher comme du texte"
 
-#: src/textview.c:1019
+#: src/textview.c:977
 msgid "     - To open with an external program, select "
 msgstr ""
 "     - Pour l'ouvrir avec le programme externe correspondant, sélectionner « "
 
-#: src/textview.c:1020
+#: src/textview.c:978
 msgid "'Open'"
 msgstr "Ouvrir"
 
-#: src/textview.c:1028
+#: src/textview.c:986
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (un double-clic ou un clic avec le bouton "
 
-#: src/textview.c:1029
+#: src/textview.c:987
 msgid "mouse button)\n"
 msgstr "du milieu sont également possibles.);\n"
 
-#: src/textview.c:1031
+#: src/textview.c:989
 msgid "     - Or use "
 msgstr ""
 "     - Pour l'ouvrir avec un programme externe de votre choix, sélectionner "
 "« "
 
-#: src/textview.c:1032
+#: src/textview.c:990
 msgid "'Open with...'"
 msgstr "Ouvrir avec.."
 
-#: src/textview.c:1153
+#: src/textview.c:1111
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -19364,31 +19367,31 @@ msgstr ""
 "    %s\n"
 "Code de retour %d\n"
 
-#: src/textview.c:2229
+#: src/textview.c:2187
 msgid "Tags: "
 msgstr "Labels : "
 
-#: src/textview.c:2948
+#: src/textview.c:2906
 msgid "The real URL is different from the displayed URL."
 msgstr "L'URL réel est différent de l'URL affiché"
 
-#: src/textview.c:2949
+#: src/textview.c:2907
 msgid "Displayed URL:"
 msgstr "URL affiché :"
 
-#: src/textview.c:2950
+#: src/textview.c:2908
 msgid "Real URL:"
 msgstr "URL réel :"
 
-#: src/textview.c:2951
+#: src/textview.c:2909
 msgid "Open it anyway?"
 msgstr "Voulez-vous quand même l'ouvrir ?"
 
-#: src/textview.c:2952
+#: src/textview.c:2910
 msgid "Phishing attempt warning"
 msgstr "Attention : Tentative d'hameçonnage (phishing)"
 
-#: src/textview.c:2953
+#: src/textview.c:2911
 msgid "_Open URL"
 msgstr "_Ouvrir l'URL"
 
@@ -19763,24 +19766,24 @@ msgstr "Options de réponse à la liste"
 msgid "Forward Message options"
 msgstr "Options de transfert d'un message"
 
-#: src/uri_opener.c:88
+#: src/uri_opener.c:87
 msgid "There are no URLs in this email."
 msgstr "Ce message ne contient pas d'URLs."
 
-#: src/uri_opener.c:116
+#: src/uri_opener.c:115
 msgid "Available URLs:"
 msgstr "URLs disponibles :"
 
-#: src/uri_opener.c:181
+#: src/uri_opener.c:189
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "Sélection d'URLs à ouvrir"
 
-#: src/uri_opener.c:206
+#: src/uri_opener.c:216
 msgid "Please select the URL to open."
 msgstr "Veuillez sélectionner un URL à ouvrir."
 
-#: src/uri_opener.c:214
+#: src/uri_opener.c:224
 msgid "Select All"
 msgstr "Sélectionner tout"
 
@@ -20068,6 +20071,23 @@ msgstr ""
 "Vous pouvez maintenant cliquer sur « Enregistrer » pour\n"
 "débuter et apprécier.."
 
+#~ msgid "Unknown option\n"
+#~ msgstr ""
+#~ "claws-mail: option non reconnue.\n"
+#~ "Pour en savoir davantage, faites: « claws-mail --help ».\n"
+
+#~ msgid "Overwrite existing file?"
+#~ msgstr "Écraser le fichier existant ?"
+
+#~ msgid "Open in Viewer (enable remote content)"
+#~ msgstr "Ouvrir ici (activer le contenu distant)"
+
+#~ msgid "_Open image"
+#~ msgstr "_Ouvrir l'image"
+
+#~ msgid "_Save image..."
+#~ msgstr "Enregi_strer l'image sous.."
+
 #~ msgid ""
 #~ "Input the location of mailbox.\n"
 #~ "If an existing mailbox is specified, it will be\n"

commit 7eca362ef251644bc0ceb7310ae26f2c7a5943a0
Author: Ricardo Mones <ricardo at mones.org>
Date:   Mon Jul 22 10:39:59 2019 +0200

    Update Spanish translation for release

diff --git a/po/es.po b/po/es.po
index 6878f5027..e50401cb8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,17 +1,17 @@
 # Spanish translation of Claws Mail.
-# Copyright © 2000-2018 The Claws Mail team.
+# Copyright © 2000-2019 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
-# Ricardo Mones <ricardo at mones.org>, 2000-2018.
+# Ricardo Mones <ricardo at mones.org>, 2000-2019.
 # Carles Tubio Terrón <c at rles-tub.io>, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.17.2\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2018-12-13 09:17+0100\n"
-"PO-Revision-Date: 2018-12-13 09:59+0200\n"
+"POT-Creation-Date: 2017-03-25 21:08+0100\n"
+"PO-Revision-Date: 2019-07-22 00:09+0200\n"
 "Last-Translator: Ricardo Mones <ricardo at mones.org>\n"
 "Language-Team: Spanish\n"
 "Language: es\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:402 src/account.c:469
+#: 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,15 +28,15 @@ msgstr ""
 "Hay ventanas de composición abiertas.\n"
 "Cierre todas las ventanas de composición antes de editar las cuentas."
 
-#: src/account.c:447
+#: src/account.c:441
 msgid "Can't create folder."
 msgstr "No se puede crear la carpeta."
 
-#: src/account.c:735
+#: src/account.c:728
 msgid "Edit accounts"
 msgstr "Editar cuentas"
 
-#: src/account.c:752
+#: 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,60 +46,60 @@ msgstr ""
 "orden dado, la casilla indica que cuentas se incluirán. El texto en negrita "
 "indica la cuenta predeterminada."
 
-#: src/account.c:823
+#: src/account.c:816
 msgid " _Set as default account "
 msgstr " _Establecer como primaria "
 
-#: src/account.c:915
+#: src/account.c:908
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Las cuentas con carpetas remotas no se pueden copiar."
 
-#: src/account.c:922
+#: src/account.c:915
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 
-#: src/account.c:1119
+#: src/account.c:1096
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Realmente quiere borrar la cuenta «%s»?"
 
-#: src/account.c:1121
+#: src/account.c:1098
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: src/account.c:1122
+#: src/account.c:1099
 msgid "Delete account"
 msgstr "Borrar cuenta"
 
-#: src/account.c:1596
+#: src/account.c:1589
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1602
+#: src/account.c:1595
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 
-#: src/account.c:1609 src/addrduplicates.c:471 src/addressadd.c:222
-#: src/addressbook.c:128 src/compose.c:7462 src/editaddress.c:1473
-#: src/editaddress.c:1502 src/editaddress.c:1518
-#: src/editaddress_other_attributes_ldap.c:371
-#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:170
-#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:427
+#: src/account.c:1602 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7333 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:275 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
-#: src/plugins/pgpcore/select-keys.c:463 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1874 src/prefs_template.c:79 src/prefs_themes.c:990
+#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
+#: src/plugins/pdf_viewer/poppler_viewer.c:1792
+#: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1868 src/prefs_template.c:79
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account.c:1617 src/prefs_account.c:1196 src/prefs_account.c:4644
+#: src/account.c:1610 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:1625 src/ssl_manager.c:109
+#: src/account.c:1618 src/ssl_manager.c:100
 msgid "Server"
 msgstr "Servidor"
 
@@ -126,11 +126,11 @@ msgstr ""
 "La acción seleccionada no se puede usar en la ventana de composición\n"
 "porque contiene %%f, %%F, %%as o %%p."
 
-#: src/action.c:720
+#: src/action.c:719
 msgid "There is no filtering action set"
 msgstr "No hay acciones de filtrado establecidas"
 
-#: src/action.c:722
+#: src/action.c:721
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -139,7 +139,7 @@ msgstr ""
 "Acciones de filtrado inválidas:\n"
 "%s"
 
-#: src/action.c:987
+#: src/action.c:986
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -150,35 +150,34 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:989 src/compose.c:5257 src/compose.c:5262 src/ldaputil.c:333
-#: src/plugins/bogofilter/bogofilter.c:858
-#: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1824
-#: src/plugins/vcalendar/vcal_folder.c:1828
-#: src/plugins/vcalendar/vcal_folder.c:1846
-#: src/plugins/vcalendar/vcal_folder.c:1849 src/privacy.c:62
+#: src/action.c:988 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:857
+#: src/plugins/tnef_parse/tnef_parse.c:75
+#: src/plugins/vcalendar/vcal_folder.c:1827
+#: src/plugins/vcalendar/vcal_folder.c:1831
+#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1847 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/action.c:1207 src/action.c:1379
+#: src/action.c:1206 src/action.c:1371
 msgid "Completed"
 msgstr "Completado"
 
-#: src/action.c:1243
+#: src/action.c:1242
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Ejecutando: %s\n"
 
-#: src/action.c:1247
+#: src/action.c:1246
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 
-#: src/action.c:1293
+#: src/action.c:1279
 msgid "Action's input/output"
 msgstr "Entrada/salida de la acción"
 
-#: src/action.c:1625
+#: src/action.c:1607
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -189,11 +188,11 @@ msgstr ""
 "(«%%h» será sustituido con el parámetro)\n"
 "  %s"
 
-#: src/action.c:1630
+#: src/action.c:1612
 msgid "Action's hidden user argument"
 msgstr "Parámetro de usuario oculto para la acción"
 
-#: src/action.c:1634
+#: src/action.c:1616
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -204,24 +203,24 @@ msgstr ""
 "(«%%u» será sustituido con el parámetro)\n"
 "  %s"
 
-#: src/action.c:1639
+#: src/action.c:1621
 msgid "Action's user argument"
 msgstr "Parámetro de usuario para la acción"
 
-#: src/addrclip.c:481
+#: src/addrclip.c:479
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "No se puede copiar una carpeta a si misma o su sub-estructura."
 
-#: src/addrclip.c:504
+#: src/addrclip.c:502
 msgid "Cannot copy an address book to itself."
 msgstr "No se puede copiar una agenda a si misma."
 
-#: src/addrclip.c:595
+#: src/addrclip.c:593
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "No se puede mover la carpeta a si misma o a su sub-estructura."
 
-#: src/addr_compl.c:689 src/addressbook.c:5016
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/addr_compl.c:689 src/addressbook.c:4946
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Grupo"
 
@@ -261,31 +260,31 @@ msgstr "fax"
 msgid "website"
 msgstr "página web"
 
-#: src/addrcustomattr.c:146
+#: src/addrcustomattr.c:141
 msgid "Attribute name"
 msgstr "Nombre del atributo"
 
-#: src/addrcustomattr.c:161
+#: src/addrcustomattr.c:156
 msgid "Delete all attribute names"
 msgstr "Borrar todos los nombres de atributo"
 
-#: src/addrcustomattr.c:162
+#: src/addrcustomattr.c:157
 msgid "Do you really want to delete all attribute names?"
 msgstr "¿Quiere borrar realmente todos los nombres de atributos?"
 
-#: src/addrcustomattr.c:186
+#: src/addrcustomattr.c:181
 msgid "Delete attribute name"
 msgstr "Borrar nombre de atributo"
 
-#: src/addrcustomattr.c:187
+#: src/addrcustomattr.c:182
 msgid "Do you really want to delete this attribute name?"
 msgstr "¿Quiere borrar realmente este nombre de atributo?"
 
-#: src/addrcustomattr.c:196
+#: src/addrcustomattr.c:191
 msgid "Reset to default"
 msgstr "Reiniciar valores"
 
-#: src/addrcustomattr.c:197
+#: src/addrcustomattr.c:192
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
@@ -293,36 +292,36 @@ msgstr ""
 "¿Realmente quiere reemplazar todos los nombres de\n"
 "atributos con los valores iniciales predeterminados?"
 
-#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
-#: src/addressbook.c:484 src/edittags.c:286
-#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1085
-#: src/prefs_filtering.c:1699 src/prefs_template.c:1111
+#: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
+#: src/addressbook.c:483 src/edittags.c:272
+#: src/plugins/archive/archiver_gtk.c:1307 src/prefs_actions.c:1084
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1109
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
+#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1085
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1110
 msgid "Delete _all"
 msgstr "_Borrar todo"
 
-#: src/addrcustomattr.c:219
+#: src/addrcustomattr.c:214
 msgid "_Reset to default"
 msgstr "_Reiniciar valores"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
 msgstr "No se estableció el nombre del atributo."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Editar nombres de atributos"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:476
 msgid "New attribute name:"
 msgstr "Nombre del nuevo atributo:"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:513
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -356,8 +355,8 @@ msgstr "No se encontraron direcciones de correo duplicadas en la agenda"
 msgid "Duplicate email addresses"
 msgstr "Direcciones de correo duplicadas"
 
-#: src/addrduplicates.c:442 src/addressadd.c:234
-#: src/plugins/pgpcore/select-keys.c:469 src/toolbar.c:529
+#: src/addrduplicates.c:442 src/addressadd.c:227
+#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:526
 msgid "Address"
 msgstr "Dirección"
 
@@ -365,50 +364,50 @@ msgstr "Dirección"
 msgid "Address book path"
 msgstr "Ruta a la agenda de direcciones"
 
-#: src/addrduplicates.c:790 src/addressbook.c:1441 src/addressbook.c:1494
+#: src/addrduplicates.c:793 src/addressbook.c:1438 src/addressbook.c:1491
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1495
+#: src/addrduplicates.c:794 src/addressbook.c:1492
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addrduplicates.c:840
+#: src/addrduplicates.c:842
 msgid "Delete address"
 msgstr "Borrar dirección"
 
-#: src/addrduplicates.c:841 src/addressbook.c:1442
+#: src/addrduplicates.c:843 src/addressbook.c:1439
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Esta dirección es solo de lectura y no se puede borrar."
 
-#: src/addressadd.c:192 src/prefs_filtering_action.c:195
+#: src/addressadd.c:185 src/prefs_filtering_action.c:201
 msgid "Add to address book"
 msgstr "Añadir a la agenda"
 
-#: src/addressadd.c:214
+#: src/addressadd.c:207
 msgid "Contact"
 msgstr "Contacto"
 
-#: src/addressadd.c:245 src/addressbook.c:130 src/editaddress.c:1257
-#: src/editaddress.c:1301 src/editgroup.c:292
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1056
+#: src/editaddress.c:1131 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Notas"
 
-#: src/addressadd.c:286 src/addressbook_foldersel.c:158
+#: src/addressadd.c:257 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:596 src/addressbook.c:3264 src/addressbook.c:3315
+#: src/addressadd.c:534 src/addressbook.c:3216 src/addressbook.c:3267
 msgid "Add address(es)"
 msgstr "Añadir dirección(es)"
 
-#: src/addressadd.c:597
+#: src/addressadd.c:535
 msgid "Can't add the specified address"
 msgstr "No se puede añadir la dirección especificada"
 
-#: src/addressbook.c:129 src/addressbook.c:5004 src/editaddress.c:1246
-#: src/editaddress.c:1284 src/editgroup.c:291 src/expldifdlg.c:517
-#: src/exporthtml.c:601 src/exporthtml.c:765 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 "Dirección de correo"
 
@@ -416,27 +415,27 @@ msgstr "Dirección de correo"
 msgid "_Book"
 msgstr "_Agenda"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
-#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:515
-#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
+#: src/addressbook.c:482 src/compose.c:602 src/mainwindow.c:514
+#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:518
-#: src/messageview.c:215
+#: src/addressbook.c:407 src/compose.c:607 src/mainwindow.c:517
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:520
-#: src/messageview.c:216
+#: src/addressbook.c:408 src/compose.c:608 src/mainwindow.c:519
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: src/addressbook.c:411 src/addressbook.c:469
+#: src/addressbook.c:411 src/addressbook.c:468
 msgid "New _Book"
 msgstr "Nueva _agenda"
 
-#: src/addressbook.c:412 src/addressbook.c:470
+#: src/addressbook.c:412 src/addressbook.c:469
 msgid "New _Folder"
 msgstr "Nueva _carpeta"
 
@@ -460,213 +459,209 @@ msgstr "_Editar agenda"
 msgid "_Delete book"
 msgstr "_Borrar agenda"
 
-#: src/addressbook.c:427 src/compose.c:624
+#: src/addressbook.c:427 src/compose.c:619
 #: src/plugins/managesieve/sieve_editor.c:85
-#: src/plugins/managesieve/sieve_editor.c:434
-#: src/plugins/managesieve/sieve_editor.c:633
+#: src/plugins/managesieve/sieve_editor.c:433
+#: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Save"
 msgstr "_Guardar..."
 
-#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
+#: src/addressbook.c:428 src/compose.c:623 src/messageview.c:222
 #: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
 msgid "_Select all"
 msgstr "_Seleccionar todo"
 
-#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
+#: src/addressbook.c:433 src/addressbook.c:472 src/addressbook.c:488
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:636 src/mainwindow.c:549 src/messageview.c:228
+#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
+#: src/compose.c:631 src/mainwindow.c:548 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
-#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/addressbook.c:440 src/addressbook.c:486
+#: src/addressbook.c:440 src/addressbook.c:485
 msgid "New _Address"
 msgstr "Nueva _dirección"
 
-#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
+#: src/addressbook.c:441 src/addressbook.c:470 src/addressbook.c:486
 msgid "New _Group"
 msgstr "Nuevo _grupo"
 
-#: src/addressbook.c:443 src/addressbook.c:493
+#: src/addressbook.c:443 src/addressbook.c:492
 msgid "_Mail To"
 msgstr "_Correo para"
 
-#: src/addressbook.c:444 src/addressbook.c:497
-msgid "_Merge"
-msgstr "_Fusionar"
-
-#: src/addressbook.c:448
+#: src/addressbook.c:447
 msgid "Import _LDIF file..."
 msgstr "Importar fichero _LDIF..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Import M_utt file..."
 msgstr "Importar fichero M_utt..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Import _Pine file..."
 msgstr "Importar fichero _Pine..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:451
 msgid "Export _HTML..."
 msgstr "Exportar _HTML..."
 
-#: src/addressbook.c:453
+#: src/addressbook.c:452
 msgid "Export LDI_F..."
 msgstr "Exportar LDI_F..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:454
 msgid "Find duplicates..."
 msgstr "Buscar duplicados..."
 
-#: src/addressbook.c:456
+#: src/addressbook.c:455
 msgid "Edit custom attributes..."
 msgstr "Editar atributos de usuario..."
 
-#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:814
-#: src/messageview.c:340
+#: src/addressbook.c:458 src/compose.c:709 src/mainwindow.c:815
+#: src/messageview.c:337
 msgid "_About"
 msgstr "_Acerca de"
 
-#: src/addressbook.c:495
+#: src/addressbook.c:494
 msgid "_Browse Entry"
 msgstr "_Ver entrada"
 
-#: src/addressbook.c:509 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
-#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
-#: src/prefs_themes.c:851 src/prefs_themes.c:852
+#: src/addressbook.c: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:782
+#: src/prefs_themes.c:814 src/prefs_themes.c:815
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
+#: src/addressbook.c:514 src/addressbook.c:533 src/importldif.c:121
 msgid "Success"
 msgstr "Éxito"
 
-#: src/addressbook.c:517 src/importldif.c:122
+#: src/addressbook.c:515 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Argumentos incorrectos"
 
-#: src/addressbook.c:518 src/importldif.c:123
+#: src/addressbook.c:516 src/importldif.c:123
 msgid "File not specified"
 msgstr "No se especificó el fichero"
 
-#: src/addressbook.c:519 src/importldif.c:124
+#: src/addressbook.c:517 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Error abriendo el fichero"
 
-#: src/addressbook.c:520 src/importldif.c:125
+#: src/addressbook.c:518 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Error leyendo el fichero"
 
-#: src/addressbook.c:521 src/importldif.c:126
+#: src/addressbook.c:519 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Encontrado final del fichero"
 
-#: src/addressbook.c:522 src/importldif.c:127
+#: src/addressbook.c:520 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Error reservando memoria"
 
-#: src/addressbook.c:523 src/importldif.c:128
+#: src/addressbook.c:521 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Formato de fichero erróneo"
 
-#: src/addressbook.c:524 src/importldif.c:129
+#: src/addressbook.c:522 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Error escribiendo en el fichero"
 
-#: src/addressbook.c:525 src/importldif.c:130
+#: src/addressbook.c:523 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Error abriendo el directorio"
 
-#: src/addressbook.c:526 src/importldif.c:131
+#: src/addressbook.c:524 src/importldif.c:131
 msgid "No path specified"
 msgstr "No se especificó una ruta"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:534
 msgid "Error connecting to LDAP server"
 msgstr "Error conectando al servidor LDAP"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:535
 msgid "Error initializing LDAP"
 msgstr "Error inicializando LDAP"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:536
 msgid "Error binding to LDAP server"
 msgstr "Error enlazando con el servidor LDAP"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:537
 msgid "Error searching LDAP database"
 msgstr "Error buscando en la base de datos LDAP"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:538
 msgid "Timeout performing LDAP operation"
 msgstr "Fuera de tiempo en la operación LDAP"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:539
 msgid "Error in LDAP search criteria"
 msgstr "Error en el criterio de búsqueda LDAP"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:540
 msgid "No LDAP entries found for search criteria"
 msgstr "No se encontraron entradas LDAP para el criterio de búsqueda"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:541
 msgid "LDAP search terminated on request"
 msgstr "Se solicitó concluir la búsqueda LDAP"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:542
 msgid "Error starting STARTTLS connection"
 msgstr "Error iniciando la conexión con STARTTLS"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:543
 msgid "Distinguished Name (dn) is missing"
 msgstr "Falta el nombre distinguido (dn)"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:544
 msgid "Missing required information"
 msgstr "Falta la información necesaria"
 
-#: src/addressbook.c:547
+#: src/addressbook.c:545
 msgid "Another contact exists with that key"
 msgstr "Ya existe un contacto con esa clave"
 
-#: src/addressbook.c:548
+#: src/addressbook.c:546
 msgid "Strong(er) authentication required"
 msgstr "Se necesita autenticación (más) fuerte"
 
-#: src/addressbook.c:916
+#: src/addressbook.c:913
 msgid "Sources"
 msgstr "Fuentes"
 
-#: src/addressbook.c:920 src/prefs_matcher.c:642 src/prefs_other.c:490
-#: src/toolbar.c:268 src/toolbar.c:2522
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/toolbar.c:268 src/toolbar.c:2441
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:1114 src/editldap.c:793
+#: src/addressbook.c:1112 src/editldap.c:781
 msgid "Search"
 msgstr "Buscar"
 
-#: src/addressbook.c:1486
+#: src/addressbook.c:1483
 msgid "Delete group"
 msgstr "Borrar grupo"
 
-#: src/addressbook.c:1487
+#: src/addressbook.c:1484
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -674,26 +669,26 @@ msgstr ""
 "¿Quiere borrar el(los) grupo(s)?\n"
 "Las direcciones que contienen no se perderán."
 
-#: src/addressbook.c:2214
+#: src/addressbook.c:2195
 msgid "Cannot paste. Target address book is readonly."
 msgstr "No puedo pegar. El libro de direcciones destino es solo de lectura."
 
-#: src/addressbook.c:2224
+#: src/addressbook.c:2205
 msgid "Cannot paste into an address group."
 msgstr "No se puede pegar dentro de un grupo de direcciones."
 
-#: src/addressbook.c:2961
+#: src/addressbook.c:2913
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "¿Quiere borrar los resultados de la búsqueda y direcciones en «%s»?"
 
-#: src/addressbook.c:2964 src/addressbook.c:2990 src/addressbook.c:2997
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
-#: src/toolbar.c:497
+#: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
+#: src/toolbar.c:494
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:2973
+#: src/addressbook.c:2925
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -702,20 +697,20 @@ msgstr ""
 "¿Quiere borrar «%s»? Si borra sólo la carpeta las direcciones que contenga "
 "se moverán a la carpeta padre."
 
-#: src/addressbook.c:2976 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
+#: src/addressbook.c:2928 src/imap_gtk.c:370 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:2977
+#: src/addressbook.c:2929
 msgid "Delete _folder only"
 msgstr "Borrar sólo _carpeta"
 
-#: src/addressbook.c:2977
+#: src/addressbook.c:2929
 msgid "Delete folder and _addresses"
 msgstr "Borrar carpeta y _direcciones"
 
-#: src/addressbook.c:2988
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -724,7 +719,7 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene no se perderán."
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2947
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -733,28 +728,28 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene se perderán."
 
-#: src/addressbook.c:3109
+#: src/addressbook.c:3061
 #, c-format
 msgid "Search '%s'"
 msgstr " Buscar «%s»"
 
-#: src/addressbook.c:3247 src/addressbook.c:3296
+#: src/addressbook.c:3199 src/addressbook.c:3248
 msgid "New Contacts"
 msgstr "Nuevos contactos"
 
-#: src/addressbook.c:4135
+#: src/addressbook.c:4087
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se puede guardar el fichero índice."
 
-#: src/addressbook.c:4139
+#: src/addressbook.c:4091
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pueden guardar los ficheros de direcciones"
 
-#: src/addressbook.c:4149
+#: src/addressbook.c:4101
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:4154
+#: src/addressbook.c:4106
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -762,7 +757,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se puede guardar el nuevo fichero índice."
 
-#: src/addressbook.c:4167
+#: src/addressbook.c:4119
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -770,7 +765,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:4173
+#: src/addressbook.c:4125
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -778,7 +773,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "no se pudo guardar el fichero índice para la nueva."
 
-#: src/addressbook.c:4178
+#: src/addressbook.c:4130
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -786,263 +781,280 @@ msgstr ""
 "No se puede convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para la nueva."
 
-#: src/addressbook.c:4185 src/addressbook.c:4191
+#: src/addressbook.c:4137 src/addressbook.c:4143
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:4306
+#: src/addressbook.c:4257
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:4307
+#: src/addressbook.c:4258
 msgid "Could not read address index"
 msgstr "No se puede leer el índice de direcciones"
 
-#: src/addressbook.c:4638
+#: src/addressbook.c:4589
 msgid "Busy searching..."
 msgstr "Buscando..."
 
-#: src/addressbook.c:4968 src/prefs_send.c:220
+#: src/addressbook.c:4898 src/prefs_send.c:188
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:4980
+#: src/addressbook.c:4910
 msgid "Address Books"
 msgstr "Agendas de direcciones"
 
-#: src/addressbook.c:4992
+#: src/addressbook.c:4922
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:5028 src/exporthtml.c:885 src/folderview.c:365
-#: src/folderview.c:453 src/prefs_account.c:3169 src/prefs_folder_column.c:77
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:355
+#: src/folderview.c:443 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:5040
+#: src/addressbook.c:4970
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5052 src/addressbook.c:5064
+#: src/addressbook.c:4982 src/addressbook.c:4994
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5076
+#: src/addressbook.c:5006
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
-#: src/addressbook.c:5088
+#: src/addressbook.c:5018
 msgid "LDAP Query"
 msgstr "Petición LDAP"
 
-#: src/addressbook_foldersel.c:200 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:985 src/importldif.c:541
+#: 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 "Agenda de direcciones"
 
-#: src/addrgather.c:179
+#: 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/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:2520
+#: src/prefs_matcher.c:2524
+msgid "Any"
+msgstr "Cualquiera"
+
+#: src/addrgather.c:173
 msgid "Please specify name for address book."
 msgstr "Especifique el nombre de la agenda por favor."
 
-#: src/addrgather.c:186
+#: src/addrgather.c:180
 msgid "No available address book."
 msgstr "No hay agendas disponibles."
 
-#: src/addrgather.c:207
+#: src/addrgather.c:201
 msgid "Please select the mail headers to search."
 msgstr "Seleccione las cabeceras a buscar por favor."
 
-#: src/addrgather.c:214
+#: src/addrgather.c:208
 msgid "Collecting addresses..."
 msgstr "Recopilando direcciones..."
 
-#: src/addrgather.c:254
-msgid "address added by Claws Mail"
-msgstr "dirección añadida por Claws Mail"
+#: src/addrgather.c:248
+msgid "address added by claws-mail"
+msgstr "dirección añadida por claws-mail"
 
-#: src/addrgather.c:285
+#: src/addrgather.c:276
 msgid "Addresses collected successfully."
 msgstr "Direcciones recopiladas con éxito."
 
-#: src/addrgather.c:360
+#: src/addrgather.c:351
 msgid "Current folder:"
 msgstr "Directorio actual:"
 
-#: src/addrgather.c:371
+#: src/addrgather.c:362
 msgid "Address book name:"
 msgstr "Agenda de direcciones :"
 
-#: src/addrgather.c:398
+#: src/addrgather.c:389
 msgid "Address book folder size:"
 msgstr "Tamaño de la carpeta de agenda:"
 
-#: src/addrgather.c:402 src/addrgather.c:411
+#: src/addrgather.c:393 src/addrgather.c:403
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr "Número máximo de entradas por carpeta dentro de la nueva agenda creada"
 
-#: src/addrgather.c:415
+#: src/addrgather.c:407
 msgid "Process these mail header fields"
 msgstr "Procesar las siguientes cabeceras"
 
-#: src/addrgather.c:434
+#: src/addrgather.c:426
 msgid "Include subfolders"
 msgstr "Incluir subcarpetas"
 
-#: src/addrgather.c:492 src/prefs_filtering_action.c:1383
+#: src/addrgather.c:450 src/prefs_filtering_action.c:1426
 msgid "Header Name"
 msgstr "Nombre cabecera"
 
-#: src/addrgather.c:498
+#: src/addrgather.c:451
 msgid "Address Count"
 msgstr "N.º direcciones"
 
-#: src/addrgather.c:585
+#: src/addrgather.c:561
 msgid "Header Fields"
 msgstr "Campos cabecera"
 
-#: src/addrgather.c:586 src/exphtmldlg.c:658 src/expldifdlg.c:722
-#: src/importldif.c:981
+#: src/addrgather.c:562 src/exphtmldlg.c:658 src/expldifdlg.c:722
+#: src/importldif.c:1022
 msgid "Finish"
 msgstr "Finalizar"
 
-#: src/addrgather.c:644
+#: src/addrgather.c:620
 msgid "Collect email addresses from selected messages"
 msgstr "Recopilar direcciones de correo de los mensajes seleccionados"
 
-#: src/addrgather.c:648
+#: src/addrgather.c:624
 msgid "Collect email addresses from folder"
 msgstr "Recopilar direcciones de correo de la carpeta"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "Direcciones comunes"
 
-#: src/addrindex.c:126
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "Direcciones personales"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "Dirección común"
 
-#: src/addrindex.c:133
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/addrindex.c:1830
+#: src/addrindex.c:1829
 msgid "Address(es) update"
 msgstr "Actualizar dirección(es)"
 
-#: src/addrindex.c:1831
+#: src/addrindex.c:1830
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Falló la actualización. No se escribieron los cambios en el directorio."
 
-#: src/alertpanel.c:144 src/compose.c:9783
+#: src/alertpanel.c:146 src/compose.c:9624
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:157 src/compose.c:5848 src/compose.c:6390
-#: src/compose.c:12246 src/file_checker.c:79 src/file_checker.c:102
-#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:807
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5071
+#: src/alertpanel.c:159 src/compose.c:5780 src/compose.c:6301
+#: src/compose.c:12047 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4895
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5785 src/inc.c:723
-#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5717 src/inc.c:663
+#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Error"
 
-#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:196 src/gtk/progressdialog.c:94
 msgid "_View log"
 msgstr "_Ver traza"
 
-#: src/alertpanel.c:346
+#: src/alertpanel.c:347
 msgid "Show this message next time"
 msgstr "Mostrar este mensaje de nuevo"
 
-#: src/browseldap.c:223
+#: src/browseldap.c:218
 msgid "Browse Directory Entry"
 msgstr "Ver entrada del directorio"
 
-#: src/browseldap.c:243
+#: src/browseldap.c:237
 msgid "Server Name:"
 msgstr "Nombre del servidor :"
 
-#: src/browseldap.c:253
+#: src/browseldap.c:247
 msgid "Distinguished Name (dn):"
 msgstr "Nombre distinguido (dn) :"
 
-#: src/browseldap.c:284
+#: src/browseldap.c:270
 msgid "LDAP Name"
 msgstr "Nombre LDAP"
 
-#: src/browseldap.c:290
+#: src/browseldap.c:272
 msgid "Attribute Value"
 msgstr "Valor del atributo"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Nada"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "un visor"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "un parser MIME"
 
-#: src/common/plugin.c:73
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "carpetas"
 
-#: src/common/plugin.c:74
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "filtrado"
 
-#: src/common/plugin.c:75
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "un interfaz de privacidad"
 
-#: src/common/plugin.c:76
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "un notificador"
 
-#: src/common/plugin.c:77
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "una utilidad"
 
-#: src/common/plugin.c:78
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "cosas"
 
-#: src/common/plugin.c:335
+#: 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:438
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "El módulo ya está cargado"
 
-#: src/common/plugin.c:449
+#: 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:483
+#: 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:492
+#: 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:770
+#: src/common/plugin.c:769
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1051,7 +1063,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:773
+#: src/common/plugin.c:772
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1059,16 +1071,16 @@ 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:782
+#: 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:784
+#: 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."
 
-#: src/common/session.c:202 src/imap.c:1226
+#: src/common/session.c:183 src/imap.c:1207
 msgid "SSL/TLS handshake failed\n"
 msgstr "Negociación SSL/TLS fallida\n"
 
@@ -1088,7 +1100,7 @@ msgstr "respuesta SMTP incorrecta\n"
 msgid "error occurred on SMTP session\n"
 msgstr "hubo un error en la sesión SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:906
+#: src/common/smtp.c:535 src/pop.c:905
 msgid "error occurred on authentication\n"
 msgstr "hubo un error en la autenticación\n"
 
@@ -1097,113 +1109,113 @@ msgstr "hubo un error en la autenticación\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "El mensaje es demasiado grande (Máximo %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:899
+#: src/common/smtp.c:617 src/pop.c:898
 msgid "couldn't start STARTTLS session\n"
 msgstr "no se pudo iniciar la sesión STARTTLS\n"
 
-#: src/common/socket.c:573
+#: src/common/socket.c:571
 msgid "Socket IO timeout.\n"
 msgstr "Tiempo límite de E/S en el conector.\n"
 
-#: src/common/socket.c:602
+#: src/common/socket.c:600
 msgid "Connection timed out.\n"
 msgstr "La conexión excedió el límite de tiempo.\n"
 
-#: src/common/socket.c:742
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: la conexión ha fallado (%s).\n"
 
-#: src/common/socket.c:982
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: anfitrión desconocido.\n"
 
-#: src/common/socket.c:1074
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: falló la búsqueda de la máquina (%s).\n"
 
-#: src/common/socket.c:1378
+#: src/common/socket.c:1370
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escribir en fd%d: %s\n"
 
-#: src/common/ssl_certificate.c:339
+#: src/common/ssl_certificate.c:326
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "No se encuentra el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:347
+#: src/common/ssl_certificate.c:334
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "No se puede leer el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:356
+#: src/common/ssl_certificate.c:343
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "No se puede importar el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:641
+#: src/common/ssl_certificate.c:628
 msgid "Internal error"
 msgstr "Error interno"
 
-#: src/common/ssl_certificate.c:646
+#: src/common/ssl_certificate.c:633
 msgid "Uncheckable"
 msgstr "No se puede comprobar"
 
-#: src/common/ssl_certificate.c:650
+#: src/common/ssl_certificate.c:637
 msgid "Self-signed certificate"
 msgstr "Certificado firmado por si mismo"
 
-#: src/common/ssl_certificate.c:653
+#: src/common/ssl_certificate.c:640
 msgid "Revoked certificate"
 msgstr "Certificado revocado"
 
-#: src/common/ssl_certificate.c:655
+#: src/common/ssl_certificate.c:642
 msgid "No certificate issuer found"
 msgstr "No se encontró el emisor del certificado"
 
-#: src/common/ssl_certificate.c:657
+#: src/common/ssl_certificate.c:644
 msgid "Certificate issuer is not a CA"
 msgstr "El emisor del certificado no es una AC"
 
-#: src/common/ssl_certificate.c:882
+#: src/common/ssl_certificate.c:869
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "No se puede abrir el fichero de certificado %s: %s\n"
 
-#: src/common/ssl_certificate.c:886
+#: src/common/ssl_certificate.c:873
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "Falta el fichero de certificado %s (%s)\n"
 
-#: src/common/ssl_certificate.c:905
+#: src/common/ssl_certificate.c:892
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "No se puede abrir el fichero de clave %s (%s)\n"
 
-#: src/common/ssl_certificate.c:909
+#: src/common/ssl_certificate.c:896
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "Falta el fichero de claves %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1057
+#: src/common/ssl_certificate.c:1044
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "No se puede leer el fichero de certificado P12 %s\n"
 
-#: src/common/ssl_certificate.c:1060
+#: src/common/ssl_certificate.c:1047
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "No se puede abrir el fichero de certificado P12 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1064
+#: src/common/ssl_certificate.c:1051
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "Falta el fichero de certificado P12 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1089 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
@@ -1214,595 +1226,581 @@ msgstr "<no en el certificado>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Asunto vacío por expr. reg.)"
 
-#: src/common/utils.c:198
+#: src/common/utils.c:256
 #, c-format
 msgid "%dB"
 msgstr "%d B"
 
-#: src/common/utils.c:199
+#: src/common/utils.c:257
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d kB"
 
-#: src/common/utils.c:200
+#: src/common/utils.c:258
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d MB"
 
-#: src/common/utils.c:201
+#: src/common/utils.c:259
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f GB"
 
-#: src/common/utils.c:4009
+#: src/common/utils.c:4759
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/common/utils.c:4010
+#: src/common/utils.c:4760
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/common/utils.c:4011
+#: src/common/utils.c:4761
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/common/utils.c:4012
+#: src/common/utils.c:4762
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/common/utils.c:4013
+#: src/common/utils.c:4763
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/common/utils.c:4014
+#: src/common/utils.c:4764
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/common/utils.c:4015
+#: src/common/utils.c:4765
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/common/utils.c:4017
+#: src/common/utils.c:4767
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Enero"
 
-#: src/common/utils.c:4018
+#: src/common/utils.c:4768
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrero"
 
-#: src/common/utils.c:4019
+#: src/common/utils.c:4769
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marzo"
 
-#: src/common/utils.c:4020
+#: src/common/utils.c:4770
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4021
+#: src/common/utils.c:4771
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mayo"
 
-#: src/common/utils.c:4022
+#: src/common/utils.c:4772
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junio"
 
-#: src/common/utils.c:4023
+#: src/common/utils.c:4773
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julio"
 
-#: src/common/utils.c:4024
+#: src/common/utils.c:4774
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: src/common/utils.c:4025
+#: src/common/utils.c:4775
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septiembre"
 
-#: src/common/utils.c:4026
+#: src/common/utils.c:4776
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4027
+#: src/common/utils.c:4777
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Noviembre"
 
-#: src/common/utils.c:4028
+#: src/common/utils.c:4778
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Diciembre"
 
-#: src/common/utils.c:4030
+#: src/common/utils.c:4780
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: src/common/utils.c:4031
+#: src/common/utils.c:4781
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4032
+#: src/common/utils.c:4782
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4033
+#: src/common/utils.c:4783
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mié"
 
-#: src/common/utils.c:4034
+#: src/common/utils.c:4784
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jue"
 
-#: src/common/utils.c:4035
+#: src/common/utils.c:4785
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Vie"
 
-#: src/common/utils.c:4036
+#: src/common/utils.c:4786
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/common/utils.c:4038
+#: src/common/utils.c:4788
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Ene"
 
-#: src/common/utils.c:4039
+#: src/common/utils.c:4789
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4040
+#: src/common/utils.c:4790
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4041
+#: src/common/utils.c:4791
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:4042
+#: src/common/utils.c:4792
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "May"
 
-#: src/common/utils.c:4043
+#: src/common/utils.c:4793
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4044
+#: src/common/utils.c:4794
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4045
+#: src/common/utils.c:4795
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:4046
+#: src/common/utils.c:4796
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4047
+#: src/common/utils.c:4797
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4048
+#: src/common/utils.c:4798
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4049
+#: src/common/utils.c:4799
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dic"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4810
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4811
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4812
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4813
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:596
+#: src/compose.c:591
 msgid "_Add..."
 msgstr "_Añadir..."
 
-#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:323
+#: src/compose.c:592 src/mh_gtk.c:377 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:316
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: src/compose.c:599 src/folderview.c:258
+#: src/compose.c:594 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: src/compose.c:606 src/mainwindow.c:517 src/messageview.c:214
+#: src/compose.c:601 src/mainwindow.c:516 src/messageview.c:211
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: src/compose.c:609
+#: src/compose.c:604
 msgid "_Spelling"
 msgstr "_Ortografía"
 
-#: src/compose.c:611 src/compose.c:678
+#: src/compose.c:606 src/compose.c:673
 msgid "_Options"
 msgstr "_Opciones"
 
-#: src/compose.c:615
+#: src/compose.c:610
 msgid "S_end"
 msgstr "_Enviar"
 
-#: src/compose.c:616
+#: src/compose.c:611
 msgid "Send _later"
 msgstr "Enviar _después"
 
-#: src/compose.c:619
+#: src/compose.c:614
 msgid "_Attach file"
 msgstr "_Adjuntar fichero"
 
-#: src/compose.c:620
+#: src/compose.c:615
 msgid "_Insert file"
 msgstr "_Insertar fichero"
 
-#: src/compose.c:621
+#: src/compose.c:616
 msgid "Insert si_gnature"
 msgstr "Insertar _firma"
 
-#: src/compose.c:622
+#: src/compose.c:617
 msgid "_Replace signature"
 msgstr "_Reemplazar firma"
 
-#: src/compose.c:626
+#: src/compose.c:621
 msgid "_Print"
 msgstr "I_mprimir"
 
-#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:626 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:627 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:630 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/compose.c:639
+#: src/compose.c:634
 msgid "_Special paste"
 msgstr "Pegar e_special"
 
-#: src/compose.c:640
+#: src/compose.c:635
 msgid "As _quotation"
 msgstr "Como _citación"
 
-#: src/compose.c:641
+#: src/compose.c:636
 msgid "_Wrapped"
 msgstr "_Recortado"
 
-#: src/compose.c:642
+#: src/compose.c:637
 msgid "_Unwrapped"
 msgstr "_Sin recortar"
 
-#: src/compose.c:644 src/mainwindow.c:550
+#: src/compose.c:639 src/mainwindow.c:549
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Seleccionar todo"
 
-#: src/compose.c:646
+#: src/compose.c:641
 msgid "A_dvanced"
 msgstr "Avanza_das"
 
-#: src/compose.c:647
+#: src/compose.c:642
 msgid "Move a character backward"
 msgstr "Ir al carácter anterior"
 
-#: src/compose.c:648
+#: src/compose.c:643
 msgid "Move a character forward"
 msgstr "Ir al carácter siguiente"
 
-#: src/compose.c:649
+#: src/compose.c:644
 msgid "Move a word backward"
 msgstr "Ir a la palabra anterior"
 
-#: src/compose.c:650
+#: src/compose.c:645
 msgid "Move a word forward"
 msgstr "Ir a la palabra siguiente"
 
-#: src/compose.c:651
+#: src/compose.c:646
 msgid "Move to beginning of line"
 msgstr "Ir al principio de la línea"
 
-#: src/compose.c:652
+#: src/compose.c:647
 msgid "Move to end of line"
 msgstr "Ir al final de la línea"
 
-#: src/compose.c:653
+#: src/compose.c:648
 msgid "Move to previous line"
 msgstr "Ir a la línea anterior"
 
-#: src/compose.c:654
+#: src/compose.c:649
 msgid "Move to next line"
 msgstr "Ir a la línea siguiente"
 
-#: src/compose.c:655
+#: src/compose.c:650
 msgid "Delete a character backward"
 msgstr "Borrar el carácter anterior"
 
-#: src/compose.c:656
+#: src/compose.c:651
 msgid "Delete a character forward"
 msgstr "Borrar el carácter siguiente"
 
-#: src/compose.c:657
+#: src/compose.c:652
 msgid "Delete a word backward"
 msgstr "Borrar la palabra anterior"
 
-#: src/compose.c:658
+#: src/compose.c:653
 msgid "Delete a word forward"
 msgstr "Borrar la palabra siguiente"
 
-#: src/compose.c:659
+#: src/compose.c:654
 msgid "Delete line"
 msgstr "Borrar línea"
 
-#: src/compose.c:660
+#: src/compose.c:655
 msgid "Delete to end of line"
 msgstr "Borrar hasta el final de la línea"
 
-#: src/compose.c:663 src/messageview.c:231
+#: src/compose.c:658 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Buscar"
 
-#: src/compose.c:666
+#: src/compose.c:661
 msgid "_Wrap current paragraph"
 msgstr "_Recortar el párrafo actual"
 
-#: src/compose.c:667
+#: src/compose.c:662
 msgid "Wrap all long _lines"
 msgstr "Recortar todas las líneas largas"
 
-#: src/compose.c:669
+#: src/compose.c:664
 msgid "Edit with e_xternal editor"
 msgstr "Editar con un editor e_xterno"
 
-#: src/compose.c:672
+#: src/compose.c:667
 msgid "_Check all or check selection"
 msgstr "_Comprobar todo o la selección"
 
-#: src/compose.c:673
+#: src/compose.c:668
 msgid "_Highlight all misspelled words"
 msgstr "_Resaltar todas las faltas ortográficas"
 
-#: src/compose.c:674
+#: src/compose.c:669
 msgid "Check _backwards misspelled word"
 msgstr "Comprobar faltas hacia _atrás"
 
-#: src/compose.c:675
+#: src/compose.c:670
 msgid "_Forward to next misspelled word"
 msgstr "Avanzar hasta la siguiente _falta"
 
-#: src/compose.c:682
+#: src/compose.c:677
 msgid "Reply _mode"
 msgstr "_Modo de respuesta"
 
-#: src/compose.c:684
+#: src/compose.c:679
 msgid "Privacy _System"
 msgstr "_Sistema de privacidad"
 
-#: src/compose.c:688
+#: src/compose.c:683
 msgid "_Priority"
 msgstr "_Prioridad"
 
-#: src/compose.c:690 src/mainwindow.c:612 src/messageview.c:267
+#: src/compose.c:685 src/mainwindow.c:611 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "Codificación de caract_eres"
 
-#: src/compose.c:695 src/mainwindow.c:617 src/messageview.c:272
+#: src/compose.c:690 src/mainwindow.c:616 src/messageview.c:269
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: src/compose.c:696 src/mainwindow.c:618 src/messageview.c:273
+#: src/compose.c:691 src/mainwindow.c:617 src/messageview.c:270
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:697 src/mainwindow.c:619 src/messageview.c:274
+#: src/compose.c:692 src/mainwindow.c:618 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:275
+#: src/compose.c:693 src/mainwindow.c:619 src/messageview.c:272
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:699 src/mainwindow.c:621 src/messageview.c:276
+#: src/compose.c:694 src/mainwindow.c:620 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:700 src/mainwindow.c:622 src/messageview.c:277
+#: src/compose.c:695 src/mainwindow.c:621 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/compose.c:701 src/mainwindow.c:623 src/messageview.c:278
+#: src/compose.c:696 src/mainwindow.c:622 src/messageview.c:275
 msgid "Chinese"
 msgstr "Chino"
 
-#: src/compose.c:702 src/mainwindow.c:624 src/messageview.c:279
+#: src/compose.c:697 src/mainwindow.c:623 src/messageview.c:276
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:280
+#: src/compose.c:698 src/mainwindow.c:624 src/messageview.c:277
 msgid "Thai"
 msgstr "Tailandés"
 
-#: src/compose.c:706 src/mainwindow.c:735 src/messageview.c:316
+#: src/compose.c:701 src/mainwindow.c:734 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Agenda de direcciones"
 
-#: src/compose.c:708
+#: src/compose.c:703
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:710 src/mainwindow.c:763 src/messageview.c:336
+#: src/compose.c:705 src/mainwindow.c:762 src/messageview.c:333
 msgid "Actio_ns"
 msgstr "Accio_nes"
 
-#: src/compose.c:719
+#: src/compose.c:714
 msgid "Aut_o wrapping"
 msgstr "Aut_o-recorte"
 
-#: src/compose.c:720
+#: src/compose.c:715
 msgid "Auto _indent"
 msgstr "Auto-_sangrado"
 
-#: src/compose.c:721
+#: src/compose.c:716
 msgid "Si_gn"
 msgstr "Fir_mar"
 
-#: src/compose.c:722
+#: src/compose.c:717
 msgid "_Encrypt"
 msgstr "_Cifrado"
 
-#: src/compose.c:723
+#: src/compose.c:718
 msgid "_Request Return Receipt"
 msgstr "Solicitar acuse de _recibo"
 
-#: src/compose.c:724
+#: src/compose.c:719
 msgid "Remo_ve references"
 msgstr "Eliminar re_ferencias"
 
-#: src/compose.c:725
+#: src/compose.c:720
 msgid "Show _ruler"
 msgstr "Mostrar _regleta"
 
-#: src/compose.c:730 src/compose.c:740
+#: src/compose.c:725 src/compose.c:735
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:731 src/mainwindow.c:666 src/messageview.c:305
-#: src/summaryview.c:430
+#: src/compose.c:726 src/mainwindow.c:665 src/messageview.c:302
 msgid "_All"
 msgstr "_Todo"
 
-#: src/compose.c:732 src/mainwindow.c:667 src/messageview.c:306
-#: src/summaryview.c:431
+#: src/compose.c:727 src/mainwindow.c:666 src/messageview.c:303
 msgid "_Sender"
 msgstr "_Remitente"
 
-#: src/compose.c:733
+#: src/compose.c:728
 msgid "_Mailing-list"
 msgstr "_Lista-Correo"
 
-#: src/compose.c:738
+#: src/compose.c:733
 msgid "_Highest"
 msgstr "_Muy alta"
 
-#: src/compose.c:739
+#: src/compose.c:734
 msgid "Hi_gh"
 msgstr "_Alta"
 
-#: src/compose.c:741
+#: src/compose.c:736
 msgid "Lo_w"
 msgstr "_Baja"
 
-#: src/compose.c:742
+#: src/compose.c:737
 msgid "_Lowest"
 msgstr "M_uy baja"
 
-#: src/compose.c:747 src/mainwindow.c:879 src/messageview.c:353
+#: src/compose.c:742 src/mainwindow.c:880 src/messageview.c:350
 msgid "_Automatic"
 msgstr "_Automático"
 
-#: src/compose.c:748 src/mainwindow.c:880 src/messageview.c:354
+#: src/compose.c:743 src/mainwindow.c:881 src/messageview.c:351
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:749 src/mainwindow.c:881 src/messageview.c:355
+#: src/compose.c:744 src/mainwindow.c:882 src/messageview.c:352
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:753 src/mainwindow.c:885 src/messageview.c:359
+#: src/compose.c:748 src/mainwindow.c:886 src/messageview.c:356
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:362
+#: src/compose.c:751 src/mainwindow.c:889 src/messageview.c:359
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griego (ISO-8859-_7)"
 
-#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:367
+#: src/compose.c:756 src/mainwindow.c:894 src/messageview.c:364
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
-#: src/compose.c:1015 src/compose.c:1697
-msgid ""
-"You have opted to sign and/or encrypt this message but have not selected a "
-"privacy system.\n"
-"\n"
-"Signing and encrypting have been disabled for this message."
-msgstr ""
-"Ha optado por firmar y/o cifrar este mensaje, pero no ha seleccionado "
-"ningún sistema de privacidad.\n"
-"\n"
-"La firma y el cifrado han sido desactivados para este mensaje."
-
-#: src/compose.c:1051
+#: src/compose.c:1085
 msgid "New message From format error."
 msgstr "Error de formato en el «Desde» del mensaje nuevo."
 
-#: src/compose.c:1144
+#: src/compose.c:1177
 msgid "New message subject format error."
 msgstr "Error de formato en el asunto del mensaje nuevo."
 
-#: src/compose.c:1176 src/quote_fmt.c:563
+#: src/compose.c:1208 src/quote_fmt.c:570
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Componer» en la línea %d."
 
-#: src/compose.c:1445
+#: src/compose.c:1469
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "No se puede responder. El correo original probablemente no existe."
 
-#: src/compose.c:1630 src/quote_fmt.c:580
+#: src/compose.c:1652 src/quote_fmt.c:587
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1810,12 +1808,12 @@ msgstr ""
 "El campo «Desde» de la plantilla «Responder» contiene una dirección de "
 "correo inválida."
 
-#: src/compose.c:1679 src/quote_fmt.c:583
+#: src/compose.c:1700 src/quote_fmt.c:590
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Responder» en la línea %d."
 
-#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
+#: src/compose.c:1834 src/compose.c:2025 src/quote_fmt.c:607
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1823,55 +1821,55 @@ msgstr ""
 "El campo «Desde» de la plantilla «Reenviar» contiene una dirección de correo "
 "inválida."
 
-#: src/compose.c:1883 src/quote_fmt.c:603
+#: src/compose.c:1894 src/quote_fmt.c:610
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Reenviar» en la línea %d."
 
-#: src/compose.c:2059
+#: src/compose.c:2067
 msgid "Fw: multiple emails"
 msgstr "Rv: múltiples correos"
 
-#: src/compose.c:2566
+#: src/compose.c:2569
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Redirigir» en la línea %d."
 
-#: src/compose.c:2633 src/gtk/headers.h:14
+#: src/compose.c:2636 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2636 src/gtk/headers.h:15
+#: src/compose.c:2639 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2639 src/gtk/headers.h:12
+#: src/compose.c:2642 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
-#: src/compose.c:2642 src/compose.c:5006 src/compose.c:5008
+#: src/compose.c:2645 src/compose.c:4963 src/compose.c:4965
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grupos:"
 
-#: src/compose.c:2645 src/gtk/headers.h:34
+#: src/compose.c:2648 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Seguimiento-A:"
 
-#: src/compose.c:2648 src/gtk/headers.h:17
+#: src/compose.c:2651 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En-Respuesta-A:"
 
-#: src/compose.c:2652 src/compose.c:5003 src/compose.c:5011
-#: src/gtk/headers.h:13 src/summary_search.c:421
+#: src/compose.c:2655 src/compose.c:4960 src/compose.c:4968
+#: src/gtk/headers.h:13 src/summary_search.c:481
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2842
+#: src/compose.c:2841
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "No se pudo adjuntar un fichero (falló la conversión de caracteres)."
 
-#: src/compose.c:2848
+#: src/compose.c:2847
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1886,16 +1884,16 @@ msgstr[1] ""
 "Se han adjuntado los siguientes ficheros: \n"
 "%s"
 
-#: src/compose.c:3128
+#: src/compose.c:3124
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "La «marca de cita» de la plantilla no es válida."
 
-#: src/compose.c:3657
+#: src/compose.c:3630
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "No se puede obtener el tamaño del fichero «%s»."
 
-#: src/compose.c:3675
+#: src/compose.c:3641
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1904,57 +1902,57 @@ msgstr ""
 "Está a punto de insertar un fichero de %s en el cuerpo del mensaje. ¿Está "
 "seguro de que desea hacerlo?"
 
-#: src/compose.c:3678
+#: src/compose.c:3644
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: src/compose.c:3679 src/compose.c:10832 src/compose.c:11726
+#: src/compose.c:3645 src/compose.c:10650 src/compose.c:11526
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: src/compose.c:3804
+#: src/compose.c:3769
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:3805
+#: src/compose.c:3770
 msgid "Empty file"
 msgstr "Fichero vacío"
 
-#: src/compose.c:3806
+#: src/compose.c:3771
 msgid "_Attach anyway"
 msgstr "_Adjuntar igualmente"
 
-#: src/compose.c:3815
+#: src/compose.c:3780
 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 
-#: src/compose.c:3842
+#: src/compose.c:3807
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:4847 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4800 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:4854 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4807 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:4857 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4810 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sin asunto] - Componer mensaje%s"
 
-#: src/compose.c:4859 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4812 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Componer un mensaje nuevo"
 
-#: src/compose.c:4886 src/messageview.c:887
+#: src/compose.c:4839 src/messageview.c:903
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1962,114 +1960,105 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:5103 src/compose.c:5140
+#: src/compose.c:5060 src/compose.c:5097
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección predeterminada «%s». ¿Enviar de todas "
 "formas?"
 
-#: src/compose.c:5105 src/compose.c:5142 src/compose.c:5180 src/compose.c:5223
-#: src/prefs_account.c:3778 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5062 src/compose.c:5099 src/compose.c:5142 src/compose.c:5190
+#: src/prefs_account.c:3323 src/toolbar.c:484 src/toolbar.c:516
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:5107 src/compose.c:5144 src/compose.c:5181 src/compose.c:5224
-#: src/compose.c:5786 src/folderview.c:2579 src/messageview.c:859
-#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
+#: src/compose.c:5064 src/compose.c:5101 src/compose.c:5135 src/compose.c:5183
+#: src/compose.c:5718 src/folderview.c:2543 src/messageview.c:856
+#: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
+#: src/toolbar.c:2933
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:5161
+#: src/compose.c:5118
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:5176
+#: src/compose.c:5137 src/compose.c:5185
+#: src/plugins/attachwarner/attachwarner.c:212
+msgid "_Queue"
+msgstr "_A la cola"
+
+#: src/compose.c:5138
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "El asunto esta vacío. %s"
 
-#: src/compose.c:5177 src/compose.c:5220
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5139 src/compose.c:5187
+#: src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "¿Enviarlo igualmente?"
 
-#: src/compose.c:5178 src/compose.c:5221
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5140 src/compose.c:5188
+#: src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "¿Ponerlo en la cola igualmente?"
 
-#: src/compose.c:5180 src/compose.c:5223 src/toolbar.c:520
+#: src/compose.c:5142 src/compose.c:5190 src/toolbar.c:517
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:5181 src/compose.c:5224
-msgid "_Queue"
-msgstr "_A la cola"
-
-#: src/compose.c:5219
+#: src/compose.c:5186
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Enviando a %d destinatarios. %s"
 
-#: src/compose.c:5248
-msgid "Could not queue message."
-msgstr "El mensaje no se pudo poner en la cola."
-
-#: src/compose.c:5251
-#, c-format
-msgid ""
-"Could not queue message:\n"
-"\n"
-"%s."
-msgstr ""
-"No se puede poner en la cola el mensaje:\n"
-"\n"
-"%s."
-
-#: src/compose.c:5255
-#, c-format
+#: src/compose.c:5243 src/compose.c:10122
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Signature failed: %s"
+"Charset conversion failed."
 msgstr ""
 "No se puede poner en la cola el mensaje para enviar:\n"
 "\n"
-"Falló la firma: %s"
+"Falló la conversión del conjunto caracteres."
 
-#: src/compose.c:5260
-#, c-format
+#: src/compose.c:5246 src/compose.c:10125
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Encryption failed: %s"
+"Couldn't get recipient encryption key."
 msgstr ""
 "No se puede poner en la cola el mensaje para enviar:\n"
 "\n"
-"Falló el cifrado: %s"
+"No se pudo obtener la clave de cifrado del destinatario."
 
-#: src/compose.c:5265
+#: src/compose.c:5252 src/compose.c:10119
+#, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Charset conversion failed."
+"Signature failed: %s"
 msgstr ""
 "No se puede poner en la cola el mensaje para enviar:\n"
 "\n"
-"Falló la conversión del conjunto caracteres."
+"Falló la firma: %s"
 
-#: src/compose.c:5269
+#: src/compose.c:5255
+#, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Couldn't get recipient encryption key."
+"%s."
 msgstr ""
-"No se puede poner en la cola el mensaje para enviar:\n"
+"No se pudo poner en la cola el mensaje para enviar:\n"
 "\n"
-"No se pudo obtener la clave de cifrado del destinatario."
+"%s."
+
+#: src/compose.c:5257
+msgid "Could not queue message for sending."
+msgstr "No se pudo poner en la cola el mensaje para enviar."
 
-#: src/compose.c:5329 src/compose.c:5389
+#: src/compose.c:5272 src/compose.c:5332
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2077,7 +2066,7 @@ msgstr ""
 "El mensaje está en la cola pero no se pudo enviar.\n"
 "Utilice «Enviar mensaje(s) en cola» en la ventana principal para enviarlo"
 
-#: src/compose.c:5385
+#: src/compose.c:5328
 #, c-format
 msgid ""
 "%s\n"
@@ -2086,7 +2075,7 @@ msgstr ""
 "%s\n"
 "Utilice «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
 
-#: src/compose.c:5782
+#: src/compose.c:5714
 #, c-format
 msgid ""
 "Can't convert the character encoding of the mess