2009-01-12 [mones] 3.7.0cvs34 - talons - Fork of Claws Mail https://www.claws-mail

commit 38e2d26c578bb64c6c2cb402d5dae43f401bedb9
parent 8d23465850b11a0ad05b57a9c956682d2cac66e0
Author: Ricardo Mones <mones@claws-mail.org>
Date:   Mon, 12 Jan 2009 13:06:58 +0000

2009-01-12 [mones]	3.7.0cvs34

	* po/es.po
		Updated translation

Diffstat:
M ChangeLog  | 5 +++++
M PATCHSETS  | 1 +
M configure.ac  | 2 +-
M po/es.po  | 3195 +++++++++++++++++++++++++++++++++++++++----------------------------------------

4 files changed, 1597 insertions(+), 1606 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-12 [mones]	3.7.0cvs34
+
+	* po/es.po
+		Updated translation
+
 2009-01-12 [wwp]	3.7.0cvs33
 
 	* tools/fix_date.sh
diff --git a/PATCHSETS b/PATCHSETS
@@ -3695,3 +3695,4 @@
 ( cvs diff -u -r 1.28.2.39 -r 1.28.2.40 src/addrindex.c;  ) > 3.7.0cvs31.patchset
 ( cvs diff -u -r 1.28.2.40 -r 1.28.2.41 src/addrindex.c;  ) > 3.7.0cvs32.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 tools/fix_date.sh;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/popfile-link.sh;  cvs diff -u -r 1.4.2.4 -r 1.4.2.5 tools/textviewer.sh;  ) > 3.7.0cvs33.patchset
+( cvs diff -u -r 1.60.2.55 -r 1.60.2.56 po/es.po;  ) > 3.7.0cvs34.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/po/es.po b/po/es.po
@@ -1,13 +1,13 @@
 # Spanish translation of Claws Mail.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Ricardo Mones <ricardo@mones.org>, 2000-2008.
+# Ricardo Mones <ricardo@mones.org>, 2000-2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: claws mail\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
-"POT-Creation-Date: 2008-09-26 11:47+0200\n"
-"PO-Revision-Date: 2008-09-26 20:23+0200\n"
+"POT-Creation-Date: 2009-01-12 12:23+0100\n"
+"PO-Revision-Date: 2009-01-12 12:23+0200\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:384
+#: src/account.c:382
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -23,15 +23,15 @@ msgstr ""
 "Hay ventanas de composici�n abiertas.\n"
 "Cierre todas las ventanas de composici�n antes de editar las cuentas."
 
-#: src/account.c:431
+#: src/account.c:429
 msgid "Can't create folder."
 msgstr "No se puede crear la carpeta."
 
-#: src/account.c:702
+#: src/account.c:700
 msgid "Edit accounts"
 msgstr "Editar cuentas"
 
-#: src/account.c:724
+#: src/account.c:722
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -41,56 +41,56 @@ msgstr ""
 "orden dado, la casilla indica que cuentas se incluir�n. El texto en negrita "
 "indica la cuenta por defecto."
 
-#: src/account.c:795
+#: src/account.c:793
 msgid " _Set as default account "
 msgstr " _Establecer como primaria "
 
-#: src/account.c:887
+#: src/account.c:885
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Las cuentas con carpetas remotas no se pueden copiar."
 
-#: src/account.c:894
+#: src/account.c:892
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 
-#: src/account.c:1053
+#: src/account.c:1051
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "�Realmente quiere borrar la cuenta �%s�?"
 
-#: src/account.c:1055
+#: src/account.c:1053
 msgid "(Untitled)"
 msgstr "(Sin t�tulo)"
 
-#: src/account.c:1056
+#: src/account.c:1054
 msgid "Delete account"
 msgstr "Borrar cuenta"
 
-#: src/account.c:1527
+#: src/account.c:1525
 msgid "Accounts List Get Column Name|G"
 msgstr "R"
 
-#: src/account.c:1533
+#: src/account.c:1531
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "�Recibir correo� recupera correo de las cuentas marcadas"
 
-#: src/account.c:1540 src/addressadd.c:192 src/addressbook.c:122
-#: src/addrduplicates.c:480 src/compose.c:6395 src/compose.c:6689
+#: src/account.c:1538 src/addressadd.c:190 src/addressbook.c:122
+#: src/addrduplicates.c:480 src/compose.c:6450 src/compose.c:6748
 #: src/editaddress.c:1269 src/editaddress.c:1326 src/editaddress.c:1342
 #: src/editbook.c:170 src/editgroup.c:287 src/editjpilot.c:257
 #: src/editldap.c:429 src/editvcard.c:173 src/importmutt.c:223
-#: src/importpine.c:222 src/mimeview.c:268
-#: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:379
-#: src/prefs_filtering.c:1917 src/prefs_template.c:77
+#: src/importpine.c:222 src/mimeview.c:272
+#: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:378
+#: src/prefs_filtering.c:1916 src/prefs_template.c:77
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account.c:1548 src/prefs_account.c:1072 src/prefs_account.c:3808
+#: src/account.c:1546 src/prefs_account.c:1072 src/prefs_account.c:3807
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:1556 src/ssl_manager.c:102
+#: src/account.c:1554 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Servidor"
 
@@ -130,7 +130,7 @@ msgstr ""
 "Acciones de filtrado inv�lidas:\n"
 "%s"
 
-#: src/action.c:922
+#: src/action.c:923
 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"
@@ -139,7 +139,7 @@ msgstr ""
 "No se puede iniciar la orden. Fall� la creaci�n de la tuber�a.\n"
 "%s"
 
-#: src/action.c:1017
+#: src/action.c:1018
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -150,25 +150,25 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1237 src/action.c:1393
+#: src/action.c:1238 src/action.c:1394
 msgid "Completed"
 msgstr "Completado"
 
-#: src/action.c:1273
+#: src/action.c:1274
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Ejecutando: %s\n"
 
-#: src/action.c:1277
+#: src/action.c:1278
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 
-#: src/action.c:1310
+#: src/action.c:1311
 msgid "Action's input/output"
 msgstr "Entrada/salida de la acci�n"
 
-#: src/action.c:1629
+#: src/action.c:1630
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -179,11 +179,11 @@ msgstr ""
 "(�%%h� ser� sustituido con el par�metro)\n"
 "  %s"
 
-#: src/action.c:1634
+#: src/action.c:1635
 msgid "Action's hidden user argument"
 msgstr "Par�metro de usuario oculto para la acci�n"
 
-#: src/action.c:1638
+#: src/action.c:1639
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -194,11 +194,11 @@ msgstr ""
 "(�%%u� ser� sustituido con el par�metro)\n"
 "  %s"
 
-#: src/action.c:1643
+#: src/action.c:1644
 msgid "Action's user argument"
 msgstr "Par�metro de usuario para la acci�n"
 
-#: src/addr_compl.c:590 src/addressbook.c:4873
+#: src/addr_compl.c:590 src/addressbook.c:4853
 msgid "Group"
 msgstr "Grupo"
 
@@ -270,14 +270,14 @@ msgstr ""
 "�Realmente quiere reemplazar todos los nombres de\n"
 "atributos con los valores por defecto?"
 
-#: src/addrcustomattr.c:211 src/addressbook.c:444 src/addressbook.c:472
-#: src/addressbook.c:489 src/edittags.c:269 src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1754 src/prefs_template.c:1089
+#: src/addrcustomattr.c:211 src/addressbook.c:433 src/addressbook.c:461
+#: src/addressbook.c:478 src/edittags.c:269 src/prefs_actions.c:1078
+#: src/prefs_filtering.c:1753 src/prefs_template.c:1089
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: src/addrcustomattr.c:212 src/edittags.c:270 src/prefs_actions.c:1088
-#: src/prefs_filtering.c:1755 src/prefs_template.c:1090
+#: src/addrcustomattr.c:212 src/edittags.c:270 src/prefs_actions.c:1079
+#: src/prefs_filtering.c:1754 src/prefs_template.c:1090
 msgid "Delete _all"
 msgstr "_Borrar todo"
 
@@ -305,30 +305,30 @@ msgstr ""
 "A�adir o quitar nombres de atributo no afectar� a los atributos que ya haya "
 "establecidos en los contactos."
 
-#: src/addressadd.c:161 src/prefs_filtering_action.c:186
+#: src/addressadd.c:159 src/prefs_filtering_action.c:186
 msgid "Add to address book"
 msgstr "A�adir a la agenda"
 
-#: src/addressadd.c:184
+#: src/addressadd.c:182
 msgid "Contact"
 msgstr "Contacto"
 
-#: src/addressadd.c:204 src/addrduplicates.c:451
-#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:415
+#: src/addressadd.c:202 src/addrduplicates.c:451
+#: src/plugins/pgpcore/select-keys.c:397 src/toolbar.c:415
 msgid "Address"
 msgstr "Direcci�n"
 
-#: src/addressadd.c:215 src/addressbook.c:124 src/editaddress.c:1061
+#: src/addressadd.c:213 src/addressbook.c:124 src/editaddress.c:1061
 #: src/editaddress.c:1136 src/editgroup.c:289
 msgid "Remarks"
 msgstr "Notas"
 
-#: src/addressadd.c:234 src/addressbook_foldersel.c:159
+#: src/addressadd.c:232 src/addressbook_foldersel.c:157
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:430 src/editaddress.c:1576 src/headerview.c:346
-#: src/textview.c:1962
+#: src/addressadd.c:428 src/editaddress.c:1576 src/headerview.c:346
+#: src/textview.c:1979
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -337,272 +337,271 @@ msgstr ""
 "Fallo al guardar la imagen: \n"
 "%s"
 
-#: src/addressadd.c:443 src/addressbook.c:3243 src/addressbook.c:3293
+#: src/addressadd.c:441 src/addressbook.c:3231 src/addressbook.c:3281
 msgid "Add address(es)"
 msgstr "A�adir direcci�n(es)"
 
-#: src/addressadd.c:444
+#: src/addressadd.c:442
 msgid "Can't add the specified address"
 msgstr "No se puede a�adir la direcci�n especificada"
 
-#: src/addressbook.c:123 src/addressbook.c:4857 src/editaddress.c:1058
+#: src/addressbook.c:123 src/addressbook.c:4839 src/editaddress.c:1058
 #: src/editaddress.c:1119 src/editgroup.c:288 src/expldifdlg.c:517
 #: src/exporthtml.c:595 src/exporthtml.c:759 src/ldif.c:784
 msgid "Email Address"
 msgstr "Direcci�n de correo"
 
-#: src/addressbook.c:411 src/compose.c:540 src/mainwindow.c:461
-#: src/messageview.c:189
-msgid "_Message"
-msgstr "_Mensaje"
+#: src/addressbook.c:400
+msgid "_Book"
+msgstr "_Agenda"
 
-#: src/addressbook.c:412 src/addressbook.c:443 src/addressbook.c:471
-#: src/addressbook.c:488 src/compose.c:541 src/mainwindow.c:459
+#: src/addressbook.c:401 src/addressbook.c:432 src/addressbook.c:460
+#: src/addressbook.c:477 src/compose.c:541 src/mainwindow.c:469
 #: src/messageview.c:187
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/addressbook.c:413 src/compose.c:546 src/mainwindow.c:462
+#: src/addressbook.c:402 src/compose.c:546 src/mainwindow.c:472
 #: src/messageview.c:190
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: src/addressbook.c:414 src/compose.c:547 src/mainwindow.c:464
+#: src/addressbook.c:403 src/compose.c:547 src/mainwindow.c:474
 #: src/messageview.c:191
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: src/addressbook.c:417 src/addressbook.c:474
+#: src/addressbook.c:406 src/addressbook.c:463
 msgid "New _Book"
 msgstr "Nueva _agenda"
 
-#: src/addressbook.c:418 src/addressbook.c:475
+#: src/addressbook.c:407 src/addressbook.c:464
 msgid "New _Folder"
 msgstr "Nueva _carpeta"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:408
 msgid "New _vCard"
 msgstr "Nueva _vCard"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:412
 msgid "New _JPilot"
 msgstr "Nuevo _JPilot"
 
-#: src/addressbook.c:426
+#: src/addressbook.c:415
 msgid "New LDAP _Server"
 msgstr "Nuevo servidor LDAP"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:419
 msgid "_Edit book"
 msgstr "_Editar agenda"
 
-#: src/addressbook.c:431
+#: src/addressbook.c:420
 msgid "_Delete book"
 msgstr "_Borrar agenda"
 
-#: src/addressbook.c:433 src/compose.c:557
+#: src/addressbook.c:422 src/compose.c:557
 msgid "_Save"
 msgstr "_Guardar..."
 
-#: src/addressbook.c:434 src/compose.c:559 src/messageview.c:201
+#: src/addressbook.c:423 src/compose.c:559 src/messageview.c:201
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/addressbook.c:437 src/addressbook.c:486 src/messageview.c:205
+#: src/addressbook.c:426 src/addressbook.c:475 src/messageview.c:205
 msgid "_Select all"
 msgstr "_Seleccionar todo"
 
-#: src/addressbook.c:439 src/addressbook.c:478 src/addressbook.c:494
+#: src/addressbook.c:428 src/addressbook.c:467 src/addressbook.c:483
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: src/addressbook.c:440 src/addressbook.c:479 src/addressbook.c:495
-#: src/compose.c:567 src/mainwindow.c:493 src/messageview.c:204
+#: src/addressbook.c:429 src/addressbook.c:468 src/addressbook.c:484
+#: src/compose.c:567 src/mainwindow.c:503 src/messageview.c:204
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/addressbook.c:441 src/addressbook.c:480 src/addressbook.c:496
+#: src/addressbook.c:430 src/addressbook.c:469 src/addressbook.c:485
 #: src/compose.c:568
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/addressbook.c:446 src/addressbook.c:491
+#: src/addressbook.c:435 src/addressbook.c:480
 msgid "New _Address"
 msgstr "Nueva _direcci�n"
 
-#: src/addressbook.c:447 src/addressbook.c:476 src/addressbook.c:492
+#: src/addressbook.c:436 src/addressbook.c:465 src/addressbook.c:481
 msgid "New _Group"
 msgstr "Nuevo _grupo"
 
-#: src/addressbook.c:449 src/addressbook.c:498
+#: src/addressbook.c:438 src/addressbook.c:487
 msgid "_Mail To"
 msgstr "_Correo para"
 
-#: src/addressbook.c:453
+#: src/addressbook.c:442
 msgid "Import _LDIF file..."
 msgstr "Importar fichero _LDIF..."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:443
 msgid "Import M_utt file..."
 msgstr "Importar fichero M_utt..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:444
 msgid "Import _Pine file..."
 msgstr "Importar fichero _Pine..."
 
-#: src/addressbook.c:457
+#: src/addressbook.c:446
 msgid "Export _HTML..."
 msgstr "Exportar _HTML..."
 
-#: src/addressbook.c:458
+#: src/addressbook.c:447
 msgid "Export LDI_F..."
 msgstr "Exportar LDI_F..."
 
-#: src/addressbook.c:460
+#: src/addressbook.c:449
 msgid "Find duplicates..."
 msgstr "Buscar duplicados..."
 
-#: src/addressbook.c:461
+#: src/addressbook.c:450
 msgid "Edit custom attributes..."
 msgstr "Editar atributos de usuario..."
 
-#: src/addressbook.c:464 src/compose.c:647 src/mainwindow.c:725
+#: src/addressbook.c:453 src/compose.c:647 src/mainwindow.c:738
 #: src/messageview.c:300
 msgid "_About"
 msgstr "_Acerca de"
 
-#: src/addressbook.c:500
+#: src/addressbook.c:489
 msgid "_Browse Entry"
 msgstr "_Ver entrada"
 
-#: src/addressbook.c:513 src/crash.c:455 src/crash.c:474 src/importldif.c:115
-#: src/plugins/pgpcore/sgpgme.c:142 src/prefs_themes.c:703
-#: src/prefs_themes.c:735 src/prefs_themes.c:736
+#: src/addressbook.c:502 src/crash.c:452 src/crash.c:471 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:255 src/plugins/pgpcore/sgpgme.c:141
+#: src/prefs_themes.c:706 src/prefs_themes.c:738 src/prefs_themes.c:739
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/addressbook.c:520 src/addressbook.c:539 src/importldif.c:122
+#: src/addressbook.c:509 src/addressbook.c:528 src/importldif.c:121
 msgid "Success"
 msgstr "�xito"
 
-#: src/addressbook.c:521 src/importldif.c:123
+#: src/addressbook.c:510 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Argumentos incorrectos"
 
-#: src/addressbook.c:522 src/importldif.c:124
+#: src/addressbook.c:511 src/importldif.c:123
 msgid "File not specified"
 msgstr "No se especific� el fichero"
 
-#: src/addressbook.c:523 src/importldif.c:125
+#: src/addressbook.c:512 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Error abriendo el fichero"
 
-#: src/addressbook.c:524 src/importldif.c:126
+#: src/addressbook.c:513 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Error leyendo el fichero"
 
-#: src/addressbook.c:525 src/importldif.c:127
+#: src/addressbook.c:514 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Encontrado final del fichero"
 
-#: src/addressbook.c:526 src/importldif.c:128
+#: src/addressbook.c:515 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Error reservando memoria"
 
-#: src/addressbook.c:527 src/importldif.c:129
+#: src/addressbook.c:516 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Formato de fichero err�neo"
 
-#: src/addressbook.c:528 src/importldif.c:130
+#: src/addressbook.c:517 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Error escribiendo en el fichero"
 
-#: src/addressbook.c:529 src/importldif.c:131
+#: src/addressbook.c:518 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Error abriendo el directorio"
 
-#: src/addressbook.c:530 src/importldif.c:132
+#: src/addressbook.c:519 src/importldif.c:131
 msgid "No path specified"
 msgstr "No se especific� una ruta"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:529
 msgid "Error connecting to LDAP server"
 msgstr "Error conectando al servidor LDAP"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:530
 msgid "Error initializing LDAP"
 msgstr "Error inicializando LDAP"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:531
 msgid "Error binding to LDAP server"
 msgstr "Error enlazando con el servidor LDAP"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:532
 msgid "Error searching LDAP database"
 msgstr "Error buscando en la base de datos LDAP"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:533
 msgid "Timeout performing LDAP operation"
 msgstr "Fuera de tiempo en la operaci�n LDAP"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:534
 msgid "Error in LDAP search criteria"
 msgstr "Error en el criterio de b�squeda LDAP"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:535
 msgid "No LDAP entries found for search criteria"
 msgstr "No se encontraron entradas LDAP para el criterio de b�squeda"
 
-#: src/addressbook.c:547
+#: src/addressbook.c:536
 msgid "LDAP search terminated on request"
 msgstr "Se solicit� concluir la b�squeda LDAP"
 
-#: src/addressbook.c:548
+#: src/addressbook.c:537
 msgid "Error starting TLS connection"
 msgstr "Error iniciando la conexi�n TLS"
 
-#: src/addressbook.c:549
+#: src/addressbook.c:538
 msgid "Distinguished Name (dn) is missing"
 msgstr "Falta el nombre distinguido (dn)"
 
-#: src/addressbook.c:550
+#: src/addressbook.c:539
 msgid "Missing required information"
 msgstr "Falta la informaci�n necesaria"
 
-#: src/addressbook.c:551
+#: src/addressbook.c:540
 msgid "Another contact exists with that key"
 msgstr "Ya existe un contacto con esa clave"
 
-#: src/addressbook.c:552
+#: src/addressbook.c:541
 msgid "Strong(er) authentication required"
 msgstr "Se necesita autentificaci�n (m�s) fuerte"
 
-#: src/addressbook.c:923
+#: src/addressbook.c:912
 msgid "Sources"
 msgstr "Fuentes"
 
-#: src/addressbook.c:927 src/prefs_matcher.c:601 src/prefs_other.c:519
+#: src/addressbook.c:916 src/prefs_matcher.c:605 src/prefs_other.c:462
 #: src/toolbar.c:210 src/toolbar.c:2084
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:1143
+#: src/addressbook.c:1132
 msgid "Lookup name:"
 msgstr "Buscar nombre:"
 
-#: src/addressbook.c:1485 src/addressbook.c:1538 src/addrduplicates.c:802
+#: src/addressbook.c:1474 src/addressbook.c:1527 src/addrduplicates.c:802
 msgid "Delete address(es)"
 msgstr "Borrar direcci�n(es)"
 
-#: src/addressbook.c:1486 src/addrduplicates.c:851
+#: src/addressbook.c:1475 src/addrduplicates.c:851
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Esta direcci�n es solo de lectura y no se puede borrar."
 
-#: src/addressbook.c:1530
+#: src/addressbook.c:1519
 msgid "Delete group"
 msgstr "Borrar grupo"
 
-#: src/addressbook.c:1531
+#: src/addressbook.c:1520
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -610,29 +609,29 @@ msgstr ""
 "�Quiere borrar el(los) grupo(s)?\n"
 "Las direcciones que contienen no se perder�n."
 
-#: src/addressbook.c:1539 src/addrduplicates.c:803
+#: src/addressbook.c:1528 src/addrduplicates.c:803
 msgid "Really delete the address(es)?"
 msgstr "�Borrar realmente la(s) direcci�n(es)?"
 
-#: src/addressbook.c:2231
+#: src/addressbook.c:2220
 msgid "Cannot paste. Target address book is readonly."
 msgstr "No puedo pegar. El libro de direcciones destino es solo de lectura."
 
-#: src/addressbook.c:2241
+#: src/addressbook.c:2230
 msgid "Cannot paste into an address group."
 msgstr "No se puede pegar dentro de un grupo de direcciones."
 
-#: src/addressbook.c:2944
+#: src/addressbook.c:2932
 #, 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:2947 src/addressbook.c:2973 src/addressbook.c:2980
+#: src/addressbook.c:2935 src/addressbook.c:2961 src/addressbook.c:2968
 #: src/prefs_filtering_action.c:164 src/toolbar.c:397
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:2956
+#: src/addressbook.c:2944
 #, c-format
 msgid ""
 "Do you want to delete '%s' ? If you delete the folder only, the addresses it "
@@ -641,19 +640,19 @@ msgstr ""
 "�Quiere borrar �%s�? Si borra s�lo la carpeta las direcciones que contenga se "
 "mover�n a la carpeta padre."
 
-#: src/addressbook.c:2959 src/imap_gtk.c:364 src/mh_gtk.c:200
+#: src/addressbook.c:2947 src/imap_gtk.c:364 src/mh_gtk.c:200
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:2960
+#: src/addressbook.c:2948
 msgid "+Delete _folder only"
 msgstr "+Borrar s�lo _carpeta"
 
-#: src/addressbook.c:2960
+#: src/addressbook.c:2948
 msgid "Delete folder and _addresses"
 msgstr "Borrar carpeta y _direcciones"
 
-#: src/addressbook.c:2971
+#: src/addressbook.c:2959
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -662,7 +661,7 @@ msgstr ""
 "�Quiere borrar �%s�?\n"
 "Las direcciones que contiene no se perder�n."
 
-#: src/addressbook.c:2978
+#: src/addressbook.c:2966
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -671,28 +670,28 @@ msgstr ""
 "�Quiere borrar �%s�?\n"
 "Las direcciones que contiene se perder�n."
 
-#: src/addressbook.c:3088
+#: src/addressbook.c:3076
 #, c-format
 msgid "Search '%s'"
 msgstr " Buscar �%s�"
 
-#: src/addressbook.c:3226 src/addressbook.c:3275
+#: src/addressbook.c:3214 src/addressbook.c:3263
 msgid "New Contacts"
 msgstr "Nuevos contactos"
 
-#: src/addressbook.c:4056
+#: src/addressbook.c:4044
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se puede guardar el fichero �ndice."
 
-#: src/addressbook.c:4060
+#: src/addressbook.c:4048
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pueden guardar los ficheros de direcciones"
 
-#: src/addressbook.c:4070
+#: src/addressbook.c:4058
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con �xito"
 
-#: src/addressbook.c:4075
+#: src/addressbook.c:4063
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -700,7 +699,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se puede guardar el nuevo fichero �ndice."
 
-#: src/addressbook.c:4088
+#: src/addressbook.c:4076
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -708,7 +707,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vac�os."
 
-#: src/addressbook.c:4094
+#: src/addressbook.c:4082
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -716,7 +715,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "no se pudo guardar el fichero �ndice para la nueva."
 
-#: src/addressbook.c:4099
+#: src/addressbook.c:4087
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -724,59 +723,59 @@ msgstr ""
 "No se puede convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para la nueva."
 
-#: src/addressbook.c:4106 src/addressbook.c:4112
+#: src/addressbook.c:4094 src/addressbook.c:4100
 msgid "Addressbook conversion error"
 msgstr "Error en la conversi�n de la agenda de Sylpheed"
 
-#: src/addressbook.c:4219
+#: src/addressbook.c:4207
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:4220
+#: src/addressbook.c:4208
 msgid "Could not read address index"
 msgstr "No se puede leer el �ndice de direcciones"
 
-#: src/addressbook.c:4547
+#: src/addressbook.c:4535
 msgid "Busy searching..."
 msgstr "Buscando..."
 
-#: src/addressbook.c:4809
+#: src/addressbook.c:4797
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:4825 src/addressbook_foldersel.c:184 src/exphtmldlg.c:370
-#: src/expldifdlg.c:387 src/exporthtml.c:979 src/importldif.c:655
+#: src/addressbook.c:4811 src/addressbook_foldersel.c:182 src/exphtmldlg.c:370
+#: src/expldifdlg.c:387 src/exporthtml.c:979 src/importldif.c:654
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:4841
+#: src/addressbook.c:4825
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:4889 src/exporthtml.c:879 src/folderview.c:386
-#: src/folderview.c:474 src/prefs_account.c:2644 src/prefs_folder_column.c:77
-#: src/prefs_folder_item.c:1571 src/prefs_folder_item.c:1589
-#: src/prefs_folder_item.c:1606
+#: src/addressbook.c:4867 src/exporthtml.c:879 src/folderview.c:338
+#: src/folderview.c:426 src/prefs_account.c:2644 src/prefs_folder_column.c:77
+#: src/prefs_folder_item.c:1590 src/prefs_folder_item.c:1608
+#: src/prefs_folder_item.c:1625
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:4905
+#: src/addressbook.c:4881
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4921 src/addressbook.c:4937
+#: src/addressbook.c:4895 src/addressbook.c:4909
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4953
+#: src/addressbook.c:4923
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
-#: src/addressbook.c:4969
+#: src/addressbook.c:4937
 msgid "LDAP Query"
 msgstr "Petici�n LDAP"
 
-#: src/addressbook_foldersel.c:395 src/plugins/bogofilter/bogofilter.c:103
+#: src/addressbook_foldersel.c:393 src/plugins/bogofilter/bogofilter.c:103
 #: src/plugins/bogofilter/bogofilter_gtk.c:228
 #: src/plugins/bogofilter/bogofilter_gtk.c:299
 #: src/plugins/bogofilter/bogofilter_gtk.c:376
@@ -789,10 +788,10 @@ msgstr "Petici
 #: src/plugins/spamassassin/spamassassin.c:116
 #: src/plugins/spamassassin/spamassassin_gtk.c:441
 #: src/plugins/spamassassin/spamassassin_gtk.c:483
-#: src/plugins/spamassassin/spamassassin_gtk.c:606 src/prefs_matcher.c:636
-#: src/prefs_matcher.c:666 src/prefs_matcher.c:1476 src/prefs_matcher.c:1483
-#: src/prefs_matcher.c:1491 src/prefs_matcher.c:1493 src/prefs_matcher.c:2339
-#: src/prefs_matcher.c:2343
+#: src/plugins/spamassassin/spamassassin_gtk.c:606 src/prefs_matcher.c:640
+#: src/prefs_matcher.c:670 src/prefs_matcher.c:1490 src/prefs_matcher.c:1497
+#: src/prefs_matcher.c:1505 src/prefs_matcher.c:1507 src/prefs_matcher.c:2364
+#: src/prefs_matcher.c:2368
 msgid "Any"
 msgstr "Cualquiera"
 
@@ -850,7 +849,7 @@ msgid "Header Fields"
 msgstr "Campos cabecera"
 
 #: src/addrgather.c:473 src/exphtmldlg.c:658 src/expldifdlg.c:723
-#: src/importldif.c:1022
+#: src/importldif.c:1021
 msgid "Finish"
 msgstr "Finalizar"
 
@@ -878,11 +877,11 @@ msgstr "Direcci
 msgid "Personal address"
 msgstr "Direcci�n personal"
 
-#: src/addrindex.c:1825
+#: src/addrindex.c:1826
 msgid "Address(es) update"
 msgstr "Actualizar direcci�n(es)"
 
-#: src/addrindex.c:1826
+#: src/addrindex.c:1827
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Fall� la actualizaci�n. No se escribieron los cambios en el directorio."
@@ -921,18 +920,18 @@ msgstr "Ruta a la agenda de direcciones"
 msgid "Delete address"
 msgstr "Borrar direcci�n"
 
-#: src/alertpanel.c:145 src/compose.c:8505
+#: src/alertpanel.c:145 src/compose.c:8568
 msgid "Notice"
 msgstr "Notificaci�n"
 
-#: src/alertpanel.c:158 src/compose.c:5226 src/compose.c:10584
-#: src/messageview.c:803 src/messageview.c:816
-#: src/plugins/pgpcore/sgpgme.c:592 src/summaryview.c:4811
+#: src/alertpanel.c:158 src/compose.c:5260 src/compose.c:10661
+#: src/messageview.c:806 src/messageview.c:819
+#: src/plugins/pgpcore/sgpgme.c:629 src/summaryview.c:4658
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:171 src/alertpanel.c:194 src/compose.c:5167 src/inc.c:647
-#: src/plugins/pgpcore/sgpgme.c:154 src/plugins/pgpcore/sgpgme.c:245
+#: src/alertpanel.c:171 src/alertpanel.c:194 src/compose.c:5201 src/inc.c:647
+#: src/plugins/pgpcore/sgpgme.c:153 src/plugins/pgpcore/sgpgme.c:247
 msgid "Error"
 msgstr "Error"
 
@@ -1049,7 +1048,7 @@ msgstr "Su versi
 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:170 src/imap.c:1093
+#: src/common/session.c:170 src/imap.c:1094
 msgid "SSL handshake failed\n"
 msgstr "Negociaci�n SSL fallida\n"
 
@@ -1078,41 +1077,32 @@ msgstr "El mensaje es demasiado grande (M
 msgid "couldn't start TLS session\n"
 msgstr "no se pudo iniciar la sesi�n TLS\n"
 
-#: src/common/socket.c:1474
+#: src/common/socket.c:1492
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escribir en fd%d: %s\n"
 
-#: src/common/ssl.c:358
-msgid "Error creating ssl context\n"
-msgstr "Error creando el contexto SSL\n"
-
-#: src/common/ssl.c:378
-#, c-format
-msgid "SSL connect failed (%s)\n"
-msgstr "Conexi�n SSL fallida (%s)\n"
-
-#: src/common/ssl_certificate.c:651
+#: src/common/ssl_certificate.c:591
 msgid "Uncheckable"
 msgstr "No se puede comprobar"
 
-#: src/common/ssl_certificate.c:655
+#: src/common/ssl_certificate.c:595
 msgid "Self-signed certificate"
 msgstr "Certificado firmado por si mismo"
 
-#: src/common/ssl_certificate.c:658
+#: src/common/ssl_certificate.c:598
 msgid "Revoked certificate"
 msgstr "Certificado revocado"
 
-#: src/common/ssl_certificate.c:660
+#: src/common/ssl_certificate.c:600
 msgid "No certificate issuer found"
 msgstr "No se encontr� el emisor del certificado"
 
-#: src/common/ssl_certificate.c:662
+#: src/common/ssl_certificate.c:602
 msgid "Certificate issuer is not a CA"
 msgstr "El emisor del certificado no es una AC"
 
-#: src/common/string_match.c:79
+#: src/common/string_match.c:81
 msgid "(Subject cleared by RegExp)"
 msgstr "(Asunto vac�o por expr. reg.)"
 
@@ -1136,187 +1126,187 @@ msgstr "%d.%02d Mb"
 msgid "%.2fGB"
 msgstr "%.2f Gb"
 
-#: src/common/utils.c:4797
+#: src/common/utils.c:4870
 msgid "Complete day name for use by strftime|Sunday"
 msgstr "Domingo"
 
-#: src/common/utils.c:4798
+#: src/common/utils.c:4871
 msgid "Complete day name for use by strftime|Monday"
 msgstr "Lunes"
 
-#: src/common/utils.c:4799
+#: src/common/utils.c:4872
 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "Martes"
 
-#: src/common/utils.c:4800
+#: src/common/utils.c:4873
 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "Mi�rcoles"
 
-#: src/common/utils.c:4801
+#: src/common/utils.c:4874
 msgid "Complete day name for use by strftime|Thursday"
 msgstr "Jueves"
 
-#: src/common/utils.c:4802
+#: src/common/utils.c:4875
 msgid "Complete day name for use by strftime|Friday"
 msgstr "Viernes"
 
-#: src/common/utils.c:4803
+#: src/common/utils.c:4876
 msgid "Complete day name for use by strftime|Saturday"
 msgstr "S�bado"
 
-#: src/common/utils.c:4805
+#: src/common/utils.c:4878
 msgid "Complete month name for use by strftime|January"
 msgstr "Enero"
 
-#: src/common/utils.c:4806
+#: src/common/utils.c:4879
 msgid "Complete month name for use by strftime|February"
 msgstr "Febrero"
 
-#: src/common/utils.c:4807
+#: src/common/utils.c:4880
 msgid "Complete month name for use by strftime|March"
 msgstr "Marzo"
 
-#: src/common/utils.c:4808
+#: src/common/utils.c:4881
 msgid "Complete month name for use by strftime|April"
 msgstr "Abril"
 
-#: src/common/utils.c:4809
+#: src/common/utils.c:4882
 msgid "Complete month name for use by strftime|May"
 msgstr "Mayo"
 
-#: src/common/utils.c:4810
+#: src/common/utils.c:4883
 msgid "Complete month name for use by strftime|June"
 msgstr "Junio"
 
-#: src/common/utils.c:4811
+#: src/common/utils.c:4884
 msgid "Complete month name for use by strftime|July"
 msgstr "Julio"
 
-#: src/common/utils.c:4812
+#: src/common/utils.c:4885
 msgid "Complete month name for use by strftime|August"
 msgstr "Agosto"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4886
 msgid "Complete month name for use by strftime|September"
 msgstr "Septiembre"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4887
 msgid "Complete month name for use by strftime|October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4888
 msgid "Complete month name for use by strftime|November"
 msgstr "Noviembre"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4889
 msgid "Complete month name for use by strftime|December"
 msgstr "Diciembre"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4891
 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "Dom"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4892
 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4820
+#: src/common/utils.c:4893
 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4894
 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "Mi�"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4895
 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "Jue"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4896
 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "Vie"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4897
 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "S�b"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4899
 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "Ene"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4900
 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4901
 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4902
 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4903
 msgid "Abbr. month name for use by strftime|May"
 msgstr "May"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4904
 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4905
 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4833
+#: src/common/utils.c:4906
 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4907
 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4908
 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4909
 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4910
 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "Dic"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4921
 msgid "For use by strftime (morning)|AM"
 msgstr "AM"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4922
 msgid "For use by strftime (afternoon)|PM"
 msgstr "PM"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4923
 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "am"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4924
 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "pm"
 
-#: src/common/utils.c:4858
+#: src/common/utils.c:4931
 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr "%a %d %b %Y %H:%M:%S"
 
-#: src/common/utils.c:4859
+#: src/common/utils.c:4932
 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: src/common/utils.c:4860
+#: src/common/utils.c:4933
 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#: src/common/utils.c:4862
+#: src/common/utils.c:4935
 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
@@ -1328,10 +1318,14 @@ msgstr "_A
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: src/compose.c:533 src/folderview.c:282
+#: src/compose.c:533 src/folderview.c:234
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
+#: src/compose.c:540 src/mainwindow.c:471 src/messageview.c:189
+msgid "_Message"
+msgstr "_Mensaje"
+
 #: src/compose.c:543
 msgid "_Spelling"
 msgstr "_Ortograf�a"
@@ -1388,7 +1382,7 @@ msgstr "_recortado"
 msgid "_unwrapped"
 msgstr "_sin recortar"
 
-#: src/compose.c:575 src/mainwindow.c:494
+#: src/compose.c:575 src/mainwindow.c:504
 msgid "Select _all"
 msgstr "_Seleccionar todo"
 
@@ -1496,47 +1490,47 @@ msgstr "_Sistema de privacidad"
 msgid "_Priority"
 msgstr "_Prioridad"
 
-#: src/compose.c:623 src/mainwindow.c:546 src/messageview.c:233
+#: src/compose.c:623 src/mainwindow.c:556 src/messageview.c:233
 msgid "Character _encoding"
 msgstr "Codificaci�n de caract_eres"
 
-#: src/compose.c:628 src/mainwindow.c:551 src/messageview.c:238
+#: src/compose.c:628 src/mainwindow.c:561 src/messageview.c:238
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: src/compose.c:629 src/mainwindow.c:552 src/messageview.c:239
+#: src/compose.c:629 src/mainwindow.c:562 src/messageview.c:239
 msgid "Baltic"
 msgstr "B�ltico"
 
-#: src/compose.c:630 src/mainwindow.c:553 src/messageview.c:240
+#: src/compose.c:630 src/mainwindow.c:563 src/messageview.c:240
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/compose.c:631 src/mainwindow.c:554 src/messageview.c:241
+#: src/compose.c:631 src/mainwindow.c:564 src/messageview.c:241
 msgid "Arabic"
 msgstr "�rabe"
 
-#: src/compose.c:632 src/mainwindow.c:555 src/messageview.c:242
+#: src/compose.c:632 src/mainwindow.c:565 src/messageview.c:242
 msgid "Cyrillic"
 msgstr "Cir�lico"
 
-#: src/compose.c:633 src/mainwindow.c:556 src/messageview.c:243
+#: src/compose.c:633 src/mainwindow.c:566 src/messageview.c:243
 msgid "Japanese"
 msgstr "Japon�s"
 
-#: src/compose.c:634 src/mainwindow.c:557 src/messageview.c:244
+#: src/compose.c:634 src/mainwindow.c:567 src/messageview.c:244
 msgid "Chinese"
 msgstr "Chino"
 
-#: src/compose.c:635 src/mainwindow.c:558 src/messageview.c:245
+#: src/compose.c:635 src/mainwindow.c:568 src/messageview.c:245
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:636 src/mainwindow.c:559 src/messageview.c:246
+#: src/compose.c:636 src/mainwindow.c:569 src/messageview.c:246
 msgid "Thai"
 msgstr "Tailand�s"
 
-#: src/compose.c:639 src/mainwindow.c:651 src/messageview.c:275
+#: src/compose.c:639 src/mainwindow.c:661 src/messageview.c:275
 msgid "_Address book"
 msgstr "_Agenda de direcciones"
 
@@ -1544,7 +1538,7 @@ msgstr "_Agenda de direcciones"
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:643 src/mainwindow.c:679 src/messageview.c:296
+#: src/compose.c:643 src/mainwindow.c:689 src/messageview.c:296
 msgid "Actio_ns"
 msgstr "Accio_nes"
 
@@ -1608,103 +1602,103 @@ msgstr "_Baja"
 msgid "_Lowest"
 msgstr "M_uy baja"
 
-#: src/compose.c:680 src/mainwindow.c:786 src/messageview.c:313
+#: src/compose.c:680 src/mainwindow.c:802 src/messageview.c:313
 msgid "_Automatic"
 msgstr "_Autom�tico"
 
-#: src/compose.c:681 src/mainwindow.c:787 src/messageview.c:314
+#: src/compose.c:681 src/mainwindow.c:803 src/messageview.c:314
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:682 src/mainwindow.c:788 src/messageview.c:315
+#: src/compose.c:682 src/mainwindow.c:804 src/messageview.c:315
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:686 src/mainwindow.c:792 src/messageview.c:319
+#: src/compose.c:686 src/mainwindow.c:808 src/messageview.c:319
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:689 src/mainwindow.c:795 src/messageview.c:322
+#: src/compose.c:689 src/mainwindow.c:811 src/messageview.c:322
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griego (ISO-8859-_7)"
 
-#: src/compose.c:694 src/mainwindow.c:800 src/messageview.c:327
+#: src/compose.c:694 src/mainwindow.c:816 src/messageview.c:327
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
-#: src/compose.c:955 src/quote_fmt.c:566
+#: src/compose.c:990 src/quote_fmt.c:566
 msgid "New message From format error."
 msgstr "Error de formato en el Desde del mensaje nuevo."
 
-#: src/compose.c:1047 src/quote_fmt.c:569
+#: src/compose.c:1082 src/quote_fmt.c:569
 msgid "New message subject format error."
 msgstr "Error de formato en el asunto del mensaje nuevo."
 
-#: src/compose.c:1077 src/quote_fmt.c:572
+#: src/compose.c:1112 src/quote_fmt.c:572
 #, c-format
 msgid "New message body format error at line %d."
 msgstr "Error de formato en el cuerpo del mensaje nuevo en la l�nea %d."
 
-#: src/compose.c:1271
+#: src/compose.c:1306
 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:1450 src/quote_fmt.c:589
+#: src/compose.c:1485 src/quote_fmt.c:589
 msgid "Message reply From format error."
 msgstr "Error de formato en el Desde del mensaje de respuesta."
 
-#: src/compose.c:1497 src/quote_fmt.c:592
+#: src/compose.c:1532 src/quote_fmt.c:592
 #, c-format
 msgid "Message reply format error at line %d."
 msgstr "Error de formato en el mensaje de respuesta en la l�nea %d."
 
-#: src/compose.c:1620 src/compose.c:1802 src/quote_fmt.c:609
+#: src/compose.c:1655 src/compose.c:1837 src/quote_fmt.c:609
 msgid "Message forward From format error."
 msgstr "Error de formato en el Desde del mensaje a reenviar."
 
-#: src/compose.c:1685 src/quote_fmt.c:612
+#: src/compose.c:1720 src/quote_fmt.c:612
 #, c-format
 msgid "Message forward format error at line %d."
 msgstr "Error de formato en el mensaje a reenviar en la l�nea %d."
 
-#: src/compose.c:1844
+#: src/compose.c:1879
 msgid "Fw: multiple emails"
 msgstr "Fw: m�ltiples correos"
 
-#: src/compose.c:2263
+#: src/compose.c:2295
 #, c-format
 msgid "Message redirect format error at line %d."
 msgstr "Error de formato en mensaje a redirijir en la l�nea %d."
 
-#: src/compose.c:2327 src/gtk/headers.h:13
+#: src/compose.c:2359 src/gtk/headers.h:13
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2330 src/gtk/headers.h:14
+#: src/compose.c:2362 src/gtk/headers.h:14
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2333 src/gtk/headers.h:11
+#: src/compose.c:2365 src/gtk/headers.h:11
 msgid "Reply-To:"
 msgstr "Responder a:"
 
-#: src/compose.c:2336 src/gtk/headers.h:32
+#: src/compose.c:2368 src/gtk/headers.h:32
 msgid "Newsgroups:"
 msgstr "Grupos de noticias:"
 
-#: src/compose.c:2339 src/gtk/headers.h:33
+#: src/compose.c:2371 src/gtk/headers.h:33
 msgid "Followup-To:"
 msgstr "Enviar a:"
 
-#: src/compose.c:2343 src/gtk/headers.h:12 src/summary_search.c:359
+#: src/compose.c:2375 src/gtk/headers.h:12 src/summary_search.c:359
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2534
+#: src/compose.c:2566
 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:2540
+#: src/compose.c:2572
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1719,44 +1713,44 @@ msgstr[1] ""
 "Se han adjuntado los siguientes ficheros: \n"
 "%s"
 
-#: src/compose.c:2779
+#: src/compose.c:2811
 msgid "Quote mark format error."
 msgstr "Error de formato en la marca de cita."
 
-#: src/compose.c:3349
+#: src/compose.c:3381
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vac�o."
 
-#: src/compose.c:3353
+#: src/compose.c:3385
 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 
-#: src/compose.c:3380
+#: src/compose.c:3412
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:4360
+#: src/compose.c:4392
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:4367
+#: src/compose.c:4399
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:4370
+#: src/compose.c:4402
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sin asunto] - Componer mensaje%s"
 
-#: src/compose.c:4372
+#: src/compose.c:4404
 msgid "Compose message"
 msgstr "Componer un mensaje nuevo"
 
-#: src/compose.c:4399 src/messageview.c:838
+#: src/compose.c:4431 src/messageview.c:841
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1764,53 +1758,53 @@ msgstr ""
 "No especific� ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:4590 src/compose.c:4622 src/compose.c:4664
+#: src/compose.c:4622 src/compose.c:4654 src/compose.c:4696
 #: src/prefs_account.c:3140 src/toolbar.c:388 src/toolbar.c:406
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4591
+#: src/compose.c:4623
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "El �nico destinatario es la direcci�n CC por omisi�n. �Enviar de todas "
 "formas?"
 
-#: src/compose.c:4592 src/compose.c:4624 src/compose.c:4657 src/compose.c:5167
+#: src/compose.c:4624 src/compose.c:4656 src/compose.c:4689 src/compose.c:5201
 msgid "+_Send"
 msgstr "+_Enviar"
 
-#: src/compose.c:4623
+#: src/compose.c:4655
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "El �nico destinatario es la direcci�n BCC por omisi�n. �Enviar de todas "
 "formas?"
 
-#: src/compose.c:4640
+#: src/compose.c:4672
 msgid "Recipient is not specified."
 msgstr "No se especific� el destinatario."
 
-#: src/compose.c:4659
+#: src/compose.c:4691
 msgid "+_Queue"
 msgstr "+_A la cola"
 
-#: src/compose.c:4660
+#: src/compose.c:4692
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "El asunto esta vac�o. %s"
 
-#: src/compose.c:4661
+#: src/compose.c:4693
 msgid "Send it anyway?"
 msgstr "�Enviarlo igualmente?"
 
-#: src/compose.c:4662
+#: src/compose.c:4694
 msgid "Queue it anyway?"
 msgstr "�Ponerlo en la cola igualmente?"
 
-#: src/compose.c:4664 src/toolbar.c:407
+#: src/compose.c:4696 src/toolbar.c:407
 msgid "Send later"
 msgstr "Enviar despu�s"
 
-#: src/compose.c:4712 src/compose.c:8842
+#: src/compose.c:4744 src/compose.c:8906
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -1820,7 +1814,7 @@ msgstr ""
 "\n"
 "Fall� la conversi�n del conjunto caracteres."
 
-#: src/compose.c:4715 src/compose.c:8845
+#: src/compose.c:4747 src/compose.c:8909
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -1830,7 +1824,7 @@ msgstr ""
 "\n"
 "No se pudo obtener la clave de cifrado del destinatario."
 
-#: src/compose.c:4721 src/compose.c:8839
+#: src/compose.c:4753 src/compose.c:8903
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1841,7 +1835,7 @@ msgstr ""
 "\n"
 "Fall� la firma: %s"
 
-#: src/compose.c:4724
+#: src/compose.c:4756
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1852,11 +1846,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:4726
+#: src/compose.c:4758
 msgid "Could not queue message for sending."
 msgstr "No se puede poner en la cola el mensaje para enviar."
 
-#: src/compose.c:4741 src/compose.c:4801
+#: src/compose.c:4773 src/compose.c:4833
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -1864,7 +1858,7 @@ msgstr ""
 "El mensaje est� en la cola pero no se pudo enviar.\n"
 "Utilize �Enviar mensaje(s) en cola� en la ventana principal para enviarlo"
 
-#: src/compose.c:4797
+#: src/compose.c:4829
 #, c-format
 msgid ""
 "%s\n"
@@ -1873,7 +1867,7 @@ msgstr ""
 "%s\n"
 "Utilize �Enviar mensaje(s) en cola� en la ventana principal para reintentar."
 
-#: src/compose.c:5164
+#: src/compose.c:5198
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -1884,7 +1878,7 @@ msgstr ""
 "al conjunto de caracteres %s especificado.\n"
 "�Enviarlo como %s?"
 
-#: src/compose.c:5222
+#: src/compose.c:5256
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1897,45 +1891,45 @@ msgstr ""
 "\n"
 "�Enviarlo de todas formas?"
 
-#: src/compose.c:5383
+#: src/compose.c:5436
 msgid "Encryption warning"
 msgstr "Aviso de cifrado"
 
-#: src/compose.c:5384
+#: src/compose.c:5437
 msgid "+C_ontinue"
 msgstr "+C_ontinuar"
 
-#: src/compose.c:5439
+#: src/compose.c:5492
 msgid "No account for sending mails available!"
 msgstr "�No hay ninguna cuenta disponible para enviar correos!"
 
-#: src/compose.c:5449
+#: src/compose.c:5502
 msgid "No account for posting news available!"
 msgstr "�No hay ninguna cuenta disponible para enviar noticias!"
 
-#: src/compose.c:6158
+#: src/compose.c:6213
 msgid "Add to address _book"
 msgstr "A�adir a la agen_da"
 
-#: src/compose.c:6235
+#: src/compose.c:6290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar �tab� para autocompletar con la agenda"
 
-#: src/compose.c:6383
+#: src/compose.c:6438
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:6389 src/compose.c:6688 src/mimeview.c:267
-#: src/plugins/pgpcore/select-keys.c:393 src/prefs_matcher.c:599
-#: src/prefs_summary_column.c:84 src/summaryview.c:601
+#: src/compose.c:6444 src/compose.c:6747 src/mimeview.c:271
+#: src/plugins/pgpcore/select-keys.c:394 src/prefs_matcher.c:603
+#: src/prefs_summary_column.c:84 src/summaryview.c:433
 msgid "Size"
 msgstr "Tama�o"
 
-#: src/compose.c:6459
+#: src/compose.c:6514
 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 
-#: src/compose.c:6481 src/editjpilot.c:276 src/editldap.c:519
+#: src/compose.c:6543 src/editjpilot.c:276 src/editldap.c:519
 #: src/editvcard.c:192 src/export.c:162 src/import.c:161 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/bogofilter/bogofilter_gtk.c:186
 #: src/plugins/bogofilter/bogofilter_gtk.c:206
@@ -1943,27 +1937,27 @@ msgstr "Guardar mensaje en "
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: src/compose.c:6687 src/compose.c:8261
+#: src/compose.c:6746 src/compose.c:8320
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:6964
+#: src/compose.c:7023
 msgid "Hea_der"
 msgstr "_Cabecera"
 
-#: src/compose.c:6969
+#: src/compose.c:7028
 msgid "_Attachments"
 msgstr "_Adjuntos"
 
-#: src/compose.c:6983
+#: src/compose.c:7042
 msgid "Othe_rs"
 msgstr "Ot_ros"
 
-#: src/compose.c:6998 src/gtk/headers.h:18 src/summary_search.c:366
+#: src/compose.c:7057 src/gtk/headers.h:18 src/summary_search.c:366
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:7208
+#: src/compose.c:7267
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -1972,20 +1966,20 @@ msgstr ""
 "No se puede iniciar el corrector ortogr�fico.\n"
 "%s"
 
-#: src/compose.c:7319
+#: src/compose.c:7378
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Desde: <i>%s</i>"
 
-#: src/compose.c:7353
+#: src/compose.c:7412
 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 
-#: src/compose.c:7355
+#: src/compose.c:7414
 msgid "Sender address to be used"
 msgstr "Direcci�n del remitente a usar"
 
-#: src/compose.c:7518
+#: src/compose.c:7577
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -1994,60 +1988,60 @@ msgstr ""
 "No se ha podido cargar el sistema de privacidad �%s�. No ser� posible firmar "
 "o cifrar este mensaje."
 
-#: src/compose.c:7617
+#: src/compose.c:7676
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/compose.c:7718 src/prefs_template.c:741
+#: src/compose.c:7777 src/prefs_template.c:741
 #, c-format
 msgid "Template body format error at line %d."
 msgstr "Error de formato en el cuerpo de la plantilla en la l�nea %d."
 
-#: src/compose.c:7829 src/prefs_template.c:786
+#: src/compose.c:7888 src/prefs_template.c:786
 msgid "Template From format error."
 msgstr "Error de formato en el Desde de la plantilla."
 
-#: src/compose.c:7847 src/prefs_template.c:792
+#: src/compose.c:7906 src/prefs_template.c:792
 msgid "Template To format error."
 msgstr "Error de formato en el Para de la plantilla."
 
-#: src/compose.c:7865 src/prefs_template.c:798
+#: src/compose.c:7924 src/prefs_template.c:798
 msgid "Template Cc format error."
 msgstr "Error de formato en el Cc de la plantilla."
 
-#: src/compose.c:7883 src/prefs_template.c:804
+#: src/compose.c:7942 src/prefs_template.c:804
 msgid "Template Bcc format error."
 msgstr "Error de formato en el Bcc de la plantilla."
 
-#: src/compose.c:7902 src/prefs_template.c:810
+#: src/compose.c:7961 src/prefs_template.c:810
 msgid "Template subject format error."
 msgstr "Error de formato en el asunto de la plantilla."
 
-#: src/compose.c:8155
+#: src/compose.c:8214
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inv�lido."
 
-#: src/compose.c:8170
+#: src/compose.c:8229
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o est� vac�o."
 
-#: src/compose.c:8243
+#: src/compose.c:8302
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:8294
+#: src/compose.c:8353
 msgid "Encoding"
 msgstr "Codificaci�n"
 
-#: src/compose.c:8314
+#: src/compose.c:8373
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:8315
+#: src/compose.c:8374
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:8502
+#: src/compose.c:8565
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2058,19 +2052,19 @@ msgstr ""
 "�Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:8544
+#: src/compose.c:8607
 msgid "Compose: input from monitoring process\n"
 msgstr "Componer: entrada del proceso monitorizador\n"
 
-#: src/compose.c:8810 src/messageview.c:1069
+#: src/compose.c:8874 src/messageview.c:1072
 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:8834
+#: src/compose.c:8898
 msgid "Could not queue message."
 msgstr "El mensaje no se pudo poner en la cola."
 
-#: src/compose.c:8836
+#: src/compose.c:8900
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2081,15 +2075,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:8999
+#: src/compose.c:9063
 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 
-#: src/compose.c:9003
+#: src/compose.c:9067
 msgid "Could not save draft"
 msgstr "No se puede guardar el borrador"
 
-#: src/compose.c:9004
+#: src/compose.c:9068
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2097,24 +2091,24 @@ msgstr ""
 "No se ha podido guardar el borrador.\n"
 "�Desea cancelar la salida o descartar este correo?"
 
-#: src/compose.c:9006
+#: src/compose.c:9070
 msgid "_Cancel exit"
 msgstr "_Cancelar salida"
 
-#: src/compose.c:9006
+#: src/compose.c:9070
 msgid "_Discard email"
 msgstr "_Descartar correo"
 
-#: src/compose.c:9160 src/compose.c:9173
+#: src/compose.c:9226 src/compose.c:9239
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:9186
+#: src/compose.c:9252
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero �%s�."
 
-#: src/compose.c:9188
+#: src/compose.c:9254
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2123,60 +2117,60 @@ msgstr ""
 "El fichero �%s� conten�a caracteres inv�lidos para\n"
 "la codificaci�n actual, la inserci�n puede ser incorrecta."
 
-#: src/compose.c:9251
+#: src/compose.c:9317
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:9252
+#: src/compose.c:9318
 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. �Desea descartarlo?"
 
-#: src/compose.c:9253
+#: src/compose.c:9319
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:9253
+#: src/compose.c:9319
 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 
-#: src/compose.c:9255
+#: src/compose.c:9321
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: src/compose.c:9256
+#: src/compose.c:9322
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Este mensaje se ha modificado. �Guardar los �ltimos cambios?"
 
-#: src/compose.c:9257
+#: src/compose.c:9323
 msgid "_Don't save"
 msgstr "_No guardar"
 
-#: src/compose.c:9257
+#: src/compose.c:9323
 msgid "+_Save to Drafts"
 msgstr "+Guardar en _Borradores"
 
-#: src/compose.c:9308
+#: src/compose.c:9374
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "�Quiere aplicar la plantilla �%s�?"
 
-#: src/compose.c:9310
+#: src/compose.c:9376
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:9311
+#: src/compose.c:9377
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:9311
+#: src/compose.c:9377
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: src/compose.c:10108
+#: src/compose.c:10185
 msgid "Insert or attach?"
 msgstr "�Insertar o adjuntar?"
 
-#: src/compose.c:10109
+#: src/compose.c:10186
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2184,20 +2178,20 @@ msgstr ""
 "�Quiere insertar el contenido de este/os fichero/s en el cuerpo del correo o "
 "prefiere adjuntarlo/s al mismo?"
 
-#: src/compose.c:10111
+#: src/compose.c:10188
 msgid "+_Insert"
 msgstr "+_Insertar"
 
-#: src/compose.c:10111
+#: src/compose.c:10188
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: src/compose.c:10311
+#: src/compose.c:10388
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de formato de cita en la l�nea %d."
 
-#: src/compose.c:10578
+#: src/compose.c:10655
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2453,11 +2447,11 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:559 src/foldersel.c:545 src/imap_gtk.c:192 src/mh_gtk.c:142
+#: src/editgroup.c:559 src/foldersel.c:555 src/imap_gtk.c:192 src/mh_gtk.c:142
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:560 src/foldersel.c:546 src/mh_gtk.c:143
+#: src/editgroup.c:560 src/foldersel.c:556 src/mh_gtk.c:143
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2750,7 +2744,7 @@ msgstr "Extendido"
 msgid "Add New LDAP Server"
 msgstr "A�adir nuevo servidor LDAP"
 
-#: src/edittags.c:186 src/matcher.c:918 src/prefs_filtering_action.c:1380
+#: src/edittags.c:186 src/matcher.c:919 src/prefs_filtering_action.c:1380
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -2854,7 +2848,7 @@ msgid "HTML Output File"
 msgstr "Fichero HTML de salida"
 
 #: src/exphtmldlg.c:391 src/expldifdlg.c:408 src/export.c:169 src/import.c:168
-#: src/importldif.c:682
+#: src/importldif.c:681
 msgid "B_rowse"
 msgstr "Explo_rar"
 
@@ -2862,17 +2856,18 @@ msgstr "Explo_rar"
 msgid "Stylesheet"
 msgstr "Hoja de estilos"
 
-#: src/exphtmldlg.c:452 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1501
-#: src/gtk/gtkaspell.c:2156 src/mainwindow.c:1064 src/prefs_account.c:921
-#: src/prefs_toolbar.c:705 src/prefs_toolbar.c:1184 src/summaryview.c:5766
+#: src/exphtmldlg.c:452 src/gtk/colorlabel.c:377 src/gtk/gtkaspell.c:1501
+#: src/gtk/gtkaspell.c:2156 src/mainwindow.c:1107 src/prefs_account.c:921
+#: src/prefs_toolbar.c:705 src/prefs_toolbar.c:1184 src/summaryview.c:5634
 msgid "None"
 msgstr "Ninguno"
 
-#: src/exphtmldlg.c:453 src/prefs_other.c:113 src/prefs_other.c:453
+#: src/exphtmldlg.c:453 src/prefs_other.c:113 src/prefs_other.c:400
 msgid "Default"
 msgstr "Por omisi�n"
 
-#: src/exphtmldlg.c:454 src/plugins/pgpcore/sgpgme.c:150
+#: src/exphtmldlg.c:454 src/plugins/pgpcore/select-keys.c:248
+#: src/plugins/pgpcore/sgpgme.c:149
 msgid "Full"
 msgstr "Completo"
 
@@ -2916,11 +2911,11 @@ msgstr "Formatear enlaces de correo electr
 msgid "Format User Attributes"
 msgstr "Formatear atributos del usuario"
 
-#: src/exphtmldlg.c:538 src/expldifdlg.c:612 src/importldif.c:890
+#: src/exphtmldlg.c:538 src/expldifdlg.c:612 src/importldif.c:889
 msgid "Address Book :"
 msgstr "Agenda de direcciones :"
 
-#: src/exphtmldlg.c:548 src/expldifdlg.c:622 src/importldif.c:900
+#: src/exphtmldlg.c:548 src/expldifdlg.c:622 src/importldif.c:899
 msgid "File Name :"
 msgstr "Nombre de fichero :"
 
@@ -2932,7 +2927,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:721 src/importldif.c:1020
+#: src/exphtmldlg.c:656 src/expldifdlg.c:721 src/importldif.c:1019
 msgid "File Info"
 msgstr "Informaci�n de fichero"
 
@@ -3098,7 +3093,7 @@ msgstr "Exportar agenda a un fichero LDIF"
 msgid "Distinguished Name"
 msgstr "Nombre distinguido"
 
-#: src/export.c:110 src/summaryview.c:7845
+#: src/export.c:110 src/summaryview.c:7680
 msgid "Export to mbox file"
 msgstr "Exportar a fichero mbox"
 
@@ -3134,7 +3129,7 @@ msgstr "Seleccione fichero de exportaci
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: src/exporthtml.c:766 src/importldif.c:1021
+#: src/exporthtml.c:766 src/importldif.c:1020
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -3158,52 +3153,52 @@ msgstr "El nombre es demasiado largo."
 msgid "Not specified."
 msgstr "Sin especificar."
 
-#: src/folder.c:1442 src/foldersel.c:367 src/prefs_folder_item.c:288
+#: src/folder.c:1438 src/foldersel.c:377 src/prefs_folder_item.c:295
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/folder.c:1446 src/foldersel.c:371
+#: src/folder.c:1442 src/foldersel.c:381
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/folder.c:1450 src/foldersel.c:375 src/prefs_folder_item.c:291
+#: src/folder.c:1446 src/foldersel.c:385 src/prefs_folder_item.c:298
 msgid "Queue"
 msgstr "Cola"
 
-#: src/folder.c:1454 src/foldersel.c:379 src/prefs_folder_item.c:292
+#: src/folder.c:1450 src/foldersel.c:389 src/prefs_folder_item.c:299
 #: src/toolbar.c:361 src/toolbar.c:396
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/folder.c:1458 src/foldersel.c:383 src/prefs_folder_item.c:290
+#: src/folder.c:1454 src/foldersel.c:393 src/prefs_folder_item.c:297
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/folder.c:1894
+#: src/folder.c:1890
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Procesando (%s)...\n"
 
-#: src/folder.c:3112
+#: src/folder.c:3108
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s a %s...\n"
 
-#: src/folder.c:3112
+#: src/folder.c:3108
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Moviendo %s a %s...\n"
 
-#: src/folder.c:3399
+#: src/folder.c:3395
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualizando cache para %s..."
 
-#: src/folder.c:4232
+#: src/folder.c:4228
 msgid "Processing messages..."
 msgstr "Procesando mensajes..."
 
-#: src/folder.c:4368
+#: src/folder.c:4364
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso sin conexi�n...\n"
@@ -3212,171 +3207,171 @@ msgstr "Sincronizando %s para uso sin conexi
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:547 src/imap_gtk.c:196 src/mh_gtk.c:144
+#: src/foldersel.c:557 src/imap_gtk.c:196 src/mh_gtk.c:144
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:555 src/imap_gtk.c:207 src/imap_gtk.c:213
+#: src/foldersel.c:565 src/imap_gtk.c:207 src/imap_gtk.c:213
 #: src/imap_gtk.c:270 src/mh_gtk.c:152 src/mh_gtk.c:259 src/news_gtk.c:314
 #, 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:565 src/imap_gtk.c:223 src/imap_gtk.c:282 src/mh_gtk.c:162
+#: src/foldersel.c:575 src/imap_gtk.c:223 src/imap_gtk.c:282 src/mh_gtk.c:162
 #: src/mh_gtk.c:266 src/news_gtk.c:321
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta �%s� ya existe."
 
-#: src/foldersel.c:572 src/imap_gtk.c:229 src/mh_gtk.c:168
+#: src/foldersel.c:582 src/imap_gtk.c:229 src/mh_gtk.c:168
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "No se puede crear la carpeta �%s�."
 
-#: src/folderview.c:278
+#: src/folderview.c:230
 msgid "Mark all re_ad"
 msgstr "Marcar todos como l_e�dos"
 
-#: src/folderview.c:280
+#: src/folderview.c:232
 msgid "R_un processing rules"
 msgstr "Ejec_utar reglas de procesamiento"
 
-#: src/folderview.c:281 src/mainwindow.c:499
+#: src/folderview.c:233 src/mainwindow.c:509
 msgid "_Search folder..."
 msgstr "_Buscar en carpeta..."
 
-#: src/folderview.c:283
+#: src/folderview.c:235
 msgid "Process_ing..."
 msgstr "Pr_ocesamiento..."
 
-#: src/folderview.c:284
+#: src/folderview.c:236
 msgid "Empty _trash..."
 msgstr "_Vaciar papelera..."
 
-#: src/folderview.c:285
+#: src/folderview.c:237
 msgid "Send _queue..."
 msgstr "Enviar _cola..."
 
-#: src/folderview.c:428 src/folderview.c:475 src/prefs_folder_column.c:78
-#: src/prefs_matcher.c:367 src/summaryview.c:6035
+#: src/folderview.c:380 src/folderview.c:427 src/prefs_folder_column.c:78
+#: src/prefs_matcher.c:369 src/summaryview.c:5907
 msgid "New"
 msgstr "Nuevos"
 
-#: src/folderview.c:429 src/folderview.c:476 src/prefs_folder_column.c:79
-#: src/prefs_matcher.c:366 src/summaryview.c:6037
+#: src/folderview.c:381 src/folderview.c:428 src/prefs_folder_column.c:79
+#: src/prefs_matcher.c:368 src/summaryview.c:5909
 msgid "Unread"
 msgstr "No le�dos"
 
-#: src/folderview.c:430 src/prefs_folder_column.c:80
+#: src/folderview.c:382 src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:478 src/summaryview.c:602
+#: src/folderview.c:430 src/summaryview.c:434
 msgid "#"
 msgstr "N�"
 
-#: src/folderview.c:789
+#: src/folderview.c:741
 msgid "Setting folder info..."
 msgstr "Estableciendo informaci�n de carpeta..."
 
-#: src/folderview.c:852 src/summaryview.c:4068
+#: src/folderview.c:804 src/summaryview.c:3915
 msgid "Mark all as read"
 msgstr "Marcar todo como le�do"
 
-#: src/folderview.c:853 src/summaryview.c:4069
+#: src/folderview.c:805 src/summaryview.c:3916
 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:1075 src/imap.c:3971 src/mainwindow.c:4846 src/setup.c:90
+#: src/folderview.c:1028 src/imap.c:4020 src/mainwindow.c:5015 src/setup.c:90
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:1079 src/imap.c:3976 src/mainwindow.c:4851 src/setup.c:95
+#: src/folderview.c:1032 src/imap.c:4025 src/mainwindow.c:5020 src/setup.c:95
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:1110
+#: src/folderview.c:1063
 msgid "Rebuild folder tree"
 msgstr "Reconstruir �rbol de carpetas"
 
-#: src/folderview.c:1111
+#: src/folderview.c:1064
 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:1121
+#: src/folderview.c:1074
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo �rbol de carpetas..."
 
-#: src/folderview.c:1123 src/folderview.c:1164
+#: src/folderview.c:1076 src/folderview.c:1117
 msgid "Scanning folder tree..."
 msgstr "Explorando �rbol de carpetas..."
 
-#: src/folderview.c:1255
+#: src/folderview.c:1208
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No se puede explorar la carpeta %s\n"
 
-#: src/folderview.c:1309
+#: src/folderview.c:1262
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:2144
+#: src/folderview.c:2081
 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Cerrando carpeta %s..."
 
-#: src/folderview.c:2239
+#: src/folderview.c:2176
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Abriendo carpeta %s ..."
 
-#: src/folderview.c:2257
+#: src/folderview.c:2194
 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 
-#: src/folderview.c:2419 src/mainwindow.c:2888 src/mainwindow.c:2892
+#: src/folderview.c:2335 src/mainwindow.c:2961 src/mainwindow.c:2965
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2336
 msgid "Delete all messages in trash?"
 msgstr "�Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2337
 msgid "+_Empty trash"
 msgstr "+_Vaciar papelera"
 
-#: src/folderview.c:2465 src/inc.c:1599 src/toolbar.c:2566
+#: src/folderview.c:2381 src/inc.c:1599 src/toolbar.c:2566
 msgid "Offline warning"
 msgstr "Notificaci�n conexi�n"
 
-#: src/folderview.c:2466 src/toolbar.c:2567
+#: src/folderview.c:2382 src/toolbar.c:2567
 msgid "You're working offline. Override?"
 msgstr "Est� trabajando sin conexi�n �Ignorar?"
 
-#: src/folderview.c:2477 src/toolbar.c:2586
+#: src/folderview.c:2393 src/toolbar.c:2586
 msgid "Send queued messages"
 msgstr "Enviar mensajes en la cola"
 
-#: src/folderview.c:2478 src/toolbar.c:2587
+#: src/folderview.c:2394 src/toolbar.c:2587
 msgid "Send all queued messages?"
 msgstr "�Enviar todos los mensajes en la cola?"
 
-#: src/folderview.c:2479 src/messageview.c:804 src/messageview.c:821
+#: src/folderview.c:2395 src/messageview.c:807 src/messageview.c:824
 #: src/toolbar.c:2588
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/folderview.c:2487 src/toolbar.c:2606
+#: src/folderview.c:2403 src/toolbar.c:2606
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 
-#: src/folderview.c:2490 src/main.c:2411 src/toolbar.c:2609
+#: src/folderview.c:2406 src/main.c:2420 src/toolbar.c:2609
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3385,68 +3380,68 @@ msgstr ""
 "Hubo alg�n error enviando los mensajes en la cola:\n"
 "%s"
 
-#: src/folderview.c:2572
+#: src/folderview.c:2488
 #, 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:2573
+#: src/folderview.c:2489
 #, 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:2575
+#: src/folderview.c:2491
 msgid "Copy folder"
 msgstr "Copiar carpeta"
 
-#: src/folderview.c:2575
+#: src/folderview.c:2491
 msgid "Move folder"
 msgstr "Mover carpeta"
 
-#: src/folderview.c:2586
+#: src/folderview.c:2502
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s a %s..."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2502
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 
-#: src/folderview.c:2617
+#: src/folderview.c:2533
 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 
-#: src/folderview.c:2620
+#: src/folderview.c:2536
 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:2621
+#: src/folderview.c:2537
 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:2624
+#: src/folderview.c:2540
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 
-#: src/folderview.c:2627
+#: src/folderview.c:2543
 msgid "Copy failed!"
 msgstr "�Copiar fall�!"
 
-#: src/folderview.c:2627
+#: src/folderview.c:2543
 msgid "Move failed!"
 msgstr "�Mover fall�!"
 
-#: src/folderview.c:2678
+#: src/folderview.c:2594
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuraci�n de procesamiento para la carpeta �%s�"
 
-#: src/folderview.c:3066 src/summaryview.c:4498 src/summaryview.c:4597
+#: src/folderview.c:2982 src/summaryview.c:4345 src/summaryview.c:4444
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La carpeta destino s�lo puede usarse para almacenar subcarpetas."
 
-#: src/gedit-print.c:138 src/messageview.c:2034 src/summaryview.c:4820
+#: src/gedit-print.c:138 src/messageview.c:2045 src/summaryview.c:4667
 #: src/toolbar.c:196 src/toolbar.c:403
 msgid "Print"
 msgstr "Imprimir"
@@ -3517,7 +3512,7 @@ msgstr "desconocido"
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:1639
+#: src/grouplistdialog.c:443 src/summaryview.c:1472
 msgid "Done."
 msgstr "Hecho."
 
@@ -3552,13 +3547,13 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"Copyright (C) 1999-2008\n"
+"Copyright (C) 1999-2009\n"
 "Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "and the Claws Mail team"
 msgstr ""
 "\n"
 "\n"
-"Copyright (C) 1999-2008\n"
+"Copyright (C) 1999-2009\n"
 "Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "y el equipo de Claws Mail"
 
@@ -3605,7 +3600,7 @@ msgstr ""
 "Localizaci�n: %s (caracteres: %s)\n"
 "Sistema operativo: desconocido"
 
-#: src/gtk/about.c:228 src/prefs_themes.c:726 src/wizard.c:542
+#: src/gtk/about.c:228 src/prefs_themes.c:729 src/wizard.c:542
 msgid "The Claws Mail Team"
 msgstr "El equipo de Claws Mail"
 
@@ -3650,50 +3645,42 @@ msgid "GnuTLS|adds support for encrypted connections to servers\n"
 msgstr "A�ade soporte para conexiones cifradas con los servidores\n"
 
 #: src/gtk/about.c:436
-msgid "GTK+ >= 2.10.0|adds support for a complete print dialog\n"
-msgstr "A�ade soporte para un di�logo de impresi�n completo\n"
-
-#: src/gtk/about.c:446
 msgid ""
 "IPv6|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:457
+#: src/gtk/about.c:447
 msgid "iconv|allows converting to and from different character sets\n"
 msgstr "Permite conversiones entre diferentes conjuntos de caracteres\n"
 
-#: src/gtk/about.c:467
+#: src/gtk/about.c:457
 msgid "JPilot|adds support for PalmOS addressbooks\n"
 msgstr "A�ade soporte para agendas de direcciones de PalmOS\n"
 
-#: src/gtk/about.c:477
+#: src/gtk/about.c:467
 msgid "LDAP|adds support for LDAP shared addressbooks\n"
 msgstr "A�ade soporte para agendas de direcciones compartidas con LDAP\n"
 
-#: src/gtk/about.c:487
+#: src/gtk/about.c:477
 msgid "libetpan|adds support for IMAP and NNTP servers\n"
 msgstr "A�ade soporte para servidores IMAP y NNTP\n"
 
-#: src/gtk/about.c:497
+#: src/gtk/about.c:488
 msgid "libgnomeprint|adds support for a complete print dialog\n"
 msgstr "A�ade soporte para un di�logo de impresi�n completo\n"
 
-#: src/gtk/about.c:507
+#: src/gtk/about.c:499
 msgid "libSM|adds support for session handling\n"
 msgstr "A�ade soporte para el manejo de sesion\n"
 
-#: src/gtk/about.c:517
+#: src/gtk/about.c:509
 msgid ""
 "NetworkManager|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:527
-msgid "OpenSSL|adds support for encrypted connections to servers\n"
-msgstr "A�ade soporte para conexiones cifradas con los servidores\n"
-
-#: src/gtk/about.c:559
+#: src/gtk/about.c:541
 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 "
@@ -3707,7 +3694,7 @@ msgstr ""
 "posterior.\n"
 "\n"
 
-#: src/gtk/about.c:565
+#: src/gtk/about.c:547
 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 "
@@ -3721,7 +3708,7 @@ msgstr ""
 "License para m�s detalles.\n"
 "\n"
 
-#: src/gtk/about.c:583
+#: src/gtk/about.c:565
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see <"
@@ -3729,7 +3716,7 @@ 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:588
+#: src/gtk/about.c:570
 msgid ""
 ">. \n"
 "\n"
@@ -3737,117 +3724,100 @@ msgstr ""
 ">. \n"
 "\n"
 
-#: src/gtk/about.c:591
-msgid ""
-"This product includes software developed by the OpenSSL Project for use in "
-"the OpenSSL Toolkit ("
-msgstr ""
-"Este programa incluye software desarrollado por el Proyecto OpenSSL para su "
-"uso en el OpenSSL Toolkit ("
-
-#: src/gtk/about.c:595
-msgid ").\n"
-msgstr ").\n"
-
-#: src/gtk/about.c:689
+#: src/gtk/about.c:663
 msgid "About Claws Mail"
 msgstr "Acerca de Claws Mail"
 
-#: src/gtk/about.c:740
+#: src/gtk/about.c:714
 msgid ""
-"Copyright (C) 1999-2008\n"
+"Copyright (C) 1999-2009\n"
 "Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "and the Claws Mail team"
 msgstr ""
-"Copyright (C) 1999-2008\n"
+"Copyright (C) 1999-2009\n"
 "Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "y el equipo de Claws Mail"
 
-#: src/gtk/about.c:754
+#: src/gtk/about.c:728
 msgid "_Info"
 msgstr "_Informaci�n"
 
-#: src/gtk/about.c:760
+#: src/gtk/about.c:734
 msgid "_Authors"
 msgstr "_Autores"
 
-#: src/gtk/about.c:766
+#: src/gtk/about.c:740
 msgid "_Features"
 msgstr "_Caracter�sticas"
 
-#: src/gtk/about.c:772
+#: src/gtk/about.c:746
 msgid "_License"
 msgstr "_Licencia"
 
-#: src/gtk/about.c:780
+#: src/gtk/about.c:754
 msgid "_Release Notes"
 msgstr "_Notas de la versi�n"
 
-#: src/gtk/colorlabel.c:37 src/prefs_common.c:360
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:358
 msgid "Orange"
 msgstr "Naranja"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:362
 msgid "Red"
 msgstr "Rojo"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:366
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:370
 msgid "Sky blue"
 msgstr "Azul cielo"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:374
 msgid "Blue"
 msgstr "Azul"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:378
 msgid "Green"
 msgstr "Verde"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:382
 msgid "Brown"
 msgstr "Marr�n"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:386
 msgid "Grey"
 msgstr "Gris"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:390
 msgid "Light brown"
 msgstr "Marr�n claro"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:394
 msgid "Dark red"
 msgstr "Rojo oscuro"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:398
 msgid "Dark pink"
 msgstr "Rosa oscuro"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:402
 msgid "Steel blue"
 msgstr "Azul acero"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:406
 msgid "Gold"
 msgstr "Dorado"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:410
 msgid "Bright green"
 msgstr "Verde brillante"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:414
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/colorlabel.c:331
-#, c-format
-msgid "Ctrl+%c"
-msgstr "Ctrl+%c"
-
 #: src/gtk/foldersort.c:156
 msgid "Set folder order"
 msgstr "Establecer posici�n de la carpeta"
@@ -4080,8 +4050,8 @@ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Tipograf�a a usar para las cabeceras y los pies (p.ej. �Monospace 10�)"
 
 #: src/gtk/headers.h:8 src/prefs_filtering_action.c:1206
-#: src/prefs_matcher.c:2004 src/prefs_summary_column.c:83 src/quote_fmt.c:48
-#: src/summaryview.c:600
+#: src/prefs_matcher.c:2028 src/prefs_summary_column.c:83 src/quote_fmt.c:48
+#: src/summaryview.c:432
 msgid "Date"
 msgstr "Fecha"
 
@@ -4090,9 +4060,9 @@ msgid "Date:"
 msgstr "Fecha:"
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1203
-#: src/prefs_matcher.c:2001 src/prefs_summary_column.c:81
+#: src/prefs_matcher.c:2025 src/prefs_summary_column.c:81
 #: src/prefs_template.c:79 src/quote_fmt.c:49 src/quote_fmt.c:167
-#: src/quote_fmt.c:295 src/quote_fmt.c:427 src/summaryview.c:598
+#: src/quote_fmt.c:295 src/quote_fmt.c:427 src/summaryview.c:430
 msgid "From"
 msgstr "Desde"
 
@@ -4113,13 +4083,13 @@ msgid "Reply-To"
 msgstr "Responder a"
 
 #: src/gtk/headers.h:12 src/prefs_filtering_action.c:1204
-#: src/prefs_matcher.c:2002 src/prefs_summary_column.c:82
-#: src/prefs_template.c:81 src/quote_fmt.c:56 src/summaryview.c:599
+#: src/prefs_matcher.c:2026 src/prefs_summary_column.c:82
+#: src/prefs_template.c:81 src/quote_fmt.c:56 src/summaryview.c:431
 msgid "To"
 msgstr "Para"
 
 #: src/gtk/headers.h:13 src/prefs_account.c:1955
-#: src/prefs_filtering_action.c:1205 src/prefs_matcher.c:2003
+#: src/prefs_filtering_action.c:1205 src/prefs_matcher.c:2027
 #: src/prefs_template.c:82 src/quote_fmt.c:57
 msgid "Cc"
 msgstr "Cc"
@@ -4129,7 +4099,7 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #: src/gtk/headers.h:15 src/prefs_filtering_action.c:1207
-#: src/prefs_matcher.c:2005 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2029 src/quote_fmt.c:60
 msgid "Message-ID"
 msgstr "ID-Mensaje"
 
@@ -4146,7 +4116,7 @@ msgid "In-Reply-To:"
 msgstr "En-Respuesta-A:"
 
 #: src/gtk/headers.h:17 src/prefs_filtering_action.c:1209
-#: src/prefs_matcher.c:2007 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2031 src/quote_fmt.c:59
 msgid "References"
 msgstr "Referencias"
 
@@ -4155,9 +4125,9 @@ msgid "References:"
 msgstr "Referencias:"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1202
-#: src/prefs_matcher.c:2000 src/prefs_summary_column.c:80
+#: src/prefs_matcher.c:2024 src/prefs_summary_column.c:80
 #: src/prefs_template.c:84 src/quote_fmt.c:55 src/quote_fmt.c:186
-#: src/summaryview.c:597
+#: src/summaryview.c:429
 msgid "Subject"
 msgstr "Asunto"
 
@@ -4250,7 +4220,7 @@ msgid "Received:"
 msgstr "Recibido:"
 
 #: src/gtk/headers.h:32 src/prefs_filtering_action.c:1208
-#: src/prefs_matcher.c:2006 src/quote_fmt.c:58
+#: src/prefs_matcher.c:2030 src/quote_fmt.c:58
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
@@ -4275,12 +4245,12 @@ msgid "Seen:"
 msgstr "Visto:"
 
 #: src/gtk/headers.h:36 src/gtk/progressdialog.c:137
-#: src/gtk/sslcertwindow.c:232 src/prefs_summary_column.c:78
-#: src/summaryview.c:2818
+#: src/gtk/sslcertwindow.c:163 src/prefs_summary_column.c:78
+#: src/summaryview.c:2651
 msgid "Status"
 msgstr "Estado"
 
-#: src/gtk/headers.h:36 src/prefs_themes.c:936
+#: src/gtk/headers.h:36 src/prefs_themes.c:939
 msgid "Status:"
 msgstr "Estado:"
 
@@ -4600,7 +4570,7 @@ msgstr "Recordar esto"
 msgid "Clear _Log"
 msgstr "_Limpiar traza"
 
-#: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
+#: src/gtk/pluginwindow.c:163 src/gtk/pluginwindow.c:168
 msgid ""
 "\n"
 "\n"
@@ -4610,19 +4580,19 @@ msgstr ""
 "\n"
 "Versi�n: "
 
-#: src/gtk/pluginwindow.c:167
+#: src/gtk/pluginwindow.c:166
 msgid "Error: "
 msgstr "Error: "
 
-#: src/gtk/pluginwindow.c:168
+#: src/gtk/pluginwindow.c:167
 msgid "Plugin is not functional."
 msgstr "El m�dulo no est� operativo."
 
-#: src/gtk/pluginwindow.c:201
+#: src/gtk/pluginwindow.c:200
 msgid "Select the Plugins to load"
 msgstr "Seleccionar los m�dulos a cargar"
 
-#: src/gtk/pluginwindow.c:216
+#: src/gtk/pluginwindow.c:215
 #, c-format
 msgid ""
 "The following error occurred while loading %s :\n"
@@ -4633,7 +4603,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:305 src/plugins/bogofilter/bogofilter_gtk.c:450
+#: src/gtk/pluginwindow.c:304 src/plugins/bogofilter/bogofilter_gtk.c:450
 #: src/plugins/dillo_viewer/dillo_prefs.c:124
 #: src/plugins/pgpcore/prefs_gpg.c:553
 #: src/plugins/spamassassin/spamassassin_gtk.c:641
@@ -4641,39 +4611,39 @@ msgstr ""
 msgid "Plugins"
 msgstr "M�dulos"
 
-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:337
 msgid "Load..."
 msgstr "Cargar..."
 
-#: src/gtk/pluginwindow.c:339
+#: src/gtk/pluginwindow.c:338
 msgid "Unload"
 msgstr "Descargar"
 
-#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:220
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:220
 msgid "Description"
 msgstr "Descripci�n"
 
-#: src/gtk/pluginwindow.c:374
+#: src/gtk/pluginwindow.c:373
 msgid "More plugins are available from the Claws Mail website."
 msgstr "Hay m�s m�dulos disponibles en el sitio web de Claws Mail."
 
-#: src/gtk/pluginwindow.c:380 src/prefs_themes.c:875
+#: src/gtk/pluginwindow.c:379 src/prefs_themes.c:878
 msgid "Get more..."
 msgstr "Obtener m�s..."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:414
 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:417
 msgid "Unload the selected plugin"
 msgstr "Descargar el m�dulo seleccionado"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
 msgstr "M�dulos cargados"
 
-#: src/gtk/prefswindow.c:672
+#: src/gtk/prefswindow.c:671
 msgid "Page Index"
 msgstr "P�gina �ndice"
 
@@ -4681,7 +4651,7 @@ msgstr "P
 #: src/prefs_account.c:3121 src/prefs_account.c:3139 src/prefs_account.c:3157
 #: src/prefs_account.c:3175 src/prefs_account.c:3193 src/prefs_account.c:3212
 #: src/prefs_account.c:3294 src/prefs_filtering_action.c:1357
-#: src/prefs_filtering.c:392 src/prefs_filtering.c:1926
+#: src/prefs_filtering.c:391 src/prefs_filtering.c:1925
 msgid "Account"
 msgstr "Cuenta"
 
@@ -4922,64 +4892,61 @@ msgstr "Informaci
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/gtk/quicksearch.c:1257 src/summaryview.c:1451
+#: src/gtk/quicksearch.c:1257 src/summaryview.c:1284
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Buscando en %s...\n"
 
-#: src/gtk/sslcertwindow.c:86 src/gtk/sslcertwindow.c:97
-#: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:110
-#: src/gtk/sslcertwindow.c:121 src/gtk/sslcertwindow.c:127
-#: src/gtk/sslcertwindow.c:145 src/gtk/sslcertwindow.c:152
-#: src/gtk/sslcertwindow.c:167 src/gtk/sslcertwindow.c:172
-#: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:194
+#: src/gtk/sslcertwindow.c:84 src/gtk/sslcertwindow.c:91
+#: src/gtk/sslcertwindow.c:106 src/gtk/sslcertwindow.c:111
+#: src/gtk/sslcertwindow.c:118 src/gtk/sslcertwindow.c:133
 msgid "<not in certificate>"
 msgstr "<no en el certificado>"
 
-#: src/gtk/sslcertwindow.c:225 src/gtk/sslcertwindow.c:394
-#: src/gtk/sslcertwindow.c:439 src/gtk/sslcertwindow.c:498
-msgid "correct"
-msgstr "correcto"
+#: src/gtk/sslcertwindow.c:156 src/gtk/sslcertwindow.c:321
+#: src/gtk/sslcertwindow.c:362 src/gtk/sslcertwindow.c:417
+msgid "Correct"
+msgstr "Correcto"
 
-#: src/gtk/sslcertwindow.c:230
+#: src/gtk/sslcertwindow.c:161
 msgid "Owner"
 msgstr "Propietario"
 
-#: src/gtk/sslcertwindow.c:231
+#: src/gtk/sslcertwindow.c:162
 msgid "Signer"
 msgstr "Firmante"
 
-#: src/gtk/sslcertwindow.c:238 src/gtk/sslcertwindow.c:262
-#: src/prefs_themes.c:892
+#: src/gtk/sslcertwindow.c:169 src/gtk/sslcertwindow.c:193
+#: src/prefs_themes.c:895
 msgid "Name: "
 msgstr "Nombre: "
 
-#: src/gtk/sslcertwindow.c:246 src/gtk/sslcertwindow.c:270
+#: src/gtk/sslcertwindow.c:177 src/gtk/sslcertwindow.c:201
 msgid "Organization: "
 msgstr "Organizaci�n: "
 
-#: src/gtk/sslcertwindow.c:254 src/gtk/sslcertwindow.c:278
+#: src/gtk/sslcertwindow.c:185 src/gtk/sslcertwindow.c:209
 msgid "Location: "
 msgstr "Localizaci�n: "
 
-#: src/gtk/sslcertwindow.c:286
+#: src/gtk/sslcertwindow.c:217
 msgid "Fingerprint: \n"
 msgstr "Huella: \n"
 
-#: src/gtk/sslcertwindow.c:296
+#: src/gtk/sslcertwindow.c:227
 msgid "Signature status: "
 msgstr "Estado de la firma: "
 
-#: src/gtk/sslcertwindow.c:303
+#: src/gtk/sslcertwindow.c:234
 msgid "Expires on: "
 msgstr "Caduca en: "
 
-#: src/gtk/sslcertwindow.c:366
+#: src/gtk/sslcertwindow.c:297
 #, c-format
 msgid "SSL certificate for %s"
 msgstr "Certificado SSL para %s"
 
-#: src/gtk/sslcertwindow.c:382
+#: src/gtk/sslcertwindow.c:313
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -4988,30 +4955,30 @@ msgstr ""
 "El certificado de %s es desconocido.\n"
 "�Quiere aceptarlo?"
 
-#: src/gtk/sslcertwindow.c:396 src/gtk/sslcertwindow.c:441
-#: src/gtk/sslcertwindow.c:500
+#: src/gtk/sslcertwindow.c:323 src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:419
 #, c-format
 msgid "Signature status: %s"
 msgstr "Estado de la firma: %s"
 
-#: src/gtk/sslcertwindow.c:404 src/gtk/sslcertwindow.c:449
+#: src/gtk/sslcertwindow.c:331 src/gtk/sslcertwindow.c:372
 msgid "_View certificate"
 msgstr "_Mostrar certificado"
 
-#: src/gtk/sslcertwindow.c:409
+#: src/gtk/sslcertwindow.c:336
 msgid "Unknown SSL Certificate"
 msgstr "Certificado SSL desconocido"
 
-#: src/gtk/sslcertwindow.c:410 src/gtk/sslcertwindow.c:455
-#: src/gtk/sslcertwindow.c:513
+#: src/gtk/sslcertwindow.c:337 src/gtk/sslcertwindow.c:378
+#: src/gtk/sslcertwindow.c:432
 msgid "_Cancel connection"
 msgstr "_Cancelar conexi�n"
 
-#: src/gtk/sslcertwindow.c:410 src/gtk/sslcertwindow.c:513
+#: src/gtk/sslcertwindow.c:337 src/gtk/sslcertwindow.c:432
 msgid "_Accept and save"
 msgstr "_Aceptar y guardar"
 
-#: src/gtk/sslcertwindow.c:426
+#: src/gtk/sslcertwindow.c:353
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5020,32 +4987,32 @@ msgstr ""
 "El certificado de %s est� caducado.\n"
 "�Quiere continuar?"
 
-#: src/gtk/sslcertwindow.c:454
+#: src/gtk/sslcertwindow.c:377
 msgid "Expired SSL Certificate"
 msgstr "Certificados SSL caducados"
 
-#: src/gtk/sslcertwindow.c:455
+#: src/gtk/sslcertwindow.c:378
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: src/gtk/sslcertwindow.c:473
+#: src/gtk/sslcertwindow.c:396
 msgid "New certificate:"
 msgstr "Certificado nuevo:"
 
-#: src/gtk/sslcertwindow.c:478
+#: src/gtk/sslcertwindow.c:401
 msgid "Known certificate:"
 msgstr "Certificado conocido:"
 
-#: src/gtk/sslcertwindow.c:485
+#: src/gtk/sslcertwindow.c:408
 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "El certificado de %s ha cambiado. �Quiere aceptarlo?"
 
-#: src/gtk/sslcertwindow.c:508
+#: src/gtk/sslcertwindow.c:427
 msgid "_View certificates"
 msgstr "_Mostrar certificados"
 
-#: src/gtk/sslcertwindow.c:512
+#: src/gtk/sslcertwindow.c:431
 msgid "Changed SSL Certificate"
 msgstr "Certificado SSL cambiado"
 
@@ -5053,11 +5020,12 @@ msgstr "Certificado SSL cambiado"
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: src/headerview.c:215 src/summaryview.c:3336 src/summaryview.c:3346
+#: src/headerview.c:215 src/summaryview.c:3171 src/summaryview.c:3181
+#: src/summaryview.c:3202
 msgid "(No From)"
 msgstr "(Sin remite)"
 
-#: src/headerview.c:230 src/summaryview.c:3369 src/summaryview.c:3372
+#: src/headerview.c:230 src/summaryview.c:3215 src/summaryview.c:3219
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -5081,27 +5049,27 @@ msgstr "Cargar imagen"
 msgid "IMAP4 connection broken\n"
 msgstr "La conexi�n IMAP4 se rompi�\n"
 
-#: src/imap.c:564
+#: src/imap.c:565
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
 msgstr "Error IMAP en %s: autentificado\n"
 
-#: src/imap.c:567
+#: src/imap.c:568
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
 msgstr "Error IMAP en %s: no autentificado\n"
 
-#: src/imap.c:570
+#: src/imap.c:571
 #, c-format
 msgid "IMAP error on %s: bad state\n"
 msgstr "Error IMAP en %s: estado incorrecto\n"
 
-#: src/imap.c:573
+#: src/imap.c:574
 #, c-format
 msgid "IMAP error on %s: stream error\n"
 msgstr "Error IMAP en %s: error del flujo\n"
 
-#: src/imap.c:576
+#: src/imap.c:577
 #, c-format
 msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
@@ -5110,22 +5078,22 @@ msgstr ""
 "Error IMAP en %s: error interpretando (seguramente el servidor no es "
 "conforme a los RFC)\n"
 
-#: src/imap.c:580
+#: src/imap.c:581
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
 msgstr "Error IMAP en %s: conexi�n rechazada\n"
 
-#: src/imap.c:583
+#: src/imap.c:584
 #, c-format
 msgid "IMAP error on %s: memory error\n"
 msgstr "Error IMAP en %s: error de memoria\n"
 
-#: src/imap.c:586
+#: src/imap.c:587
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
 msgstr "Error IMAP en %s: error fatal\n"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
@@ -5134,172 +5102,172 @@ msgstr ""
 "Error IMAP en %s: error de protocolo (seguramente el servidor no es conforme "
 "a los RFC)\n"
 
-#: src/imap.c:593
+#: src/imap.c:594
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
 msgstr "Error IMAP en %s: la conexi�n no fue aceptada\n"
 
-#: src/imap.c:596
+#: src/imap.c:597
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
 msgstr "Error IMAP en %s: error de APPEND\n"
 
-#: src/imap.c:599
+#: src/imap.c:600
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
 msgstr "Error IMAP en %s: error de NOOP\n"
 
-#: src/imap.c:602
+#: src/imap.c:603
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
 msgstr "Error IMAP en %s: error de LOGOUT\n"
 
-#: src/imap.c:605
+#: src/imap.c:606
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "Error IMAP en %s: error de CAPABILITY\n"
 
-#: src/imap.c:608
+#: src/imap.c:609
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
 msgstr "Error IMAP en %s: error de CHECK\n"
 
-#: src/imap.c:611
+#: src/imap.c:612
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
 msgstr "Error IMAP en %s: error de CLOSE\n"
 
-#: src/imap.c:614
+#: src/imap.c:615
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
 msgstr "Error IMAP en %s: error de EXPUNGE\n"
 
-#: src/imap.c:617
+#: src/imap.c:618
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
 msgstr "Error IMAP en %s: error de COPY\n"
 
-#: src/imap.c:620
+#: src/imap.c:621
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
 msgstr "Error IMAP en %s: error de UID COPY\n"
 
-#: src/imap.c:623
+#: src/imap.c:624
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
 msgstr "Error IMAP en %s: error de CREATE\n"
 
-#: src/imap.c:626
+#: src/imap.c:627
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
 msgstr "Error IMAP en %s: error de DELETE\n"
 
-#: src/imap.c:629
+#: src/imap.c:630
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
 msgstr "Error IMAP en %s: error de EXAMINE\n"
 
-#: src/imap.c:632
+#: src/imap.c:633
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
 msgstr "Error IMAP en %s: error de FETCH\n"
 
-#: src/imap.c:635
+#: src/imap.c:636
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "Error IMAP en %s: error de UID FETCH\n"
 
-#: src/imap.c:638
+#: src/imap.c:639
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
 msgstr "Error IMAP en %s: error de LIST\n"
 
-#: src/imap.c:641
+#: src/imap.c:642
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
 msgstr "Error IMAP en %s: error de LOGIN\n"
 
-#: src/imap.c:644
+#: src/imap.c:645
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
 msgstr "Error IMAP en %s: error de LSUB\n"
 
-#: src/imap.c:647
+#: src/imap.c:648
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
 msgstr "Error IMAP en %s: error de RENAME\n"
 
-#: src/imap.c:650
+#: src/imap.c:651
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
 msgstr "Error IMAP en %s: error de SEARCH\n"
 
-#: src/imap.c:653
+#: src/imap.c:654
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "Error IMAP en %s: error de UID SEARCH\n"
 
-#: src/imap.c:656
+#: src/imap.c:657
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
 msgstr "Error IMAP en %s: error de SELECT\n"
 
-#: src/imap.c:659
+#: src/imap.c:660
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
 msgstr "Error IMAP en %s: error de STATUS\n"
 
-#: src/imap.c:662
+#: src/imap.c:663
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
 msgstr "Error IMAP en %s: error de STORE\n"
 
-#: src/imap.c:665
+#: src/imap.c:666
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
 msgstr "Error IMAP en %s: error de UID STORE\n"
 
-#: src/imap.c:668
+#: src/imap.c:669
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "Error IMAP en %s: error de SUBSCRIBE\n"
 
-#: src/imap.c:671
+#: src/imap.c:672
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "Error IMAP en %s: error de UNSUBSCRIBE\n"
 
-#: src/imap.c:674
+#: src/imap.c:675
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
 msgstr "Error IMAP en %s: error de STARTTLS\n"
 
-#: src/imap.c:677
+#: src/imap.c:678
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
 msgstr "Error IMAP en %s: error de INVAL\n"
 
-#: src/imap.c:680
+#: src/imap.c:681
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "Error IMAP en %s: error de EXTENSION\n"
 
-#: src/imap.c:683
+#: src/imap.c:684
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
 msgstr "Error IMAP en %s: error de SASL\n"
 
-#: src/imap.c:687
+#: src/imap.c:688
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
 msgstr "Error IMAP en %s: error de SSL\n"
 
-#: src/imap.c:691
+#: src/imap.c:692
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
 msgstr "Error IMAP en %s: error desconocido [%d]\n"
 
-#: src/imap.c:872
+#: src/imap.c:873
 msgid ""
 "\n"
 "\n"
@@ -5311,7 +5279,7 @@ msgstr ""
 "Las autentificaciones 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:878
+#: src/imap.c:879
 msgid ""
 "\n"
 "\n"
@@ -5323,37 +5291,37 @@ msgstr ""
 "Las autentificaciones 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:885
+#: src/imap.c:886
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Fall� la conexi�n con %s: login rechazado.%s"
 
-#: src/imap.c:889
+#: src/imap.c:890
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Fall� la conexi�n con %s: login rechazado.%s\n"
 
-#: src/imap.c:907
+#: src/imap.c:908
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Fall� la conexi�n con %s"
 
-#: src/imap.c:914 src/imap.c:917
+#: src/imap.c:915 src/imap.c:918
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexi�n IMAP4 con %s se ha desconectado. Reconectando...\n"
 
-#: src/imap.c:947 src/imap.c:3043 src/imap.c:3689 src/imap.c:3783
-#: src/imap.c:3960 src/imap.c:4771
+#: src/imap.c:948 src/imap.c:3086 src/imap.c:3738 src/imap.c:3832
+#: src/imap.c:4009 src/imap.c:4820
 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:1040 src/inc.c:795 src/news.c:353 src/send_message.c:289
+#: src/imap.c:1041 src/inc.c:795 src/news.c:353 src/send_message.c:289
 msgid "Insecure connection"
 msgstr "Conexi�n insegura"
 
-#: src/imap.c:1041 src/inc.c:796 src/news.c:354 src/send_message.c:290
+#: src/imap.c:1042 src/inc.c:796 src/news.c:354 src/send_message.c:290
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5366,115 +5334,115 @@ msgstr ""
 "\n"
 "�Quiere seguir conectando con este servidor? La comunicaci�n no ser�a segura."
 
-#: src/imap.c:1047 src/inc.c:802 src/news.c:360 src/send_message.c:296
+#: src/imap.c:1048 src/inc.c:802 src/news.c:360 src/send_message.c:296
 msgid "Con_tinue connecting"
 msgstr "Seguir conec_tando"
 
-#: src/imap.c:1057
+#: src/imap.c:1058
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Conectando al servidor IMAP4: %s..."
 
-#: src/imap.c:1099
+#: src/imap.c:1100
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d"
 
-#: src/imap.c:1102
+#: src/imap.c:1103
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:1135 src/imap.c:3449
+#: src/imap.c:1136 src/imap.c:3498
 msgid "Can't start TLS session.\n"
 msgstr "No se puede iniciar la sesi�n TLS.\n"
 
-#: src/imap.c:1177
+#: src/imap.c:1178
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Conectando al servidor IMAP4 %s...\n"
 
-#: src/imap.c:1192
+#: src/imap.c:1193
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No se puede entrar al servidor IMAP %s.\n"
 
-#: src/imap.c:1195
+#: src/imap.c:1196
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No se puede entrar al servidor IMAP %s."
 
-#: src/imap.c:1591
+#: src/imap.c:1592
 msgid "Adding messages..."
 msgstr "A�adiendo mensajes..."
 
-#: src/imap.c:1792 src/mh.c:517
+#: src/imap.c:1796 src/mh.c:517
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
-#: src/imap.c:1984
+#: src/imap.c:1988
 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags �borrado�\n"
 
-#: src/imap.c:1990 src/imap.c:4397
+#: src/imap.c:1994 src/imap.c:4446
 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 
-#: src/imap.c:2336
+#: src/imap.c:2340
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 
-#: src/imap.c:2339
+#: src/imap.c:2343
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 
-#: src/imap.c:2588
+#: src/imap.c:2631
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buz�n: LIST fall�\n"
 
-#: src/imap.c:2603
+#: src/imap.c:2646
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buz�n\n"
 
-#: src/imap.c:2694
+#: src/imap.c:2737
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "El nuevo nombre de la carpeta no debe contener el separador del espacio de "
 "nombres"
 
-#: src/imap.c:2731
+#: src/imap.c:2774
 #, 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:2834
+#: src/imap.c:2877
 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buz�n\n"
 
-#: src/imap.c:3124
+#: src/imap.c:3167
 msgid "LIST failed\n"
 msgstr "LIST fall�\n"
 
-#: src/imap.c:3206
+#: src/imap.c:3249
 msgid "Flagging messages..."
 msgstr "Etiquetando mensajes..."
 
-#: src/imap.c:3300
+#: src/imap.c:3347
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: src/imap.c:3446
+#: src/imap.c:3495
 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor necesita TLS para acceder a �l.\n"
 
-#: src/imap.c:3456
+#: src/imap.c:3505
 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
-#: src/imap.c:3461
+#: src/imap.c:3510
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5483,20 +5451,20 @@ msgstr ""
 "La conexi�n con %s fall�: el servidor necesita TLS, pero Claws Mail ha sido "
 "compilado sin soporte OpenSSL.\n"
 
-#: src/imap.c:3469
+#: src/imap.c:3518
 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor est�n deshabilitados.\n"
 
-#: src/imap.c:3694
+#: src/imap.c:3743
 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 
-#: src/imap.c:4383
+#: src/imap.c:4432
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no se pueden establecer los flags 'borrado': %d\n"
 
-#: src/imap.c:5427
+#: src/imap.c:5479
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5642,7 +5610,7 @@ msgstr "+_Buscar"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Elija una subcarpeta de %s a la que suscribirse: "
 
-#: src/imap_gtk.c:537 src/mainwindow.c:605
+#: src/imap_gtk.c:537 src/mainwindow.c:615
 msgid "Subscribe"
 msgstr "Suscribir"
 
@@ -5675,8 +5643,8 @@ msgstr "suscribir"
 msgid "unsubscribe"
 msgstr "desuscribir"
 
-#: src/imap_gtk.c:569 src/prefs_folder_item.c:1216
-#: src/prefs_folder_item.c:1237 src/prefs_folder_item.c:1258
+#: src/imap_gtk.c:569 src/prefs_folder_item.c:1234
+#: src/prefs_folder_item.c:1255 src/prefs_folder_item.c:1276
 msgid "Apply to subfolders"
 msgstr "Aplicar a subcarpetas"
 
@@ -5720,35 +5688,35 @@ msgstr "No se puede encontrar carpeta de destino."
 msgid "Select importing file"
 msgstr "Seleccionar fichero a importar"
 
-#: src/importldif.c:186
+#: src/importldif.c:185
 msgid "Please specify address book name and file to import."
 msgstr "Especifique el nombre de la agenda y el fichero a importar."
 
-#: src/importldif.c:189
+#: src/importldif.c:188
 msgid "Select and rename LDIF field names to import."
 msgstr "Seleccione y renombre los campos LDIF a importar."
 
-#: src/importldif.c:192
+#: src/importldif.c:191
 msgid "File imported."
 msgstr "Fichero importado."
 
-#: src/importldif.c:447 src/importmutt.c:122 src/importpine.c:121
+#: src/importldif.c:446 src/importmutt.c:122 src/importpine.c:121
 msgid "Please select a file."
 msgstr "Seleccione un fichero."
 
-#: src/importldif.c:453 src/importmutt.c:127 src/importpine.c:126
+#: src/importldif.c:452 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:493
+#: src/importldif.c:492
 msgid "LDIF file imported successfully."
 msgstr "Fichero LDIF importado con �xito."
 
-#: src/importldif.c:578
+#: src/importldif.c:577
 msgid "Select LDIF File"
 msgstr "Seleccionar fichero LDIF"
 
-#: src/importldif.c:665
+#: src/importldif.c:664
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
@@ -5756,43 +5724,43 @@ msgstr ""
 "Especifique el nombre para la agenda que ser� creada a partir de los datos "
 "del fichero LDIF."
 
-#: src/importldif.c:670
+#: src/importldif.c:669
 msgid "File Name"
 msgstr "Nombre del fichero"
 
-#: src/importldif.c:680
+#: src/importldif.c:679
 msgid "The full file specification of the LDIF file to import."
 msgstr "La especificaci�n completa del fichero LDIF a importar."
 
-#: src/importldif.c:687
+#: src/importldif.c:686
 msgid "Select the LDIF file to import."
 msgstr "Seleccione el fichero LDIF a importar."
 
-#: src/importldif.c:724
+#: src/importldif.c:723
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:725 src/summaryview.c:595
+#: src/importldif.c:724 src/summaryview.c:427
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:726
+#: src/importldif.c:725
 msgid "LDIF Field Name"
 msgstr "Nombre de campo LDIF"
 
-#: src/importldif.c:727
+#: src/importldif.c:726
 msgid "Attribute Name"
 msgstr "Nombre de atributo"
 
-#: src/importldif.c:782
+#: src/importldif.c:781
 msgid "LDIF Field"
 msgstr "Campo LDIF"
 
-#: src/importldif.c:794
+#: src/importldif.c:793
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/importldif.c:806
+#: src/importldif.c:805
 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 "
@@ -5810,35 +5778,35 @@ msgstr ""
 "de la lista. Doble clic en cualquier parte de la fila y tambi�n ser� "
 "seleccionado el campo para importar."
 
-#: src/importldif.c:821
+#: src/importldif.c:820
 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:826
+#: src/importldif.c:825
 msgid "Select for Import"
 msgstr "Seleccionar para importar"
 
-#: src/importldif.c:831
+#: src/importldif.c:830
 msgid "Select the LDIF field for import into the address book."
 msgstr "Seleccionar el campo LDIF para importarlo a la agenda."
 
-#: src/importldif.c:833
+#: src/importldif.c:832
 msgid " Modify "
 msgstr " Modificar "
 
-#: src/importldif.c:838
+#: src/importldif.c:837
 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:910
+#: src/importldif.c:909
 msgid "Records Imported :"
 msgstr "Registros importados :"
 
-#: src/importldif.c:942
+#: src/importldif.c:941
 msgid "Import LDIF file into Address Book"
 msgstr "Importar fichero LDIF a la agenda"
 
-#: src/importldif.c:980
+#: src/importldif.c:979
 msgid "Proceed"
 msgstr "Proceder"
 
@@ -5914,8 +5882,8 @@ msgstr "Conexi
 msgid "Auth failed"
 msgstr "Authorizaci�n fallida"
 
-#: src/inc.c:640 src/prefs_matcher.c:372 src/prefs_summary_column.c:87
-#: src/summaryview.c:2814 src/summaryview.c:6059
+#: src/inc.c:640 src/prefs_matcher.c:374 src/prefs_summary_column.c:87
+#: src/summaryview.c:2647 src/summaryview.c:5931
 msgid "Locked"
 msgstr "Bloqueado"
 
@@ -6115,7 +6083,7 @@ msgstr "S
 msgid "Nick Name"
 msgstr "Apodo"
 
-#: src/main.c:244
+#: src/main.c:239
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6124,11 +6092,11 @@ msgstr ""
 "El fichero �%s� ya existe.\n"
 "No se puede crear la carpeta."
 
-#: src/main.c:266 src/main.c:279
+#: src/main.c:261 src/main.c:274
 msgid "Exiting..."
 msgstr "Saliendo..."
 
-#: src/main.c:410
+#: src/main.c:405
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6137,7 +6105,7 @@ msgstr ""
 "Encontrada configuraci�n para %s.\n"
 "�Desea migrar esta configuraci�n?"
 
-#: src/main.c:412
+#: src/main.c:407
 #, c-format
 msgid ""
 "\n"
@@ -6150,11 +6118,11 @@ msgstr ""
 "Sus reglas de filtrado de Sylpheed se pueden convertir\n"
 "con un script que encontrar� en %s."
 
-#: src/main.c:425
+#: src/main.c:420
 msgid "Keep old configuration"
 msgstr "Conservar la configuraci�n antigua"
 
-#: src/main.c:428
+#: src/main.c:423
 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 "
@@ -6164,35 +6132,35 @@ msgstr ""
 "pero puede tardar cierto tiempo si tiene datos de Noticias o IMAP cacheados "
 "y ocupar� espacio adicional en el disco."
 
-#: src/main.c:436
+#: src/main.c:431
 msgid "Migration of configuration"
 msgstr "Migraci�n de la configuraci�n"
 
-#: src/main.c:447
+#: src/main.c:442
 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando configuraci�n... Esto puede tardar un rato..."
 
-#: src/main.c:456
+#: src/main.c:451
 msgid "Migration failed!"
 msgstr "�La migraci�n fall�!"
 
-#: src/main.c:465
+#: src/main.c:460
 msgid "Migrating configuration..."
 msgstr "Migrando la configuraci�n..."
 
-#: src/main.c:1019 src/plugins/trayicon/trayicon.c:436
+#: src/main.c:1013 src/plugins/trayicon/trayicon.c:425
 msgid "Failed to register folder item update hook"
 msgstr "Fall� el registro del enlace de actualizaci�n de elementos de carpeta"
 
-#: src/main.c:1026 src/plugins/trayicon/trayicon.c:442
+#: src/main.c:1020 src/plugins/trayicon/trayicon.c:431
 msgid "Failed to register folder update hook"
 msgstr "Fall� el registro del enlace de actualizaci�n de carpetas"
 
-#: src/main.c:1178
+#: src/main.c:1169
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no est� soportado por glib.\n"
 
-#: src/main.c:1184
+#: src/main.c:1175
 msgid ""
 "Claws Mail has been compiled with a more recent GTK+ library than is "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "
@@ -6202,7 +6170,7 @@ msgstr ""
 "actualmente. Esto provocar� fallos graves. Necesita actualizar GTK+ o "
 "recompilar Claws Mail."
 
-#: src/main.c:1196
+#: src/main.c:1187
 msgid ""
 "Claws Mail has been compiled with an older GTK+ library than is currently "
 "available. This will cause crashes. You need to recompile Claws Mail."
@@ -6210,19 +6178,19 @@ msgstr ""
 "Claws Mail se compil� con una librer�a GTK+ m�s antigua que la disponible "
 "actualmente. Esto provocar� fallos graves. Necesita recompilar Claws Mail."
 
-#: src/main.c:1224
+#: src/main.c:1215
 msgid "Sylpheed-Claws 2.6.0 (or older)"
 msgstr "Sylpheed-Claws 2.6.0 (o anterior)"
 
-#: src/main.c:1227
+#: src/main.c:1218
 msgid "Sylpheed-Claws 1.9.15 (or older)"
 msgstr "Sylpheed-Claws 1.9.15 (o anterior)"
 
-#: src/main.c:1230
+#: src/main.c:1221
 msgid "Sylpheed-Claws 1.0.5 (or older)"
 msgstr "Sylpheed-Claws 1.0.5 (o anterior)"
 
-#: src/main.c:1533
+#: src/main.c:1518
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6241,7 +6209,7 @@ msgstr[1] ""
 "de los m�dulos para m�s informaci�n:\n"
 "%s"
 
-#: src/main.c:1561
+#: src/main.c:1546
 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 "
@@ -6251,7 +6219,7 @@ msgstr ""
 "ser debido a una cuenta IMAP que est� fallando. Utilize �Reconstruir �rbol de "
 "carpetas� en la carpeta padre del buz�n para intentar arreglarlo."
 
-#: src/main.c:1567
+#: src/main.c:1552
 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 "
@@ -6261,25 +6229,25 @@ 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:1596
+#: src/main.c:1581
 #, c-format
 msgid "Claws Mail can not start without its data volume (%s)."
 msgstr "Claws Mail no puede iniciarse sin su volumen de datos (%s)."
 
-#: src/main.c:1899
+#: src/main.c:1884
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCI�N]...\n"
 
-#: src/main.c:1901
+#: src/main.c:1886
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [direcci�n]  abre la ventana de edici�n"
 
-#: src/main.c:1902
+#: src/main.c:1887
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      suscribirse a la URI dada si es posible"
 
-#: src/main.c:1903
+#: src/main.c:1888
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6289,23 +6257,23 @@ msgstr ""
 "                         abre la ventana de composici�n con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:1906
+#: src/main.c:1891
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe los mensajes nuevos"
 
-#: src/main.c:1907
+#: src/main.c:1892
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe mensajes nuevos de todas las cuentas"
 
-#: src/main.c:1908
+#: src/main.c:1893
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:1909
+#: src/main.c:1894
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el n�mero total de mensajes"
 
-#: src/main.c:1910
+#: src/main.c:1895
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6313,7 +6281,7 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:1912
+#: src/main.c:1897
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6321,31 +6289,31 @@ msgstr ""
 "  --select carpt[/mnsj]  va a la carpeta/mensaje especificados\n"
 "                         carpt es un identificador como �carpeta/subcarpeta�"
 
-#: src/main.c:1914
+#: src/main.c:1899
 msgid "  --online               switch to online mode"
 msgstr "  --online               cambiar a modo de trabajo con conexi�n"
 
-#: src/main.c:1915
+#: src/main.c:1900
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              cambiar a modo de trabajo sin conexi�n"
 
-#: src/main.c:1916
+#: src/main.c:1901
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       salir de Claws Mail"
 
-#: src/main.c:1917
+#: src/main.c:1902
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuraci�n"
 
-#: src/main.c:1918
+#: src/main.c:1903
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              presenta esta ayuda y finaliza"
 
-#: src/main.c:1919
+#: src/main.c:1904
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           informa de la versi�n y finaliza"
 
-#: src/main.c:1920
+#: src/main.c:1905
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6353,11 +6321,11 @@ msgstr ""
 "  --version-full -V      informa de la versi�n y caracter�sticas incluidas y "
 "finaliza"
 
-#: src/main.c:1921
+#: src/main.c:1906
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           muestra el directorio del configuraci�n"
 
-#: src/main.c:1922
+#: src/main.c:1907
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6365,775 +6333,781 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         usa el directorio del configuraci�n especificado"
 
-#: src/main.c:1972
+#: src/main.c:1957
 msgid "Unknown option\n"
 msgstr "Error desconocido\n"
 
-#: src/main.c:1990
+#: src/main.c:1975
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Procesando (%s)..."
 
-#: src/main.c:1993
+#: src/main.c:1978
 msgid "top level folder"
 msgstr "carpeta superior"
 
-#: src/main.c:2076
+#: src/main.c:2061
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:2077
+#: src/main.c:2062
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. �Salir ahora?"
 
-#: src/main.c:2548
+#: src/main.c:2557
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: la red est� conectada.\n"
 
-#: src/main.c:2554
+#: src/main.c:2563
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la red est� desconectada.\n"
 
-#: src/mainwindow.c:458 src/messageview.c:186
+#: src/mainwindow.c:468 src/messageview.c:186
 msgid "_File"
 msgstr "_Fichero"
 
-#: src/mainwindow.c:460 src/messageview.c:188
+#: src/mainwindow.c:470 src/messageview.c:188
 msgid "_View"
 msgstr "_Ver"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:473
 msgid "_Configuration"
 msgstr "_Configuraci�n"
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:477
 msgid "_Add mailbox"
 msgstr "_A�adir buz�n"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:478
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:481
 msgid "Change folder order..."
 msgstr "Reorganizar carpetas..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:484
 msgid "_Import mbox file..."
 msgstr "_Importar fichero mbox..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:485
 msgid "_Export to mbox file..."
 msgstr "_Exportar a fichero mbox..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:486
 msgid "_Export selected to mbox file..."
 msgstr "_Exportar la selecci�n a un fichero mbox..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:488
 msgid "Empty all _Trash folders"
 msgstr "Vaciar _todas las papeleras"
 
-#: src/mainwindow.c:481 src/messageview.c:195 src/summaryview.c:580
+#: src/mainwindow.c:491 src/messageview.c:195
 msgid "_Save as..."
 msgstr "_Guardar como..."
 
-#: src/mainwindow.c:484 src/messageview.c:197
+#: src/mainwindow.c:494 src/messageview.c:197
 msgid "Page setup..."
 msgstr "Configurar p�gina..."
 
-#: src/mainwindow.c:486 src/messageview.c:199
+#: src/mainwindow.c:496 src/messageview.c:199
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:498
 msgid "Synchronise folders"
 msgstr "Sincronizar carpetas"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:500
 msgid "E_xit"
 msgstr "_Salir"
 
-#: src/mainwindow.c:495
+#: src/mainwindow.c:505
 msgid "Select _thread"
 msgstr "Seleccionar _hilo"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:506
 msgid "_Delete thread"
 msgstr "_Borrar hilo"
 
-#: src/mainwindow.c:498
+#: src/mainwindow.c:508
 msgid "_Find in current message..."
 msgstr "_Buscar en el mensaje actual..."
 
-#: src/mainwindow.c:500
+#: src/mainwindow.c:510
 msgid "_Quick search"
 msgstr "B�squeda _r�pida"
 
-#: src/mainwindow.c:503
+#: src/mainwindow.c:513
 msgid "Show or hi_de"
 msgstr "Mostrar u o_cultar"
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:514
 msgid "_Toolbar"
 msgstr "_Barra de herramientas"
 
-#: src/mainwindow.c:506
+#: src/mainwindow.c:516
 msgid "Set displayed _columns"
 msgstr "Establecer _columnas visibles"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:517
 msgid "in _Folder list..."
 msgstr "en la lista de _carpetas..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:518
 msgid "in _Message list..."
 msgstr "en la lista de _mensajes..."
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:523
 msgid "La_yout"
 msgstr "_Aspecto"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:526
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/mainwindow.c:518
+#: src/mainwindow.c:528
 msgid "_Attract by subject"
 msgstr "_Atraer por asunto"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:530
 msgid "E_xpand all threads"
 msgstr "E_xpandir todos los hilos"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:531
 msgid "Co_llapse all threads"
 msgstr "Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:523 src/messageview.c:210
+#: src/mainwindow.c:533 src/messageview.c:210
 msgid "_Go to"
 msgstr "_Ir a"
 
-#: src/mainwindow.c:524 src/messageview.c:211
+#: src/mainwindow.c:534 src/messageview.c:211
 msgid "_Previous message"
 msgstr "Mensaje _anterior"
 
-#: src/mainwindow.c:525 src/messageview.c:212
+#: src/mainwindow.c:535 src/messageview.c:212
 msgid "_Next message"
 msgstr "Mensaje _siguiente"
 
-#: src/mainwindow.c:527 src/messageview.c:214
+#: src/mainwindow.c:537 src/messageview.c:214
 msgid "P_revious unread message"
 msgstr "Mensaje a_nterior no le�do"
 
-#: src/mainwindow.c:528 src/messageview.c:215
+#: src/mainwindow.c:538 src/messageview.c:215
 msgid "N_ext unread message"
 msgstr "Mensaje s_iguiente no le�do"
 
-#: src/mainwindow.c:530 src/messageview.c:217
+#: src/mainwindow.c:540 src/messageview.c:217
 msgid "Previous ne_w message"
 msgstr "Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:531 src/messageview.c:218
+#: src/mainwindow.c:541 src/messageview.c:218
 msgid "Ne_xt new message"
 msgstr "Mensaje nuev_o siguiente"
 
-#: src/mainwindow.c:533 src/messageview.c:220
+#: src/mainwindow.c:543 src/messageview.c:220
 msgid "Previous _marked message"
 msgstr "Mensaje _marcado anterior"
 
-#: src/mainwindow.c:534 src/messageview.c:221
+#: src/mainwindow.c:544 src/messageview.c:221
 msgid "Next m_arked message"
 msgstr "Mensaje m_arcado siguiente"
 
-#: src/mainwindow.c:536 src/messageview.c:223
+#: src/mainwindow.c:546 src/messageview.c:223
 msgid "Previous _labeled message"
 msgstr "Mensaje _etiquetado anterior"
 
-#: src/mainwindow.c:537 src/messageview.c:224
+#: src/mainwindow.c:547 src/messageview.c:224
 msgid "Next la_beled message"
 msgstr "Mensaje e_tiquetado siguiente"
 
-#: src/mainwindow.c:539 src/messageview.c:226
+#: src/mainwindow.c:549 src/messageview.c:226
 msgid "Last read message"
 msgstr "�ltimo mensaje le�do"
 
-#: src/mainwindow.c:540 src/messageview.c:227
+#: src/mainwindow.c:550 src/messageview.c:227
 msgid "Parent message"
 msgstr "Mensaje padre"
 
-#: src/mainwindow.c:542 src/messageview.c:229
+#: src/mainwindow.c:552 src/messageview.c:229
 msgid "Next unread _folder"
 msgstr "Siguiente _carpeta sin leer"
 
-#: src/mainwindow.c:543 src/messageview.c:230
+#: src/mainwindow.c:553 src/messageview.c:230
 msgid "_Other folder..."
 msgstr "_Otra carpeta..."
 
-#: src/mainwindow.c:561 src/messageview.c:248
+#: src/mainwindow.c:571 src/messageview.c:248
 msgid "Decode"
 msgstr "Decodificar"
 
-#: src/mainwindow.c:568 src/summaryview.c:577
+#: src/mainwindow.c:578
 msgid "Open in new _window"
 msgstr "Abrir en ventana _nueva"
 
-#: src/mainwindow.c:569 src/messageview.c:255
+#: src/mainwindow.c:579 src/messageview.c:255
 msgid "Mess_age source"
 msgstr "Fuente del mens_aje"
 
-#: src/mainwindow.c:570 src/messageview.c:257
+#: src/mainwindow.c:580 src/messageview.c:257
 msgid "Quotes"
 msgstr "Citas"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:582
 msgid "_Update summary"
 msgstr "_Actualizar resumen"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:585
 msgid "Recei_ve"
 msgstr "Reci_bir"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:586
 msgid "Get from _current account"
 msgstr "De la cuenta _actual"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:587
 msgid "Get from _all accounts"
 msgstr "De _todas las cuentas"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:588
 msgid "Cancel receivin_g"
 msgstr "Cancelar re_cepci�n"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:591
 msgid "_Send queued messages"
 msgstr "_Enviar mensajes en la cola"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:595
 msgid "Compose a_n email message"
 msgstr "Compo_ner un mensaje de correo"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:596
 msgid "Compose a news message"
 msgstr "Componer un mensaje de noticias"
 
-#: src/mainwindow.c:588 src/messageview.c:263 src/summaryview.c:511
+#: src/mainwindow.c:598 src/messageview.c:263
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/mainwindow.c:589 src/messageview.c:264
+#: src/mainwindow.c:599 src/messageview.c:264
 msgid "Repl_y to"
 msgstr "Respon_der a"
 
-#: src/mainwindow.c:590 src/messageview.c:265 src/summaryview.c:514
+#: src/mainwindow.c:600 src/messageview.c:265
 msgid "_all"
 msgstr "tod_as"
 
-#: src/mainwindow.c:591 src/messageview.c:266 src/summaryview.c:515
+#: src/mainwindow.c:601 src/messageview.c:266
 msgid "_sender"
 msgstr "_remitente"
 
-#: src/mainwindow.c:592 src/messageview.c:267
+#: src/mainwindow.c:602 src/messageview.c:267
 msgid "mailing _list"
 msgstr "_lista-Correo"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:603
 msgid "Follow-up and reply to"
 msgstr "Seguir y responder a"
 
-#: src/mainwindow.c:596 src/messageview.c:270 src/summaryview.c:520
-#: src/toolbar.c:2015
+#: src/mainwindow.c:606 src/messageview.c:270 src/toolbar.c:2015
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: src/mainwindow.c:597 src/messageview.c:271 src/summaryview.c:522
-#: src/toolbar.c:2016
+#: src/mainwindow.c:607 src/messageview.c:271 src/toolbar.c:2016
 msgid "For_ward as attachment"
 msgstr "Reen_viar como adjunto"
 
-#: src/mainwindow.c:598 src/messageview.c:272 src/toolbar.c:2017
+#: src/mainwindow.c:608 src/messageview.c:272 src/toolbar.c:2017
 msgid "Redirec_t"
 msgstr "Redirigi_r"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:610
 msgid "Mailing-_List"
 msgstr "Lista-Correo"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:611
 msgid "Post"
 msgstr "Postear"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:613
 msgid "Help"
 msgstr "_Ayuda"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:617
 msgid "Unsubscribe"
 msgstr "Desuscribir"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:619
 msgid "View archive"
 msgstr "Ver archivo"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:621
 msgid "Contact owner"
 msgstr "Contactar proprietario"
 
-#: src/mainwindow.c:615 src/summaryview.c:526
+#: src/mainwindow.c:625
 msgid "M_ove..."
 msgstr "M_over..."
 
-#: src/mainwindow.c:616 src/summaryview.c:527
+#: src/mainwindow.c:626
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/mainwindow.c:617 src/summaryview.c:528
+#: src/mainwindow.c:627
 msgid "Move to _trash"
 msgstr "Mover a la p_apelera"
 
-#: src/mainwindow.c:618 src/summaryview.c:530
+#: src/mainwindow.c:628
 msgid "_Delete..."
 msgstr "_Borrar..."
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:629
 msgid "Cancel a news message"
 msgstr "Cancelar una noticia"
 
-#: src/mainwindow.c:623 src/summaryview.c:534
+#: src/mainwindow.c:633
 msgid "_Mark"
 msgstr "_Marcar"
 
 # RML To be consistent with previous one.
-#: src/mainwindow.c:624 src/summaryview.c:535
+#: src/mainwindow.c:634
 msgid "_Unmark"
 msgstr "_Desmarcar"
 
-#: src/mainwindow.c:627 src/summaryview.c:538
+#: src/mainwindow.c:637
 msgid "Mark as unr_ead"
 msgstr "Marcar como _no le�do"
 
-#: src/mainwindow.c:628 src/summaryview.c:539
+#: src/mainwindow.c:638
 msgid "Mark as rea_d"
 msgstr "Marcar como _le�do"
 
-#: src/mainwindow.c:629 src/summaryview.c:540
+#: src/mainwindow.c:639
 msgid "Mark all read"
 msgstr "Marcar todos como le�dos"
 
-#: src/mainwindow.c:630 src/prefs_filtering_action.c:184 src/summaryview.c:541
-#: src/toolbar.c:194 src/toolbar.c:401
+#: src/mainwindow.c:640 src/prefs_filtering_action.c:184 src/toolbar.c:194
+#: src/toolbar.c:401
 msgid "Ignore thread"
 msgstr "Ignorar hilo"
 
-#: src/mainwindow.c:631 src/summaryview.c:542
+#: src/mainwindow.c:641
 msgid "Unignore thread"
 msgstr "Dejar de ignorar hilo"
 
-#: src/mainwindow.c:632 src/prefs_filtering_action.c:185 src/summaryview.c:543
-#: src/toolbar.c:195 src/toolbar.c:402
+#: src/mainwindow.c:642 src/prefs_filtering_action.c:185 src/toolbar.c:195
+#: src/toolbar.c:402
 msgid "Watch thread"
 msgstr "Observar hilo"
 
-#: src/mainwindow.c:633 src/summaryview.c:544
+#: src/mainwindow.c:643
 msgid "Unwatch thread"
 msgstr "Dejar de observar hilo"
 
-#: src/mainwindow.c:636 src/prefs_filtering_action.c:172 src/summaryview.c:547
+#: src/mainwindow.c:646 src/prefs_filtering_action.c:172
 msgid "Mark as spam"
 msgstr "Marcar como basura"
 
-#: src/mainwindow.c:637 src/prefs_filtering_action.c:173 src/summaryview.c:548
+#: src/mainwindow.c:647 src/prefs_filtering_action.c:173
 msgid "Mark as ham"
 msgstr "Marcar como bueno"
 
-#: src/mainwindow.c:640 src/prefs_filtering_action.c:168 src/summaryview.c:551
+#: src/mainwindow.c:650 src/prefs_filtering_action.c:168
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/mainwindow.c:641 src/prefs_filtering_action.c:169 src/summaryview.c:552
+#: src/mainwindow.c:651 src/prefs_filtering_action.c:169
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:653
 msgid "Color la_bel"
 msgstr "Etiqueta de co_lor"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:654
 msgid "Ta_gs"
 msgstr "Eti_quetas"
 
-#: src/mainwindow.c:647
+#: src/mainwindow.c:657
 msgid "Re-_edit"
 msgstr "Re_editar"
 
-#: src/mainwindow.c:652 src/messageview.c:276 src/summaryview.c:559
+#: src/mainwindow.c:662 src/messageview.c:276
 msgid "Add sender to address boo_k"
 msgstr "A�adir _remitente a la agenda"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:664
 msgid "C_ollect addresses"
 msgstr "Rec_olectar direcci�nes"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:665
 msgid "from Current _folder..."
 msgstr "de la _carpeta actual..."
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:666
 msgid "from Selected _messages..."
 msgstr "de los _mensajes selecionados..."
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:669
 msgid "_Filter all messages in folder"
 msgstr "_Filtrar todos los mensajes en la carpeta"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:670
 msgid "Filter _selected messages"
 msgstr "_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:671
 msgid "Run folder pr_ocessing rules"
 msgstr "Ejecutar reglas de procesamiento de la carpeta"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:673
 msgid "_Create filter rule"
 msgstr "Crear regla de f_iltrado"
 
-#: src/mainwindow.c:664 src/mainwindow.c:670 src/messageview.c:280
-#: src/messageview.c:286 src/summaryview.c:562 src/summaryview.c:569
+#: src/mainwindow.c:674 src/mainwindow.c:680 src/messageview.c:280
+#: src/messageview.c:286
 msgid "_Automatically"
 msgstr "_Autom�tico"
 
-#: src/mainwindow.c:665 src/mainwindow.c:671 src/messageview.c:281
-#: src/messageview.c:287 src/summaryview.c:563 src/summaryview.c:570
+#: src/mainwindow.c:675 src/mainwindow.c:681 src/messageview.c:281
+#: src/messageview.c:287
 msgid "By _From"
 msgstr "Por el Desde"
 
-#: src/mainwindow.c:666 src/mainwindow.c:672 src/messageview.c:282
-#: src/messageview.c:288 src/summaryview.c:564 src/summaryview.c:571
+#: src/mainwindow.c:676 src/mainwindow.c:682 src/messageview.c:282
+#: src/messageview.c:288
 msgid "By _To"
 msgstr "Por el Para"
 
-#: src/mainwindow.c:667 src/mainwindow.c:673 src/messageview.c:283
-#: src/messageview.c:289 src/summaryview.c:565 src/summaryview.c:572
+#: src/mainwindow.c:677 src/mainwindow.c:683 src/messageview.c:283
+#: src/messageview.c:289
 msgid "By _Subject"
 msgstr "Por el Asunto"
 
-#: src/mainwindow.c:669 src/summaryview.c:568
+#: src/mainwindow.c:679
 msgid "Create processing rule"
 msgstr "Crear regla de procesamiento"
 
-#: src/mainwindow.c:676 src/messageview.c:293
+#: src/mainwindow.c:686 src/messageview.c:293
 msgid "List _URLs..."
 msgstr "Listar _URLs..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:693
 msgid "Ch_eck for new messages in all folders"
 msgstr "Comprobar m_ensajes nuevos en todas las carpetas"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:694
 msgid "Delete du_plicated messages"
 msgstr "Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:695
 msgid "In selected folder"
 msgstr "En la carpeta seleccionada"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:696
 msgid "In all folders"
 msgstr "En todas las carpetas"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:699
 msgid "E_xecute"
 msgstr "E_jecutar"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:702
 msgid "SSL cer_tificates"
 msgstr "Cer_tificados SSL"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:706
 msgid "Filtering Lo_g"
 msgstr "Traza de f_iltrado"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:708
 msgid "Network _Log"
 msgstr "Tra_za de red"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:710
 msgid "_Forget all session passwords"
 msgstr "_Olvidar todas las contrase�as de sesi�n"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:713
 msgid "C_hange current account"
 msgstr "_Cambiar cuenta actual"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:715
 msgid "_Preferences for current account..."
 msgstr "_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:716
 msgid "Create _new account..."
 msgstr "Crear _nueva cuenta..."
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:717
 msgid "_Edit accounts..."
 msgstr "_Editar cuentas..."
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:720
 msgid "P_references..."
 msgstr "P_referencias..."
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:721
 msgid "Pre-pr_ocessing..."
 msgstr "Pre-pr_ocesamiento..."
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:722
 msgid "Post-pro_cessing..."
 msgstr "Post-pro_cesamiento..."
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:723
 msgid "_Filtering..."
 msgstr "_Filtrado..."
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:724
 msgid "_Templates..."
 msgstr "_Plantillas..."
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:725
 msgid "_Actions..."
 msgstr "_Acciones..."
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:726
 msgid "Tag_s..."
 msgstr "Etiqueta_s..."
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:728
 msgid "Plu_gins..."
 msgstr "_M�dulos..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:731
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:732
 msgid "_Online User-contributed FAQ"
 msgstr "P_F de usuarios en l�nea (FAQ)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:733
 msgid "Icon _Legend"
 msgstr "_Leyenda de iconos"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:735
+msgid "Set as default client"
+msgstr "Establecer como cliente por defecto"
+
+#: src/mainwindow.c:742
 msgid "Offline _mode"
 msgstr "_Modo sin conexi�n"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:743
 msgid "_Message view"
 msgstr "Vista de _mensaje"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:745
 msgid "Status _bar"
 msgstr "_Barra de estado"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:747
 msgid "Column headers"
 msgstr "Cabeceras de columna"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:748
 msgid "Th_read view"
 msgstr "_Vista jer�rquica"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:749
 msgid "_Hide read messages"
 msgstr "_Esconder los mensajes le�dos"
 
-#: src/mainwindow.c:737 src/messageview.c:305
+#: src/mainwindow.c:751
+msgid "_Fullscreen"
+msgstr "Pantalla _completa"
+
+#: src/mainwindow.c:753 src/messageview.c:305
 msgid "Show all _headers"
 msgstr "Mostrar todas las ca_beceras"
 
-#: src/mainwindow.c:738 src/messageview.c:306
+#: src/mainwindow.c:754 src/messageview.c:306
 msgid "_Fold all"
 msgstr "_Colapsar todas"
 
-#: src/mainwindow.c:739 src/messageview.c:307
+#: src/mainwindow.c:755 src/messageview.c:307
 msgid "Fold from level _2"
 msgstr "Colapsar desde el nivel _2"
 
-#: src/mainwindow.c:740 src/messageview.c:308
+#: src/mainwindow.c:756 src/messageview.c:308
 msgid "Fold from level _3"
 msgstr "Colapsar desde el nivel _3"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:760
 msgid "Text _below icons"
 msgstr "Texto _bajo los iconos"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:761
 msgid "Text be_side icons"
 msgstr "Texto _junto a los iconos"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:762
 msgid "_Icons only"
 msgstr "S�lo _iconos"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:763
 msgid "_Text only"
 msgstr "S�lo _texto"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:765
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:770
 msgid "_Standard"
 msgstr "_Est�ndar"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:771
 msgid "_Three columns"
 msgstr "_Tres columnas"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:772
 msgid "_Wide message"
 msgstr "Mensaje _ancho"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:773
 msgid "W_ide message list"
 msgstr "L_ista de mensajes ancha"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:774
 msgid "S_mall screen"
 msgstr "_Pantalla peque�a"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:778
 msgid "by _Number"
 msgstr "por _n�mero"
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:779
 msgid "by S_ize"
 msgstr "por _tama�o"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:780
 msgid "by _Date"
 msgstr "por _fecha"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:781
 msgid "by Thread date"
 msgstr "por fecha del hilo"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:782
 msgid "by _From"
 msgstr "por _desde"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:783
 msgid "by _To"
 msgstr "por _para"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:784
 msgid "by S_ubject"
 msgstr "por as_unto"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:785
 msgid "by _Color label"
 msgstr "por _color"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:786
 msgid "by Tag"
 msgstr "por _etiqueta"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:787
 msgid "by _Mark"
 msgstr "por _marca"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:788
 msgid "by _Status"
 msgstr "por _estado"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:789
 msgid "by A_ttachment"
 msgstr "por _adjunto"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:790
 msgid "by Score"
 msgstr "por puntos"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:791
 msgid "by Locked"
 msgstr "por bloqueado"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:792
 msgid "D_on't sort"
 msgstr "N_o ordenar"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:796
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:797
 msgid "Descending"
 msgstr "Descendente"
 
-#: src/mainwindow.c:821 src/messageview.c:348
+#: src/mainwindow.c:837 src/messageview.c:348
 msgid "_Auto detect"
 msgstr "_Auto detectar"
 
-#: src/mainwindow.c:1185 src/summaryview.c:5987
+#: src/mainwindow.c:1232 src/summaryview.c:5859
 msgid "Apply tags..."
 msgstr "Aplicar etiquetas..."
 
-#: src/mainwindow.c:1965
+#: src/mainwindow.c:2019
 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:1979
+#: src/mainwindow.c:2033
 msgid "You are online. Click the icon to go offline"
 msgstr "Esta conectado. Pulse en el icono para desconectarse"
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:2036
 msgid "You are offline. Click the icon to go online"
 msgstr "Esta desconectado. Pulse en el icono para conectarse"
 
-#: src/mainwindow.c:1996
+#: src/mainwindow.c:2050
 msgid "Select account"
 msgstr "Seleccionar cuenta"
 
-#: src/mainwindow.c:2022 src/prefs_logging.c:140
+#: src/mainwindow.c:2076 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Traza del protocolo"
 
-#: src/mainwindow.c:2026
+#: src/mainwindow.c:2080
 msgid "Filtering/processing debug log"
 msgstr "Configuraci�n de filtrado/traza de depuraci�n de procesamiento"
 
-#: src/mainwindow.c:2045 src/prefs_logging.c:392
+#: src/mainwindow.c:2099 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "traza de filtrado activada\n"
 
-#: src/mainwindow.c:2047 src/prefs_logging.c:394
+#: src/mainwindow.c:2101 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "traza de filtrado desactivada\n"
 
-#: src/mainwindow.c:2477 src/mainwindow.c:2484 src/mainwindow.c:2526
-#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
-#: src/plugins/trayicon/trayicon.c:137 src/prefs_folder_item.c:898
+#: src/mainwindow.c:2544 src/mainwindow.c:2551 src/mainwindow.c:2593
+#: src/mainwindow.c:2626 src/mainwindow.c:2658 src/mainwindow.c:2703
+#: src/plugins/trayicon/trayicon.c:132 src/prefs_folder_item.c:916
 msgid "Untitled"
 msgstr "Sin t�tulo"
 
-#: src/mainwindow.c:2637 src/prefs_summary_open.c:113
+#: src/mainwindow.c:2704 src/prefs_summary_open.c:113
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/mainwindow.c:2962 src/mainwindow.c:2966
 msgid "Delete all messages in trash folders?"
 msgstr "�Borrar todos los mensajes de las papeleras?"
 
-#: src/mainwindow.c:2890
+#: src/mainwindow.c:2963
 msgid "Don't quit"
 msgstr "No salir"
 
-#: src/mainwindow.c:2919
+#: src/mainwindow.c:2992
 msgid "Add mailbox"
 msgstr "A�adir buz�n"
 
-#: src/mainwindow.c:2920
+#: src/mainwindow.c:2993
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7143,16 +7117,16 @@ msgstr ""
 "Si especifica un buz�n existente ser�\n"
 "escaneado autom�ticamente."
 
-#: src/mainwindow.c:2926
+#: src/mainwindow.c:2999
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "El buz�n �%s� ya existe."
 
-#: src/mainwindow.c:2931 src/setup.c:51 src/wizard.c:771
+#: src/mainwindow.c:3004 src/setup.c:51 src/wizard.c:771
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:2936 src/setup.c:54
+#: src/mainwindow.c:3009 src/setup.c:54
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7162,119 +7136,136 @@ msgstr ""
 "Quiz�s ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:3289
+#: src/mainwindow.c:3362
 msgid "No posting allowed"
 msgstr "No esta permitido enviar"
 
-#: src/mainwindow.c:3863
+#: src/mainwindow.c:3945
 msgid "Mbox import has failed."
 msgstr "La importaci�n de mbox ha fallado."
 
-#: src/mainwindow.c:3872 src/mainwindow.c:3881
+#: src/mainwindow.c:3954 src/mainwindow.c:3963
 msgid "Export to mbox has failed."
 msgstr "La exportaci�n a mbox ha fallado."
 
-#: src/mainwindow.c:3924 src/plugins/trayicon/trayicon.c:598
+#: src/mainwindow.c:4006 src/plugins/trayicon/trayicon.c:587
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:3924 src/plugins/trayicon/trayicon.c:598
+#: src/mainwindow.c:4006 src/plugins/trayicon/trayicon.c:587
 msgid "Exit Claws Mail?"
 msgstr "�Salir de Claws Mail?"
 
-#: src/mainwindow.c:4099
+#: src/mainwindow.c:4181
 msgid "Folder synchronisation"
 msgstr "Sincronizaci�n de carpeta"
 
-#: src/mainwindow.c:4100
+#: src/mainwindow.c:4182
 msgid "Do you want to synchronise your folders now?"
 msgstr "�Quiere sincronizar sus carpetas ahora?"
 
-#: src/mainwindow.c:4101
+#: src/mainwindow.c:4183
 msgid "+_Synchronise"
 msgstr "+_Sincronizar"
 
-#: src/mainwindow.c:4479
+#: src/mainwindow.c:4576
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/mainwindow.c:4516
+#: src/mainwindow.c:4613
 #, 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:4718 src/summaryview.c:5486
+#: src/mainwindow.c:4815 src/summaryview.c:5354
 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4823
 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar despu�s de las de las carpetas"
 
-#: src/mainwindow.c:4734 src/summaryview.c:5497
+#: src/mainwindow.c:4831 src/summaryview.c:5365
 msgid "Filtering configuration"
 msgstr "Configuraci�n de filtrado"
 
-#: src/mainwindow.c:4989
+#: src/mainwindow.c:4946
+msgid "Can not register as default client: impossible to get executable path."
+msgstr ""
+"No se puede registrar como cliente por defecto: imposible obtener la ruta al"
+" ejecutable."
+
+#: src/mainwindow.c:4999
+msgid "Claws Mail has been registered as default client."
+msgstr "Se har registrado Claws Mail como cliente por defecto."
+
+#: src/mainwindow.c:5001
+msgid ""
+"Can not register as default client: impossible to write to the registry."
+msgstr ""
+"No se puede registrar como cliente por defecto: imposible escribir en el"
+" registro."
+
+#: src/mainwindow.c:5158
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Olvidada %d contrase�a en %d cuentas.\n"
+msgstr[1] "Olvidadas %d contrase�as en %d cuentas.\n"
 
-#: src/matcher.c:498 src/matcher.c:503 src/matcher.c:523 src/matcher.c:528
-#: src/message_search.c:208 src/prefs_matcher.c:696 src/summary_search.c:392
+#: src/matcher.c:499 src/matcher.c:504 src/matcher.c:524 src/matcher.c:529
+#: src/message_search.c:208 src/prefs_matcher.c:700 src/summary_search.c:392
 msgid "Case sensitive"
 msgstr "Sensible a caja"
 
-#: src/matcher.c:498 src/matcher.c:503 src/matcher.c:523 src/matcher.c:528
+#: src/matcher.c:499 src/matcher.c:504 src/matcher.c:524 src/matcher.c:529
 msgid "Case insensitive"
 msgstr "Ignorar caja"
 
-#: src/matcher.c:860 src/matcher.c:871 src/matcher.c:882 src/matcher.c:892
-#: src/matcher.c:893 src/matcher.c:905 src/matcher.c:906 src/matcher.c:1138
-#: src/matcher.c:1150 src/matcher.c:1162
+#: src/matcher.c:861 src/matcher.c:872 src/matcher.c:883 src/matcher.c:893
+#: src/matcher.c:894 src/matcher.c:906 src/matcher.c:907 src/matcher.c:1139
+#: src/matcher.c:1151 src/matcher.c:1163
 #, c-format
 msgid "%s header"
 msgstr "cabecera %s"
 
-#: src/matcher.c:1251 src/matcher.c:1253
+#: src/matcher.c:1253 src/matcher.c:1255
 msgid "header"
 msgstr "cabecera"
 
-#: src/matcher.c:1262
+#: src/matcher.c:1264
 msgid "header line"
 msgstr "l�nea de cabecera"
 
-#: src/matcher.c:1264
+#: src/matcher.c:1266
 msgid "headers line"
 msgstr "l�nea de cabeceras"
 
-#: src/matcher.c:1266 src/matcher.c:1268
+#: src/matcher.c:1268 src/matcher.c:1270
 msgid "message line"
 msgstr "l�nea de mensaje"
 
-#: src/matcher.c:1486 src/matcher.c:1489
+#: src/matcher.c:1488 src/matcher.c:1491
 msgid "body line"
 msgstr "l�nea de cuerpo"
 
-#: src/matcher.c:1665
+#: src/matcher.c:1667
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "comprobando si el  mensaje coincide [ %s ]\n"
 
-#: src/matcher.c:1728 src/matcher.c:1747 src/matcher.c:1760
+#: src/matcher.c:1730 src/matcher.c:1749 src/matcher.c:1762
 msgid "message matches\n"
 msgstr "el mensaje coincide\n"
 
-#: src/matcher.c:1735 src/matcher.c:1753 src/matcher.c:1762
+#: src/matcher.c:1737 src/matcher.c:1755 src/matcher.c:1764
 msgid "message does not match\n"
 msgstr "el mensaje no coincide\n"
 
-#: src/matcher.c:2019 src/matcher.c:2020 src/matcher.c:2021 src/matcher.c:2022
-#: src/matcher.c:2023 src/matcher.c:2024 src/matcher.c:2025 src/matcher.c:2026
+#: src/matcher.c:2021 src/matcher.c:2022 src/matcher.c:2023 src/matcher.c:2024
+#: src/matcher.c:2025 src/matcher.c:2026 src/matcher.c:2027 src/matcher.c:2028
 msgid "(none)"
 msgstr "(ninguna)"
 
@@ -7300,8 +7291,8 @@ msgstr "Sobreescribir fichero mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Este fichero ya existe. �Desea sobreescribir su contenido?"
 
-#: src/mbox.c:544 src/messageview.c:1622 src/mimeview.c:1632
-#: src/prefs_themes.c:550 src/textview.c:2938
+#: src/mbox.c:544 src/messageview.c:1633 src/mimeview.c:1651
+#: src/prefs_themes.c:553 src/textview.c:2950
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
@@ -7350,15 +7341,15 @@ msgstr "B
 msgid "Compose _new message"
 msgstr "Componer un mensaje _nuevo"
 
-#: src/messageview.c:665 src/messageview.c:1220
+#: src/messageview.c:665 src/messageview.c:1231
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista de mensaje"
 
-#: src/messageview.c:789
+#: src/messageview.c:792
 msgid "<No Return-Path found>"
 msgstr "<No se encontr� Return-Path>"
 
-#: src/messageview.c:797
+#: src/messageview.c:800
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7373,11 +7364,11 @@ msgstr ""
 "Direcci�n de retorno: %s\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:804 src/messageview.c:821
+#: src/messageview.c:807 src/messageview.c:824
 msgid "_Don't Send"
 msgstr "_No enviar"
 
-#: src/messageview.c:817
+#: src/messageview.c:820
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7389,41 +7380,41 @@ msgstr ""
 "oficialmente dirigido a usted.\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:1153
+#: src/messageview.c:1157
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Recuperando mensaje (%s)..."
 
-#: src/messageview.c:1189 src/procmime.c:839
+#: src/messageview.c:1193 src/procmime.c:839
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No se puede descifrar: %s"
 
-#: src/messageview.c:1614 src/messageview.c:1617 src/mimeview.c:1783
-#: src/summaryview.c:4750 src/summaryview.c:4753 src/textview.c:2926
+#: src/messageview.c:1625 src/messageview.c:1628 src/mimeview.c:1802
+#: src/summaryview.c:4597 src/summaryview.c:4600 src/textview.c:2938
 msgid "Save as"
 msgstr "Guardar como"
 
-#: src/messageview.c:1623
+#: src/messageview.c:1634
 msgid "Overwrite existing file?"
 msgstr "�Sobreescribir el fichero existente?"
 
-#: src/messageview.c:1631 src/summaryview.c:4770 src/summaryview.c:4773
-#: src/summaryview.c:4788
+#: src/messageview.c:1642 src/summaryview.c:4617 src/summaryview.c:4620
+#: src/summaryview.c:4635
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No se pudo guardar el fichero �%s�."
 
-#: src/messageview.c:1686
+#: src/messageview.c:1697
 #, c-format
 msgid "Show all %s."
 msgstr "Mostrar todo %s."
 
-#: src/messageview.c:1688
+#: src/messageview.c:1699
 msgid "Only the first megabyte of text is shown."
 msgstr "Mostrar s�lo el primer megabyte de texto."
 
-#: src/messageview.c:1719
+#: src/messageview.c:1730
 msgid ""
 "You got a return receipt for this message : it has been displayed by the "
 "recipient."
@@ -7431,19 +7422,19 @@ msgstr ""
 "Recibi� un acuse de recibo en este mensaje: �ste ha sido visualizado por el "
 "destinatario."
 
-#: src/messageview.c:1722
+#: src/messageview.c:1733
 msgid "You asked for a return receipt in this message."
 msgstr "Usted solicit� acuse de recibo en este mensaje."
 
-#: src/messageview.c:1728
+#: src/messageview.c:1739
 msgid "This message asks for a return receipt."
 msgstr "Este mensaje solicita acuse de recibo."
 
-#: src/messageview.c:1729
+#: src/messageview.c:1740
 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 
-#: src/messageview.c:1772
+#: src/messageview.c:1783
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7451,7 +7442,7 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente,\n"
 "y ha sido eliminado del servidor."
 
-#: src/messageview.c:1778
+#: src/messageview.c:1789
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7460,15 +7451,15 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s."
 
-#: src/messageview.c:1782 src/messageview.c:1804
+#: src/messageview.c:1793 src/messageview.c:1815
 msgid "Mark for download"
 msgstr "Marcar para descargar"
 
-#: src/messageview.c:1783 src/messageview.c:1795
+#: src/messageview.c:1794 src/messageview.c:1806
 msgid "Mark for deletion"
 msgstr "Marcar para eliminar"
 
-#: src/messageview.c:1788
+#: src/messageview.c:1799
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7478,12 +7469,12 @@ msgstr ""
 "es de %s y ser� descargado."
 
 # RML To be consistent with previous one.
-#: src/messageview.c:1793 src/messageview.c:1806
+#: src/messageview.c:1804 src/messageview.c:1817
 #: src/prefs_filtering_action.c:167
 msgid "Unmark"
 msgstr "Desmarca"
 
-#: src/messageview.c:1799
+#: src/messageview.c:1810
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7492,11 +7483,11 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y ser� eliminado."
 
-#: src/messageview.c:1872
+#: src/messageview.c:1883
 msgid "Return Receipt Notification"
 msgstr "Notificaci�n de acuse de recibo"
 
-#: src/messageview.c:1873
+#: src/messageview.c:1884
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
@@ -7506,38 +7497,38 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificaci�n de "
 "acuse de recibo:"
 
-#: src/messageview.c:1877
+#: src/messageview.c:1888
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/messageview.c:1877
+#: src/messageview.c:1888
 msgid "_Send Notification"
 msgstr "_Enviar notificaci�n"
 
-#: src/messageview.c:1947
+#: src/messageview.c:1958
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No se puede imprimir: el mensaje no contiene texto."
 
-#: src/messageview.c:2035 src/summaryview.c:4821
+#: src/messageview.c:2046 src/summaryview.c:4668
 #, c-format
 msgid ""
-"Enter the print command line:\n"
+"Enter the print command-line:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
 "Teclee la orden para imprimir:\n"
 "(�%s� ser� sustituido por el fichero)"
 
-#: src/messageview.c:2041 src/summaryview.c:4827
+#: src/messageview.c:2052 src/summaryview.c:4674
 #, c-format
 msgid ""
-"Print command line is invalid:\n"
+"Print command-line is invalid:\n"
 "'%s'"
 msgstr ""
 "La orden para imprimir no es v�lida:\n"
 "�%s�"
 
-#: src/messageview.c:2712 src/messageview.c:2718 src/summaryview.c:4142
-#: src/summaryview.c:6736
+#: src/messageview.c:2723 src/messageview.c:2729 src/summaryview.c:3989
+#: src/summaryview.c:6609
 msgid "An error happened while learning.\n"
 msgstr "Ocurri� un error mientras se aprend�a.\n"
 
@@ -7571,101 +7562,121 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Eliminar buz�n"
 
-#: src/mimeview.c:191
+#: src/mimeview.c:195
 msgid "_Open (l)"
 msgstr "_Abrir (l)"
 
-#: src/mimeview.c:193
+#: src/mimeview.c:197
 msgid "Open _with (o)..."
 msgstr "Abrir _con (o)..."
 
-#: src/mimeview.c:195
+#: src/mimeview.c:199
 msgid "_Display as text (t)"
 msgstr "_Ver como texto (t)"
 
-#: src/mimeview.c:196
+#: src/mimeview.c:200
 msgid "_Save as (y)..."
 msgstr "_Guardar como (y)..."
 
-#: src/mimeview.c:197
+#: src/mimeview.c:201
 msgid "Save _all..."
 msgstr "Gu_ardar todo..."
 
-#: src/mimeview.c:198
+#: src/mimeview.c:202
 msgid "Next part (a)"
 msgstr "Parte siguiente (a)"
 
-#: src/mimeview.c:266
+#: src/mimeview.c:270
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:858
+#: src/mimeview.c:873
 msgid "Check signature"
 msgstr "Verificar firma"
 
-#: src/mimeview.c:863 src/mimeview.c:868 src/mimeview.c:873 src/mimeview.c:878
+#: src/mimeview.c:878 src/mimeview.c:883 src/mimeview.c:888 src/mimeview.c:893
 msgid "View full information"
 msgstr "Ver la informaci�n completa"
 
-#: src/mimeview.c:883 src/mimeview.c:887
+#: src/mimeview.c:898 src/mimeview.c:902
 msgid "Check again"
 msgstr "Verificar de nuevo"
 
-#: src/mimeview.c:896
+#: src/mimeview.c:911
 msgid "Click the icon or hit 'C' to check it."
 msgstr "Pulse en el icono o la tecla �C� para comprobarla."
 
-#: src/mimeview.c:901
+#: src/mimeview.c:916
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Expir� el tiempo comprobando la firma. Pulse en el icono o la tecla �C� para "
 "reintentar."
 
-#: src/mimeview.c:1109
+#: src/mimeview.c:1124
 msgid "Checking signature..."
 msgstr "Verificando firma..."
 
-#: src/mimeview.c:1151
+#: src/mimeview.c:1166
 msgid "Go back to email"
 msgstr "Volver al correo"
 
-#: src/mimeview.c:1554 src/mimeview.c:1640 src/mimeview.c:1830
-#: src/mimeview.c:1872
+#: src/mimeview.c:1573 src/mimeview.c:1659 src/mimeview.c:1849
+#: src/mimeview.c:1892
 #, 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:1629 src/textview.c:2936
+#: src/mimeview.c:1648 src/textview.c:2948
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "�Sobreescribir el fichero existente �%s�?"
 
-#: src/mimeview.c:1670
+#: src/mimeview.c:1689
 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destino"
 
-#: src/mimeview.c:1677
+#: src/mimeview.c:1696
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "�%s� no es un directorio."
 
-#: src/mimeview.c:1904
+#: src/mimeview.c:1924
 msgid "No registered viewer for this file type."
 msgstr "No hay visor registrado para este tipo de ficheros."
 
-#: src/mimeview.c:1936 src/mimeview.c:1943 src/textview.c:2867
+#: src/mimeview.c:1956 src/mimeview.c:1963 src/textview.c:2879
 msgid "Open with"
 msgstr "Abrir con"
 
-#: src/mimeview.c:1937 src/mimeview.c:1944 src/textview.c:2868
+#: src/mimeview.c:1957 src/mimeview.c:1964 src/textview.c:2880
 #, c-format
 msgid ""
-"Enter the command line to open file:\n"
+"Enter the command-line to open file:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
 "Teclee la orden para abrir el fichero:\n"
 "(�%s� ser� sustituido por el fichero)"
 
+#: src/mimeview.c:2019
+msgid "Execute untrusted binary?"
+msgstr "�Ejecutar binario no fiable?"
+
+#: src/mimeview.c:2020
+msgid ""
+"This attachment is an executable file. Executing untrusted binaries is "
+"dangerous and could probably lead to compromission of your computer.\n"
+"\n"
+"Do you want to run this file?"
+msgstr ""
+"Este adjunto es un fichero ejecutable. Ejecutar binarios no fiables es "
+"peligroso y probablemente podria comprometer la seguridad de su ordenador.\n"
+"\n"
+"�Desea ejecutar este fichero?"
+
+#: src/mimeview.c:2024
+msgid "Run binary"
+msgstr "Ejecutar binario"
+
 #: src/news.c:297
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
@@ -7692,44 +7703,44 @@ msgstr ""
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "la conexi�n NNTP con %s:%d se ha desconectado. Reconectando...\n"
 
-#: src/news.c:777
+#: src/news.c:778
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "no se pudo seleccionar el grupo: %s\n"
 
-#: src/news.c:976
+#: src/news.c:980
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "no se pudo establecer el grupo: %s\n"
 
-#: src/news.c:985
+#: src/news.c:989
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de art�culos inv�lido: %d - %d\n"
 
-#: src/news.c:1036
+#: src/news.c:1040
 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "obteniendo xover %d en %s...\n"
 
-#: src/news.c:1042 src/news.c:1121
+#: src/news.c:1046 src/news.c:1125
 msgid "couldn't get xover\n"
 msgstr "no se pudo obtener xover\n"
 
-#: src/news.c:1054 src/news.c:1135
+#: src/news.c:1058 src/news.c:1140
 msgid "invalid xover line\n"
 msgstr "l�nea xover inv�lida\n"
 
-#: src/news.c:1071 src/news.c:1086
+#: src/news.c:1075 src/news.c:1090
 msgid "couldn't get xhdr\n"
 msgstr "no se pudo obtener xhdr\n"
 
-#: src/news.c:1113
+#: src/news.c:1117
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: src/news.c:1281
+#: src/news.c:1287
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -7951,7 +7962,7 @@ msgstr ""
 #: src/plugins/dillo_viewer/dillo_prefs.c:200
 #: src/plugins/spamassassin/spamassassin_gtk.c:445
 #: src/prefs_filtering_action.c:533 src/prefs_filtering_action.c:539
-#: src/prefs_matcher.c:640
+#: src/prefs_matcher.c:644
 msgid "Select ..."
 msgstr "Seleccionar ..."
 
@@ -8122,7 +8133,7 @@ msgstr ""
 "Esta clave no esta en su anillo de claves. �Desea que Claws Mail intente "
 "importarla desde un servidor de claves?"
 
-#: src/plugins/pgpcore/pgp_viewer.c:128 src/plugins/pgpcore/pgp_viewer.c:195
+#: src/plugins/pgpcore/pgp_viewer.c:128 src/plugins/pgpcore/pgp_viewer.c:200
 msgid ""
 "\n"
 "  Key ID "
@@ -8130,7 +8141,7 @@ msgstr ""
 "\n"
 "  ID de clave "
 
-#: src/plugins/pgpcore/pgp_viewer.c:131 src/plugins/pgpcore/pgp_viewer.c:188
+#: src/plugins/pgpcore/pgp_viewer.c:131 src/plugins/pgpcore/pgp_viewer.c:193
 msgid "   This key is not in your keyring.\n"
 msgstr "   Esta clave no esta en su anillo de claves.\n"
 
@@ -8164,15 +8175,19 @@ msgstr ""
 "\n"
 "  Importando el ID de clave "
 
-#: src/plugins/pgpcore/pgp_viewer.c:181
+#: src/plugins/pgpcore/pgp_viewer.c:185
 msgid "   This key has been imported to your keyring.\n"
 msgstr "   Se ha importado esta clave en su anillo de claves.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:183
+#: src/plugins/pgpcore/pgp_viewer.c:187
 msgid "   This key couldn't be imported to your keyring.\n"
 msgstr "   No se pudo importar la clave en su anillo de claves.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:188
+msgid "   Key servers are sometimes slow.\n"
+msgstr "   Los servidores de claves son a veces lentos.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:189
 msgid ""
 "   You can try to import it manually with the command:\n"
 "\n"
@@ -8182,11 +8197,11 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:189
+#: src/plugins/pgpcore/pgp_viewer.c:194
 msgid "   Key import isn't implemented in Windows.\n"
 msgstr "   La importaci�n de claves no est� implementada en Windows.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:198
+#: src/plugins/pgpcore/pgp_viewer.c:203
 msgid "   This key is in your keyring.\n"
 msgstr "   Esta clave est� en su anillo de claves.\n"
 
@@ -8294,40 +8309,56 @@ msgstr "No hay coincidencia exacta para 
 msgid "Collecting info for '%s' ... %c"
 msgstr "Recogiendo informaci�n para �%s� ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:367
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:143
+msgid "Undefined"
+msgstr "Indefinida"
+
+#: src/plugins/pgpcore/select-keys.c:242 src/plugins/pgpcore/sgpgme.c:145
+#: src/prefs_receive.c:196 src/prefs_summaries.c:462
+msgid "Never"
+msgstr "Nunca"
+
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:147
+msgid "Marginal"
+msgstr "Marginal"
+
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:151
+msgid "Ultimate"
+msgstr "Absoluta"
+
+#: src/plugins/pgpcore/select-keys.c:368
 msgid "Select Keys"
-msgstr "Seleccione teclas"
+msgstr "Seleccione claves"
 
-#: src/plugins/pgpcore/select-keys.c:394
+#: src/plugins/pgpcore/select-keys.c:395
 msgid "Key ID"
-msgstr "ID tecla"
+msgstr "ID de clave"
 
-#: src/plugins/pgpcore/select-keys.c:397
-msgid "Val"
-msgstr "Val"
+#: src/plugins/pgpcore/select-keys.c:398
+msgid "Trust"
+msgstr "Confianza"
 
-#: src/plugins/pgpcore/select-keys.c:418
-msgid "Select"
-msgstr "Seleccionar"
+#: src/plugins/pgpcore/select-keys.c:422
+msgid "_Select"
+msgstr "_Seleccionar"
 
-#: src/plugins/pgpcore/select-keys.c:419 src/prefs_logging.c:427
-#: src/prefs_msg_colors.c:145 src/prefs_other.c:709
-msgid "Other"
-msgstr "Otras"
+#: src/plugins/pgpcore/select-keys.c:423
+msgid "_Other"
+msgstr "_Otras"
 
-#: src/plugins/pgpcore/select-keys.c:420
-msgid "Don't encrypt"
-msgstr "No cifrar"
+#: src/plugins/pgpcore/select-keys.c:424
+msgid "Do_n't encrypt"
+msgstr "_No cifrar"
 
-#: src/plugins/pgpcore/select-keys.c:562
+#: src/plugins/pgpcore/select-keys.c:566
 msgid "Add key"
 msgstr "A�adir clave"
 
-#: src/plugins/pgpcore/select-keys.c:563
+#: src/plugins/pgpcore/select-keys.c:567
 msgid "Enter another user or key ID:"
 msgstr "Teclee otro usuario o ID-clave:"
 
-#: src/plugins/pgpcore/select-keys.c:585
+#: src/plugins/pgpcore/select-keys.c:589
 #, c-format
 msgid ""
 "The key of '%s' is not fully trusted.\n"
@@ -8340,154 +8371,137 @@ msgstr ""
 "si llegar� a la persona a la que lo quiere enviar.\n"
 "�Es suficientemente fiable para usarla de todas maneras?"
 
-#: src/plugins/pgpcore/select-keys.c:590
+#: src/plugins/pgpcore/select-keys.c:594
 msgid "Trust key"
 msgstr "Confiar en la clave"
 
-#: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:233 src/privacy.c:237
+#: src/plugins/pgpcore/sgpgme.c:79 src/privacy.c:233 src/privacy.c:237
 #: src/privacy.c:254 src/privacy.c:258
 msgid "No signature found"
 msgstr "No se encontr� firma"
 
-#: src/plugins/pgpcore/sgpgme.c:144
-msgid "Undefined"
-msgstr "Indefinida"
-
-#: src/plugins/pgpcore/sgpgme.c:146 src/prefs_receive.c:196
-#: src/prefs_summaries.c:462
-msgid "Never"
-msgstr "Nunca"
-
-#: src/plugins/pgpcore/sgpgme.c:148
-msgid "Marginal"
-msgstr "Marginal"
-
-#: src/plugins/pgpcore/sgpgme.c:152
-msgid "Ultimate"
-msgstr "Absoluta"
-
-#: src/plugins/pgpcore/sgpgme.c:186
+#: src/plugins/pgpcore/sgpgme.c:185 src/plugins/pgpcore/sgpgme.c:204
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "La firma no se puede comprobar - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:190 src/plugins/pgpcore/sgpgme.c:194
-#: src/plugins/pgpcore/sgpgme.c:241
+#: src/plugins/pgpcore/sgpgme.c:189 src/plugins/pgpcore/sgpgme.c:193
+#: src/plugins/pgpcore/sgpgme.c:243
 msgid "The signature has not been checked."
 msgstr "La firma no ha sido comprobada."
 
-#: src/plugins/pgpcore/sgpgme.c:200 src/plugins/pgpcore/sgpgme.c:202
+#: src/plugins/pgpcore/sgpgme.c:199 src/plugins/pgpcore/sgpgme.c:201
 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:215
+#: src/plugins/pgpcore/sgpgme.c:217
 #, c-format
 msgid "Good signature from %s."
 msgstr "Firma v�lida de %s."
 
-#: src/plugins/pgpcore/sgpgme.c:221
+#: src/plugins/pgpcore/sgpgme.c:223
 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Firma v�lida (no fiable) de %s."
 
-#: src/plugins/pgpcore/sgpgme.c:226
+#: src/plugins/pgpcore/sgpgme.c:228
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Firma caducada de %s."
 
-#: src/plugins/pgpcore/sgpgme.c:229
+#: src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Expired key from %s."
 msgstr "Firma caducada de %s."
 
-#: src/plugins/pgpcore/sgpgme.c:232
+#: src/plugins/pgpcore/sgpgme.c:234
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Firma inv�lida de %s."
 
-#: src/plugins/pgpcore/sgpgme.c:236
+#: src/plugins/pgpcore/sgpgme.c:238
 #, 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:269
+#: src/plugins/pgpcore/sgpgme.c:271
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Error verificando la firma digital: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:285
+#: src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Firma digital realizada usando %s ID de clave %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:292
+#: src/plugins/pgpcore/sgpgme.c:294
 #, c-format
-msgid "Good signature from \"%s\" (Trust: %s)\n"
-msgstr "Firma v�lida de �%s� (Confianza: %s)\n"
+msgid "Good signature from uid \"%s\" (Validity: %s)\n"
+msgstr "Firma v�lida del UID �%s� (Validez: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:297
+#: src/plugins/pgpcore/sgpgme.c:299
 #, c-format
-msgid "Expired signature from \"%s\"\n"
-msgstr "Firma caducada de �%s�\n"
+msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
+msgstr "Firma caducada del UID �%s� (Validez: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:304
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Firma INV�LIDA de �%s�\n"
 
-#: src/plugins/pgpcore/sgpgme.c:313
+#: src/plugins/pgpcore/sgpgme.c:315
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "               alias �%s�\n"
+msgid "                    uid \"%s\" (Validity: %s)\n"
+msgstr "               UID �%s� (Validez: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:319
+#: src/plugins/pgpcore/sgpgme.c:322
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Huella de clave primaria: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:324
+#: src/plugins/pgpcore/sgpgme.c:327
 #, 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:330
+#: src/plugins/pgpcore/sgpgme.c:333
 #, 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:372
+#: src/plugins/pgpcore/sgpgme.c:375
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "No se puede obtener datos del mensaje, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:388
+#: src/plugins/pgpcore/sgpgme.c:391
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "No se puede inicializar datos, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:507
+#: src/plugins/pgpcore/sgpgme.c:528
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Clave secreta no encontrada (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:515
+#: src/plugins/pgpcore/sgpgme.c:550
 msgid "Secret key specification is ambiguous"
 msgstr "La especificaci�n de clave secreta es ambigua"
 
-#: src/plugins/pgpcore/sgpgme.c:525
+#: src/plugins/pgpcore/sgpgme.c:562
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Error estableciendo clave secreta: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:563
+#: src/plugins/pgpcore/sgpgme.c:600
 #, 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:569
+#: src/plugins/pgpcore/sgpgme.c:606
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -8496,12 +8510,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:577
+#: src/plugins/pgpcore/sgpgme.c:614
 #, 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:593
+#: src/plugins/pgpcore/sgpgme.c:630
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -8509,7 +8523,7 @@ msgstr ""
 "GnuPG no esta adecuadamente instalado o necesita actualizarse.\n"
 "Soporte de OpenPGP deshabilitado."
 
-#: src/plugins/pgpcore/sgpgme.c:627
+#: src/plugins/pgpcore/sgpgme.c:664
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -8517,11 +8531,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:632
+#: src/plugins/pgpcore/sgpgme.c:669
 msgid "No PGP key found"
 msgstr "No se encontr� ninguna clave PGP"
 
-#: src/plugins/pgpcore/sgpgme.c:633
+#: src/plugins/pgpcore/sgpgme.c:670
 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"
@@ -8531,12 +8545,12 @@ msgstr ""
 "capaz de firmar correos o recibir correos cifrados.\n"
 "�Quiere crear un nuevo par de claves ahora?"
 
-#: src/plugins/pgpcore/sgpgme.c:703 src/plugins/pgpcore/sgpgme.c:719
+#: src/plugins/pgpcore/sgpgme.c:740 src/plugins/pgpcore/sgpgme.c:756
 #, 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:710
+#: src/plugins/pgpcore/sgpgme.c:747
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -8544,11 +8558,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:725
+#: src/plugins/pgpcore/sgpgme.c:762
 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:729
+#: src/plugins/pgpcore/sgpgme.c:766
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -8561,40 +8575,40 @@ msgstr ""
 "\n"
 "�Desea exportarla a un servidor de claves?"
 
-#: src/plugins/pgpcore/sgpgme.c:733
+#: src/plugins/pgpcore/sgpgme.c:770
 msgid "Key generated"
 msgstr "Clave generada"
 
-#: src/plugins/pgpcore/sgpgme.c:772
+#: src/plugins/pgpcore/sgpgme.c:809
 msgid "Key exported."
 msgstr "Clave exportada."
 
-#: src/plugins/pgpcore/sgpgme.c:774
+#: src/plugins/pgpcore/sgpgme.c:811
 msgid "Couldn't export key."
 msgstr "No se pudo exportar la clave."
 
-#: src/plugins/pgpcore/sgpgme.c:778
+#: src/plugins/pgpcore/sgpgme.c:815
 msgid "Key export isn't implemented in Windows."
 msgstr "La exportaci�n de claves no est� implementada en Windows."
 
-#: src/plugins/pgpinline/pgpinline.c:244
+#: src/plugins/pgpinline/pgpinline.c:241
 msgid "Incorrect part"
 msgstr "Parte incorrecta"
 
-#: src/plugins/pgpinline/pgpinline.c:248
+#: src/plugins/pgpinline/pgpinline.c:245
 msgid "Not a text part"
 msgstr "No es una parte de texto"
 
-#: src/plugins/pgpinline/pgpinline.c:259 src/plugins/pgpinline/pgpinline.c:415
+#: src/plugins/pgpinline/pgpinline.c:256 src/plugins/pgpinline/pgpinline.c:412
 msgid "Couldn't get text data."
 msgstr "No se puede obtener el texto."
 
-#: src/plugins/pgpinline/pgpinline.c:277
+#: src/plugins/pgpinline/pgpinline.c:274
 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:285 src/plugins/pgpinline/pgpinline.c:613
-#: src/plugins/pgpinline/pgpinline.c:752 src/plugins/pgpinline/pgpinline.c:799
+#: src/plugins/pgpinline/pgpinline.c:282 src/plugins/pgpinline/pgpinline.c:610
+#: src/plugins/pgpinline/pgpinline.c:749 src/plugins/pgpinline/pgpinline.c:796
 #: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:493
 #: src/plugins/pgpmime/pgpmime.c:636 src/plugins/smime/smime.c:402
@@ -8602,25 +8616,25 @@ msgstr "No se puede convertir el texto a un conjunto de caracteres v
 msgid "Couldn't initialize GPG context, %s"
 msgstr "No se pudo inicializar el contexto GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpinline/pgpinline.c:405
 msgid "Couldn't parse mime part."
 msgstr "No se puede procesar la parte mime."
 
-#: src/plugins/pgpinline/pgpinline.c:438 src/plugins/pgpmime/pgpmime.c:343
+#: src/plugins/pgpinline/pgpinline.c:435 src/plugins/pgpmime/pgpmime.c:343
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "No se puede abrir el fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:455 src/plugins/pgpinline/pgpinline.c:467
-#: src/plugins/pgpinline/pgpinline.c:479 src/plugins/pgpinline/pgpinline.c:489
-#: src/plugins/pgpinline/pgpinline.c:501 src/plugins/pgpinline/pgpinline.c:513
+#: src/plugins/pgpinline/pgpinline.c:452 src/plugins/pgpinline/pgpinline.c:464
+#: src/plugins/pgpinline/pgpinline.c:476 src/plugins/pgpinline/pgpinline.c:486
+#: src/plugins/pgpinline/pgpinline.c:498 src/plugins/pgpinline/pgpinline.c:510
 #: src/plugins/pgpmime/pgpmime.c:353 src/plugins/pgpmime/pgpmime.c:365
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "No se puede escribir al fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:475 src/plugins/pgpinline/pgpinline.c:476
-#: src/plugins/pgpinline/pgpinline.c:477
+#: src/plugins/pgpinline/pgpinline.c:472 src/plugins/pgpinline/pgpinline.c:473
+#: src/plugins/pgpinline/pgpinline.c:474
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -8628,47 +8642,47 @@ msgstr ""
 "\n"
 "--- Inicio de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:497 src/plugins/pgpinline/pgpinline.c:498
-#: src/plugins/pgpinline/pgpinline.c:499
+#: src/plugins/pgpinline/pgpinline.c:494 src/plugins/pgpinline/pgpinline.c:495
+#: src/plugins/pgpinline/pgpinline.c:496
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Fin de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:524 src/plugins/pgpmime/pgpmime.c:375
+#: src/plugins/pgpinline/pgpinline.c:521 src/plugins/pgpmime/pgpmime.c:375
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "No se puede cerrar el fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:536
+#: src/plugins/pgpinline/pgpinline.c:533
 msgid "Couldn't scan decrypted file."
 msgstr "No se puede escanear el fichero descifrado."
 
-#: src/plugins/pgpinline/pgpinline.c:544
+#: src/plugins/pgpinline/pgpinline.c:541
 msgid "Couldn't scan decrypted file parts."
 msgstr "No se pueden escanear las partes del fichero descifrado ."
 
-#: src/plugins/pgpinline/pgpinline.c:598
+#: src/plugins/pgpinline/pgpinline.c:595
 msgid "Couldn't create temporary file."
 msgstr "No se puede crear el fichero temporal."
 
-#: src/plugins/pgpinline/pgpinline.c:637 src/plugins/pgpmime/pgpmime.c:520
+#: src/plugins/pgpinline/pgpinline.c:634 src/plugins/pgpmime/pgpmime.c:520
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Fall� la firma de los datos, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:655 src/plugins/pgpmime/pgpmime.c:545
+#: src/plugins/pgpinline/pgpinline.c:652 src/plugins/pgpmime/pgpmime.c:545
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "La firma de los datos fall�o debido a un firmante inv�lido: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:664 src/plugins/pgpmime/pgpmime.c:554
+#: src/plugins/pgpinline/pgpinline.c:661 src/plugins/pgpmime/pgpmime.c:554
 msgid "Data signing failed, no results."
 msgstr "Fall� la firma de los datos, no hay resultados."
 
-#: src/plugins/pgpinline/pgpinline.c:674 src/plugins/pgpmime/pgpmime.c:565
+#: src/plugins/pgpinline/pgpinline.c:671 src/plugins/pgpmime/pgpmime.c:565
 msgid "Data signing failed, no contents."
 msgstr "Fall� la firma de los datos, no hay contenido."
 
-#: src/plugins/pgpinline/pgpinline.c:718
+#: src/plugins/pgpinline/pgpinline.c:715
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -8676,22 +8690,22 @@ 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:761 src/plugins/pgpmime/pgpmime.c:645
+#: src/plugins/pgpinline/pgpinline.c:758 src/plugins/pgpmime/pgpmime.c:645
 #, 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:782 src/plugins/pgpmime/pgpmime.c:673
+#: src/plugins/pgpinline/pgpinline.c:779 src/plugins/pgpmime/pgpmime.c:673
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "No se puede crear el fichero temporal, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:810 src/plugins/pgpmime/pgpmime.c:698
+#: src/plugins/pgpinline/pgpinline.c:807 src/plugins/pgpmime/pgpmime.c:698
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Fall� el cifrado, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:877
+#: src/plugins/pgpinline/pgpinline.c:874
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -8977,7 +8991,7 @@ msgstr ""
 "Tiempo m�ximo permitido para la comprobaci�n. Si la comprobaci�n lleva m�s "
 "tiempo ser� cancelada."
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_other.c:580
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_other.c:523
 #: src/prefs_summaries.c:496
 msgid "seconds"
 msgstr "segundos"
@@ -8990,61 +9004,61 @@ msgstr "Orientaci
 msgid "The orientation of the tray."
 msgstr "La orientaci�n de la bandeja"
 
-#: src/plugins/trayicon/trayicon.c:52 src/plugins/trayicon/trayicon.c:621
+#: src/plugins/trayicon/trayicon.c:52 src/plugins/trayicon/trayicon.c:610
 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Trayicon"
 msgstr "Icono en bandeja"
 
-#: src/plugins/trayicon/trayicon.c:105
+#: src/plugins/trayicon/trayicon.c:100
 msgid "_Get Mail"
 msgstr "_Recibir correo"
 
-#: src/plugins/trayicon/trayicon.c:107
+#: src/plugins/trayicon/trayicon.c:102
 msgid "_Email"
 msgstr "_Correo"
 
-#: src/plugins/trayicon/trayicon.c:108
+#: src/plugins/trayicon/trayicon.c:103
 msgid "E_mail from account"
 msgstr "C_orreo desde la cuenta"
 
-#: src/plugins/trayicon/trayicon.c:109
+#: src/plugins/trayicon/trayicon.c:104
 msgid "Open A_ddressbook"
 msgstr "_Agenda de direcciones"
 
-#: src/plugins/trayicon/trayicon.c:110
+#: src/plugins/trayicon/trayicon.c:105
 msgid "E_xit Claws Mail"
 msgstr "_Salir de Claws Mail"
 
-#: src/plugins/trayicon/trayicon.c:115
+#: src/plugins/trayicon/trayicon.c:110
 msgid "_Work Offline"
 msgstr "_Trabajar sin conexi�n"
 
-#: src/plugins/trayicon/trayicon.c:203
+#: src/plugins/trayicon/trayicon.c:192
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nuevo: %d, no le�do: %d, total: %d"
 
-#: src/plugins/trayicon/trayicon.c:448
+#: src/plugins/trayicon/trayicon.c:437
 msgid "Failed to register offline switch hook"
 msgstr "Fall� el registro del enlace de cambio a modo sin conexi�n"
 
-#: src/plugins/trayicon/trayicon.c:454
+#: src/plugins/trayicon/trayicon.c:443
 msgid "Failed to register account list changed hook"
 msgstr "Fall� el registro del enlace de lista de cuentas cambiadas"
 
-#: src/plugins/trayicon/trayicon.c:460
+#: src/plugins/trayicon/trayicon.c:449
 msgid "Failed to register close hook"
 msgstr "Fall� el registro del enlace de cierre"
 
-#: src/plugins/trayicon/trayicon.c:466
+#: src/plugins/trayicon/trayicon.c:455
 msgid "Failed to register got iconified hook"
 msgstr "Fall� el registro del enlace del estado de iconizaci�n"
 
-#: src/plugins/trayicon/trayicon.c:472
+#: src/plugins/trayicon/trayicon.c:461
 msgid "Failed to register theme change hook"
 msgstr "Fall� el registro del enlace de cambio de tema"
 
-#: src/plugins/trayicon/trayicon.c:539
+#: src/plugins/trayicon/trayicon.c:528
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
@@ -9271,8 +9285,8 @@ msgstr "Eliminar despu
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 d�as y 0 horas: borrar inmediatamente"
 
-#: src/prefs_account.c:1432 src/prefs_folder_item.c:509
-#: src/prefs_matcher.c:314
+#: src/prefs_account.c:1432 src/prefs_folder_item.c:517
+#: src/prefs_matcher.c:316
 msgid "days"
 msgstr "d�as"
 
@@ -9348,7 +9362,7 @@ 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:1666 src/prefs_customheader.c:206
-#: src/prefs_matcher.c:592 src/prefs_matcher.c:1813 src/prefs_matcher.c:1834
+#: src/prefs_matcher.c:596 src/prefs_matcher.c:1833 src/prefs_matcher.c:1854
 msgid "Header"
 msgstr "Cabecera"
 
@@ -9412,30 +9426,30 @@ msgstr "Establecer las siguientes direcciones autom
 msgid "Spell check dictionaries"
 msgstr "Diccionarios de correci�n ortogr�fica"
 
-#: src/prefs_account.c:2005 src/prefs_folder_item.c:925
+#: src/prefs_account.c:2005 src/prefs_folder_item.c:943
 #: src/prefs_spelling.c:160
 msgid "Default dictionary"
 msgstr "Diccionario por omisi�n"
 
-#: src/prefs_account.c:2018 src/prefs_folder_item.c:959
+#: src/prefs_account.c:2018 src/prefs_folder_item.c:977
 #: src/prefs_spelling.c:173
 msgid "Default alternate dictionary"
 msgstr "Diccionario alternativo predeterminado"
 
 #: src/prefs_account.c:2104 src/prefs_account.c:3158
-#: src/prefs_compose_writing.c:343 src/prefs_folder_item.c:1218
-#: src/prefs_folder_item.c:1590 src/prefs_quote.c:118 src/prefs_quote.c:239
+#: src/prefs_compose_writing.c:343 src/prefs_folder_item.c:1236
+#: src/prefs_folder_item.c:1609 src/prefs_quote.c:118 src/prefs_quote.c:239
 #: src/prefs_spelling.c:325 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Componer"
 
-#: src/prefs_account.c:2119 src/prefs_folder_item.c:1239 src/prefs_quote.c:133
+#: src/prefs_account.c:2119 src/prefs_folder_item.c:1257 src/prefs_quote.c:133
 #: src/toolbar.c:391
 msgid "Reply"
 msgstr "Responder"
 
 #: src/prefs_account.c:2134 src/prefs_filtering_action.c:176
-#: src/prefs_folder_item.c:1260 src/prefs_quote.c:148 src/toolbar.c:395
+#: src/prefs_folder_item.c:1278 src/prefs_quote.c:148 src/toolbar.c:395
 msgid "Forward"
 msgstr "Reenviar"
 
@@ -9627,7 +9641,7 @@ msgstr "no se especific
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account.c:3176 src/prefs_folder_item.c:1607 src/prefs_quote.c:240
+#: src/prefs_account.c:3176 src/prefs_folder_item.c:1626 src/prefs_quote.c:240
 msgid "Templates"
 msgstr "Plantillas"
 
@@ -9648,19 +9662,19 @@ msgstr "Preferencias para una nueva cuenta"
 msgid "%s - Account preferences"
 msgstr "%s - Preferencias de la cuenta"
 
-#: src/prefs_account.c:3681
+#: src/prefs_account.c:3680
 msgid "Select signature file"
 msgstr "Seleccionar fichero de firma"
 
-#: src/prefs_account.c:3699 src/prefs_account.c:3716 src/wizard.c:1222
+#: src/prefs_account.c:3698 src/prefs_account.c:3715 src/wizard.c:1222
 msgid "Select certificate file"
 msgstr "Seleccionar fichero del certificado"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:3811
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:3951
+#: src/prefs_account.c:3950
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (m�dulo no cargado)"
@@ -9694,7 +9708,7 @@ 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:328 src/prefs_filtering_action.c:572
-#: src/prefs_filtering.c:472 src/prefs_matcher.c:729 src/prefs_template.c:306
+#: src/prefs_filtering.c:471 src/prefs_matcher.c:735 src/prefs_template.c:306
 #: src/prefs_toolbar.c:909
 msgid "Replace"
 msgstr "Reemplazar"
@@ -9707,12 +9721,12 @@ msgstr "Sustituir la acci
 msgid "Delete the selected action from the list"
 msgstr "Borrar la acci�n seleccionada de la lista"
 
-#: src/prefs_actions.c:350 src/prefs_filtering.c:495 src/prefs_template.c:329
+#: src/prefs_actions.c:350 src/prefs_filtering.c:494 src/prefs_template.c:329
 msgid "Clear all the input fields in the dialog"
 msgstr "Limpiar todos los campos de entrada en el di�logo"
 
 #: src/prefs_actions.c:355 src/prefs_filtering_action.c:548
-#: src/prefs_matcher.c:706
+#: src/prefs_matcher.c:712
 msgid "Info..."
 msgstr "Informaci�n..."
 
@@ -9729,37 +9743,37 @@ msgid "Move selected action down"
 msgstr "Mover abajo la acci�n seleccionada"
 
 #: src/prefs_actions.c:532 src/prefs_filtering_action.c:660
-#: src/prefs_filtering.c:897 src/prefs_filtering.c:899
-#: src/prefs_filtering.c:900 src/prefs_filtering.c:1010
-#: src/prefs_matcher.c:846 src/prefs_template.c:466
+#: src/prefs_filtering.c:896 src/prefs_filtering.c:898
+#: src/prefs_filtering.c:899 src/prefs_filtering.c:1009
+#: src/prefs_matcher.c:854 src/prefs_template.c:466
 msgid "(New)"
 msgstr "(Nueva)"
 
-#: src/prefs_actions.c:609
+#: src/prefs_actions.c:600
 msgid "Menu name is not set."
 msgstr "No se estableci� el nombre del men�."
 
-#: src/prefs_actions.c:614
+#: src/prefs_actions.c:605
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "No se permite �/� al inicio del nombre del men�."
 
-#: src/prefs_actions.c:619
+#: src/prefs_actions.c:610
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "No se permite �:� (dos puntos) en el nombre del men�."
 
-#: src/prefs_actions.c:638
+#: src/prefs_actions.c:629
 msgid "Menu name is too long."
 msgstr "El nombre del men� es demasiado largo."
 
-#: src/prefs_actions.c:647
-msgid "Command line not set."
+#: src/prefs_actions.c:638
+msgid "Command-line not set."
 msgstr "No se especific� la orden a ejecutar."
 
-#: src/prefs_actions.c:652
+#: src/prefs_actions.c:643
 msgid "Menu name and command are too long."
 msgstr "El nombre del men� y la orden son demasiado largos."
 
-#: src/prefs_actions.c:658
+#: src/prefs_actions.c:649
 #, c-format
 msgid ""
 "The command\n"
@@ -9770,141 +9784,140 @@ msgstr ""
 "%s\n"
 "tiene errores sint�cticos."
 
-#: src/prefs_actions.c:716
+#: src/prefs_actions.c:707
 msgid "Delete action"
 msgstr "Borrar acci�n"
 
-#: src/prefs_actions.c:717
+#: src/prefs_actions.c:708
 msgid "Do you really want to delete this action?"
 msgstr "�Realmente quiere borrar esta acci�n?"
 
-#: src/prefs_actions.c:737
+#: src/prefs_actions.c:728
 msgid "Delete all actions"
 msgstr "Borrar todas las acciones"
 
-#: src/prefs_actions.c:738
+#: src/prefs_actions.c:729
 msgid "Do you really want to delete all the actions?"
 msgstr "�Realmente quiere borrar todas las acciones?"
 
-#: src/prefs_actions.c:901 src/prefs_actions.c:931 src/prefs_filtering.c:1558
-#: src/prefs_filtering.c:1580 src/prefs_matcher.c:1956
+#: src/prefs_actions.c:892 src/prefs_actions.c:922 src/prefs_filtering.c:1557
+#: src/prefs_filtering.c:1579 src/prefs_matcher.c:1980
 #: src/prefs_template.c:566 src/prefs_template.c:591
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 
-#: src/prefs_actions.c:902 src/prefs_actions.c:932 src/prefs_filtering.c:1559
-#: src/prefs_filtering.c:1581 src/prefs_template.c:567
+#: src/prefs_actions.c:893 src/prefs_actions.c:923 src/prefs_filtering.c:1558
+#: src/prefs_filtering.c:1580 src/prefs_template.c:567
 #: src/prefs_template.c:592
 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. �Cerrar igualmente?"
 
-#: src/prefs_actions.c:903 src/prefs_actions.c:908 src/prefs_actions.c:933
-#: src/prefs_actions.c:1286 src/prefs_filtering.c:1538
-#: src/prefs_filtering.c:1560 src/prefs_filtering.c:1582
-#: src/prefs_matcher.c:1958 src/prefs_template.c:568 src/prefs_template.c:593
-#: src/prefs_template.c:598
+#: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:924
+#: src/prefs_filtering.c:1537 src/prefs_filtering.c:1559
+#: src/prefs_filtering.c:1581 src/prefs_matcher.c:1982
+#: src/prefs_template.c:568 src/prefs_template.c:593 src/prefs_template.c:598
 msgid "+_Continue editing"
 msgstr "+_Seguir editando"
 
-#: src/prefs_actions.c:906
+#: src/prefs_actions.c:897
 msgid "Actions list not saved"
 msgstr "Lista de acciones no guardada"
 
-#: src/prefs_actions.c:907
+#: src/prefs_actions.c:898
 msgid "The actions list has been modified. Close anyway?"
 msgstr "La lista de acciones no fue guardada. �Cerrar igualmente?"
 
-#: src/prefs_actions.c:972
+#: src/prefs_actions.c:963
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Nombre de men�:</span>"
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:964
 msgid "Use / in menu name to make submenus."
 msgstr "Utilize / en el nombre de men� para crear submen�s."
 
-#: src/prefs_actions.c:975
-msgid "<span weight=\"bold\" underline=\"single\">Command line:</span>"
+#: src/prefs_actions.c:966
+msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">L�nea de orden:</span>"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:967
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Comenzar con:</span>"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:968
 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:978
+#: src/prefs_actions.c:969
 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:979
+#: src/prefs_actions.c:970
 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:980
+#: src/prefs_actions.c:971
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Finalizar con:</span>"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:972
 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:982
+#: src/prefs_actions.c:973
 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:983
+#: src/prefs_actions.c:974
 msgid "to run command asynchronously"
 msgstr "para ejecutar la orden de manera as�ncrona"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:975
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Usar:</span>"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:976
 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:986
+#: src/prefs_actions.c:977
 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:987
+#: src/prefs_actions.c:978
 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:988
+#: src/prefs_actions.c:979
 msgid "for a user provided argument"
 msgstr "para un par�metro introducido por el usuario"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:980
 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:990
+#: src/prefs_actions.c:981
 msgid "for the text selection"
 msgstr "para la parte seleccionada del texto"
 
-#: src/prefs_actions.c:991
+#: src/prefs_actions.c:982
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplicar acciones de filtrado entre {} a los mensajes seleccionados"
 
-#: src/prefs_actions.c:992
+#: src/prefs_actions.c:983
 msgid "for a literal %"
 msgstr "para un car�cter %"
 
-#: src/prefs_actions.c:1001 src/prefs_themes.c:991
+#: src/prefs_actions.c:992 src/prefs_themes.c:994
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/prefs_actions.c:1002
+#: src/prefs_actions.c:993
 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."
@@ -9912,41 +9925,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:1089 src/prefs_filtering.c:1756
+#: src/prefs_actions.c:1080 src/prefs_filtering.c:1755
 #: src/prefs_template.c:1091
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: src/prefs_actions.c:1199
+#: src/prefs_actions.c:1191
 msgid "Current actions"
 msgstr "Acciones actuales"
 
-#: src/prefs_actions.c:1283
-msgid "Entry was modified"
-msgstr "La entrada se modific�"
-
-#: src/prefs_actions.c:1284
-msgid ""
-"Opening the filter action dialog will clear current modifications of the "
-"command line."
-msgstr ""
-"Abrir el di�logo de acciones de filtrado eliminar� las modificaciones "
-"actuales de la l�nea de �rdenes."
-
-#: src/prefs_actions.c:1295 src/prefs_filtering.c:1134
-#: src/prefs_filtering.c:1192
+#: src/prefs_actions.c:1290 src/prefs_filtering.c:1133
+#: src/prefs_filtering.c:1191
 msgid "Action string is not valid."
 msgstr "La cadena de la acci�n no es v�lida."
 
-#: src/prefs_common.c:231 src/prefs_quote.c:68
+#: src/prefs_common.c:227 src/prefs_quote.c:68
 msgid "Hello,\\n"
 msgstr "Hola,\\n"
 
-#: src/prefs_common.c:296
+#: src/prefs_common.c:294
 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:302 src/prefs_quote.c:84
+#: src/prefs_common.c:300 src/prefs_quote.c:84
 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"
@@ -9955,7 +9956,7 @@ msgstr ""
 "{Para: %t\\n}?c{Cc: %c\\n}?n{Grupos de noticias: %n\\n}?s{Asunto: %s\\n}\\n"
 "\\n%M"
 
-#: src/prefs_common.c:442
+#: src/prefs_common.c:440
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 
@@ -10056,7 +10057,7 @@ msgid "From file..."
 msgstr "Desde fichero..."
 
 #: src/prefs_customheader.c:503 src/prefs_display_header.c:598
-#: src/prefs_matcher.c:1452 src/prefs_matcher.c:1467
+#: src/prefs_matcher.c:1466 src/prefs_matcher.c:1481
 msgid "Header name is not set."
 msgstr "No se estableci� el nombre de cabecera"
 
@@ -10145,28 +10146,28 @@ msgstr "Mostrar todas las cabeceras"
 msgid "This header is already in the list."
 msgstr "Esa cabecera ya existe en la lista."
 
-#: src/prefs_ext_prog.c:104
+#: src/prefs_ext_prog.c:106
 #, c-format
 msgid "%s will be replaced with file name / URI"
 msgstr "%s se sustituir� con el nombre de fichero / URI"
 
-#: src/prefs_ext_prog.c:122
+#: src/prefs_ext_prog.c:124
 msgid "Use system defaults when possible"
 msgstr "Usar los valores del sistema cuando sea posible"
 
-#: src/prefs_ext_prog.c:147
+#: src/prefs_ext_prog.c:150
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_ext_prog.c:181
+#: src/prefs_ext_prog.c:184
 msgid "Text editor"
 msgstr "Editor de texto"
 
-#: src/prefs_ext_prog.c:209
+#: src/prefs_ext_prog.c:212
 msgid "Command for 'Display as text'"
 msgstr "Orden para �Mostrar como texto�"
 
-#: src/prefs_ext_prog.c:222
+#: src/prefs_ext_prog.c:225
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -10174,16 +10175,16 @@ msgstr ""
 "Esta opci�n permite mostrar partes MIME en la vista de mensajes a trav�s de "
 "un script cuando se usa la opci�n �Mostrar como texto� del men� contextual"
 
-#: src/prefs_ext_prog.c:232
+#: src/prefs_ext_prog.c:236
 msgid "Print command"
 msgstr "Orden para imprimir"
 
-#: src/prefs_ext_prog.c:298 src/prefs_image_viewer.c:140
-#: src/prefs_message.c:303
+#: src/prefs_ext_prog.c:309 src/prefs_image_viewer.c:140
+#: src/prefs_message.c:304
 msgid "Message View"
 msgstr "Vista de mensaje"
 
-#: src/prefs_ext_prog.c:299
+#: src/prefs_ext_prog.c:310
 msgid "External Programs"
 msgstr "Programas externos"
 
@@ -10210,7 +10211,7 @@ msgstr "Marcas de mensaje"
 # RML on filtering is a verb ("Marcar") while in summary colunm it's really
 # RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
 #: src/prefs_filtering_action.c:166 src/prefs_summary_column.c:77
-#: src/summaryview.c:2808
+#: src/summaryview.c:2641
 msgid "Mark"
 msgstr "Marca"
 
@@ -10236,13 +10237,13 @@ msgstr "Etiqueta de color"
 msgid "Resend"
 msgstr "Reenviar"
 
-#: src/prefs_filtering_action.c:178 src/summaryview.c:523
+#: src/prefs_filtering_action.c:178
 msgid "Redirect"
 msgstr "Redirigir"
 
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
-#: src/prefs_filtering_action.c:1376 src/prefs_matcher.c:598
-#: src/prefs_summary_column.c:86 src/summaryview.c:603
+#: src/prefs_filtering_action.c:1376 src/prefs_matcher.c:602
+#: src/prefs_summary_column.c:86 src/summaryview.c:435
 msgid "Score"
 msgstr "Puntos"
 
@@ -10255,8 +10256,8 @@ msgid "Set score"
 msgstr "Establecer puntos"
 
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
-#: src/prefs_filtering_action.c:183 src/prefs_matcher.c:602
-#: src/prefs_summary_column.c:88 src/summaryview.c:605
+#: src/prefs_filtering_action.c:183 src/prefs_matcher.c:606
+#: src/prefs_summary_column.c:88 src/summaryview.c:437
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -10284,17 +10285,17 @@ msgstr "Detener filtro"
 msgid "Action configuration"
 msgstr "Configuraci�n de la acci�n"
 
-#: src/prefs_filtering_action.c:406 src/prefs_filtering.c:1937
-#: src/prefs_matcher.c:555
+#: src/prefs_filtering_action.c:406 src/prefs_filtering.c:1936
+#: src/prefs_matcher.c:559
 msgid "Rule"
 msgstr "Regla"
 
-#: src/prefs_filtering_action.c:419 src/prefs_filtering.c:428
+#: src/prefs_filtering_action.c:419 src/prefs_filtering.c:427
 msgid "Action"
 msgstr "Acci�n"
 
 #: src/prefs_filtering_action.c:888
-msgid "Command line not set"
+msgid "Command-line not set"
 msgstr "Orden no establecida"
 
 #: src/prefs_filtering_action.c:889
@@ -10325,25 +10326,25 @@ msgstr "El nombre de la etiqueta est
 msgid "No action was defined."
 msgstr "No se defini� ninguna acci�n."
 
-#: src/prefs_filtering_action.c:1201 src/prefs_matcher.c:1999
+#: src/prefs_filtering_action.c:1201 src/prefs_matcher.c:2023
 #: src/quote_fmt.c:78
 msgid "literal %"
 msgstr "car�cter %"
 
-#: src/prefs_filtering_action.c:1210 src/prefs_matcher.c:2008
+#: src/prefs_filtering_action.c:1210 src/prefs_matcher.c:2032
 msgid "filename (should not be modified)"
 msgstr "nombre de fichero (no debe modificarse)"
 
-#: src/prefs_filtering_action.c:1211 src/prefs_matcher.c:2009
+#: src/prefs_filtering_action.c:1211 src/prefs_matcher.c:2033
 #: src/quote_fmt.c:86
 msgid "new line"
 msgstr "nueva l�nea"
 
-#: src/prefs_filtering_action.c:1212 src/prefs_matcher.c:2010
+#: src/prefs_filtering_action.c:1212 src/prefs_matcher.c:2034
 msgid "escape character for quotes"
 msgstr "car�cter de escape para citas"
 
-#: src/prefs_filtering_action.c:1213 src/prefs_matcher.c:2011
+#: src/prefs_filtering_action.c:1213 src/prefs_matcher.c:2035
 msgid "quote character"
 msgstr "car�cter de cita"
 
@@ -10377,116 +10378,116 @@ msgstr "Destino"
 msgid "Color"
 msgstr "Colorear"
 
-#: src/prefs_filtering_action.c:1453
+#: src/prefs_filtering_action.c:1454
 msgid "Current action list"
 msgstr "Lista actual de acciones"
 
-#: src/prefs_filtering.c:192 src/prefs_filtering.c:354
+#: src/prefs_filtering.c:192 src/prefs_filtering.c:353
 msgid "Filtering/Processing configuration"
 msgstr "Configuraci�n de filtrado/procesamiento"
 
-#: src/prefs_filtering.c:259 src/prefs_filtering.c:928
-#: src/prefs_filtering.c:1042
+#: src/prefs_filtering.c:259 src/prefs_filtering.c:927
+#: src/prefs_filtering.c:1041
 msgid "Filtering Account Menu|All"
 msgstr "Cualquiera"
 
-#: src/prefs_filtering.c:406
+#: src/prefs_filtering.c:405
 msgid "Condition"
 msgstr "Condici�n"
 
-#: src/prefs_filtering.c:419 src/prefs_filtering.c:441
+#: src/prefs_filtering.c:418 src/prefs_filtering.c:440
 msgid " Define... "
 msgstr " Definir... "
 
-#: src/prefs_filtering.c:470
+#: src/prefs_filtering.c:469
 msgid "Append the new rule above to the list"
 msgstr "A�adir la nueva regla de arriba a la lista"
 
-#: src/prefs_filtering.c:479
+#: src/prefs_filtering.c:478
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Sustituir la regla seleccionada en la lista con la regla de arriba"
 
-#: src/prefs_filtering.c:487
+#: src/prefs_filtering.c:486
 msgid "Delete the selected rule from the list"
 msgstr "Borrar la relga seleccionada de la lista"
 
-#: src/prefs_filtering.c:524
+#: src/prefs_filtering.c:523
 msgid "Move the selected rule to the top"
 msgstr "Mover la regla seleccionada encima de todas"
 
-#: src/prefs_filtering.c:527
+#: src/prefs_filtering.c:526
 msgid "Page up"
 msgstr "P�gina arriba"
 
-#: src/prefs_filtering.c:535
+#: src/prefs_filtering.c:534
 msgid "Move the selected rule one page up"
 msgstr "Mover la regla seleccionada una p�gina hacia arriba"
 
-#: src/prefs_filtering.c:544
+#: src/prefs_filtering.c:543
 msgid "Move the selected rule up"
 msgstr "Mover la regla seleccionada arriba"
 
-#: src/prefs_filtering.c:552
+#: src/prefs_filtering.c:551
 msgid "Move the selected rule down"
 msgstr "Mover la regla seleccionada abajo"
 
-#: src/prefs_filtering.c:555
+#: src/prefs_filtering.c:554
 msgid "Page down"
 msgstr "P�gina abajo"
 
-#: src/prefs_filtering.c:563
+#: src/prefs_filtering.c:562
 msgid "Move the selected rule one page down"
 msgstr "Mover la regla seleccionada una p�gina hacia abajo"
 
-#: src/prefs_filtering.c:572
+#: src/prefs_filtering.c:571
 msgid "Move the selected rule to the bottom"
 msgstr "Mover la regla seleccionada al fondo"
 
-#: src/prefs_filtering.c:1098 src/prefs_filtering.c:1184
+#: src/prefs_filtering.c:1097 src/prefs_filtering.c:1183
 msgid "Condition string is not valid."
 msgstr "La cadena de condici�n no es v�lida."
 
-#: src/prefs_filtering.c:1171
+#: src/prefs_filtering.c:1170
 msgid "Condition string is empty."
 msgstr "La cadena de condici�n esta vac�a."
 
-#: src/prefs_filtering.c:1177
+#: src/prefs_filtering.c:1176
 msgid "Action string is empty."
 msgstr "La cadena de la acci�n esta vac�a."
 
-#: src/prefs_filtering.c:1263
+#: src/prefs_filtering.c:1262
 msgid "Delete rule"
 msgstr "Borrar regla"
 
-#: src/prefs_filtering.c:1264
+#: src/prefs_filtering.c:1263
 msgid "Do you really want to delete this rule?"
 msgstr "�Quiere borrar realmente esta regla?"
 
-#: src/prefs_filtering.c:1282
+#: src/prefs_filtering.c:1281
 msgid "Delete all rules"
 msgstr "Borrar todas las reglas"
 
-#: src/prefs_filtering.c:1283
+#: src/prefs_filtering.c:1282
 msgid "Do you really want to delete all the rules?"
 msgstr "�Quiere borrar realmente todas las reglas?"
 
-#: src/prefs_filtering.c:1536
+#: src/prefs_filtering.c:1535
 msgid "Filtering rules not saved"
 msgstr "Reglas de filtrado no guardadas"
 
-#: src/prefs_filtering.c:1537
+#: src/prefs_filtering.c:1536
 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:1759
+#: src/prefs_filtering.c:1758
 msgid "Move one page up"
 msgstr "Mover una p�gina arriba"
 
-#: src/prefs_filtering.c:1760
+#: src/prefs_filtering.c:1759
 msgid "Move one page down"
 msgstr "Mover una p�gina abajo"
 
-#: src/prefs_filtering.c:1905
+#: src/prefs_filtering.c:1904
 msgid "Enable"
 msgstr "Activar"
 
@@ -10516,8 +10517,8 @@ msgstr "Columnas visibles"
 msgid " Use default "
 msgstr " Usar configuraci�n inicial "
 
-#: src/prefs_folder_item.c:250 src/prefs_folder_item.c:783
-#: src/prefs_folder_item.c:1185
+#: src/prefs_folder_item.c:257 src/prefs_folder_item.c:801
+#: src/prefs_folder_item.c:1203
 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level one. "
 "However you can use them to set them to the whole mailbox tree using \"Apply "
@@ -10527,7 +10528,7 @@ msgstr ""
 "Sin embargo puede usarlas para establecerlas en todo el �rbol de carpetas "
 "del buz�n usando �Aplicar a subcarpetas�.</i>"
 
-#: src/prefs_folder_item.c:262 src/prefs_folder_item.c:795
+#: src/prefs_folder_item.c:269 src/prefs_folder_item.c:813
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -10535,51 +10536,51 @@ msgstr ""
 "Aplicar a\n"
 "subcarpetas"
 
-#: src/prefs_folder_item.c:287
+#: src/prefs_folder_item.c:294
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:296
 msgid "Outbox"
 msgstr "Salida"
 
-#: src/prefs_folder_item.c:305
+#: src/prefs_folder_item.c:312
 msgid "Folder type"
 msgstr "Tipo de carpeta"
 
-#: src/prefs_folder_item.c:317
+#: src/prefs_folder_item.c:325
 msgid "Simplify Subject RegExp"
 msgstr "Expr. reg. para simplificar asunto"
 
-#: src/prefs_folder_item.c:343
+#: src/prefs_folder_item.c:351
 msgid "Test RegExp"
 msgstr "Probar expr. reg."
 
-#: src/prefs_folder_item.c:375
+#: src/prefs_folder_item.c:383
 msgid "Folder chmod"
 msgstr "Permisos de la carpeta"
 
-#: src/prefs_folder_item.c:401
+#: src/prefs_folder_item.c:409
 msgid "Folder color"
 msgstr "Color de la carpeta"
 
-#: src/prefs_folder_item.c:414 src/prefs_folder_item.c:1436
+#: src/prefs_folder_item.c:422 src/prefs_folder_item.c:1454
 msgid "Pick color for folder"
 msgstr "Elejir color para la carpeta"
 
-#: src/prefs_folder_item.c:432
+#: src/prefs_folder_item.c:440
 msgid "Run Processing rules at start-up"
 msgstr "Ejecutar las reglas de procesamiento al iniciar"
 
-#: src/prefs_folder_item.c:447
+#: src/prefs_folder_item.c:455
 msgid "Run Processing rules when opening"
 msgstr "Ejecutar las reglas de procesamiento al abrir"
 
-#: src/prefs_folder_item.c:461
+#: src/prefs_folder_item.c:469
 msgid "Scan for new mail"
 msgstr "Examinar si hay correo nuevo"
 
-#: src/prefs_folder_item.c:463
+#: src/prefs_folder_item.c:471
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -10587,63 +10588,63 @@ 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:478
+#: src/prefs_folder_item.c:486
 msgid "Synchronise for offline use"
 msgstr "Sincronizar para uso sin conexi�n"
 
-#: src/prefs_folder_item.c:499
+#: src/prefs_folder_item.c:507
 msgid "Fetch message bodies from the last"
 msgstr "Recuperar cuerpos de mensaje desde el �ltimo"
 
-#: src/prefs_folder_item.c:506
+#: src/prefs_folder_item.c:514
 msgid "0: all bodies"
 msgstr "0: todos los cuerpos"
 
-#: src/prefs_folder_item.c:514
+#: src/prefs_folder_item.c:522
 msgid "Remove older messages bodies"
 msgstr "Eliminar cuerpos de mensaje antiguos"
 
-#: src/prefs_folder_item.c:531
+#: src/prefs_folder_item.c:539
 msgid "Discard folder cache"
 msgstr "Descartar la cache de carpeta"
 
-#: src/prefs_folder_item.c:804
+#: src/prefs_folder_item.c:822
 msgid "Request Return Receipt"
 msgstr "Solicitar acuse de recibo"
 
-#: src/prefs_folder_item.c:819
+#: src/prefs_folder_item.c:837
 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:832
+#: src/prefs_folder_item.c:850
 msgid "Default To:"
 msgstr "Por omisi�n Para:"
 
-#: src/prefs_folder_item.c:853
+#: src/prefs_folder_item.c:871
 msgid "Default To: for replies"
 msgstr "Respuestas por omisi�n Para:"
 
-#: src/prefs_folder_item.c:874
+#: src/prefs_folder_item.c:892
 msgid "Default account"
 msgstr "Cuenta primaria"
 
-#: src/prefs_folder_item.c:1449
+#: src/prefs_folder_item.c:1467
 msgid "Discard cache"
 msgstr "Descartar cache"
 
-#: src/prefs_folder_item.c:1450
+#: src/prefs_folder_item.c:1468
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "�Quiere borrar realmente los datos locales en cache para esta carpeta?"
 
-#: src/prefs_folder_item.c:1452
+#: src/prefs_folder_item.c:1470
 msgid "+Discard"
 msgstr "+Descartar"
 
-#: src/prefs_folder_item.c:1572
+#: src/prefs_folder_item.c:1591
 msgid "General"
 msgstr "Gen�ricas"
 
-#: src/prefs_folder_item.c:1646
+#: src/prefs_folder_item.c:1665
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propiedades de la carpeta �%s�"
@@ -10652,7 +10653,7 @@ msgstr "Propiedades de la carpeta 
 msgid "Folder and Message Lists"
 msgstr "Carpeta y listas de mensajes"
 
-#: src/prefs_fonts.c:102 src/prefs_matcher.c:1878
+#: src/prefs_fonts.c:102 src/prefs_matcher.c:1902
 msgid "Message"
 msgstr "Mensaje"
 
@@ -10679,7 +10680,7 @@ msgid "Message Printing"
 msgstr "Impresi�n de mensajes"
 
 #: src/prefs_fonts.c:277 src/prefs_msg_colors.c:830 src/prefs_summaries.c:685
-#: src/prefs_themes.c:364
+#: src/prefs_themes.c:368
 msgid "Display"
 msgstr "Ver"
 
@@ -10832,238 +10833,242 @@ msgstr "Mensajes de error"
 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:651
+msgid "Other"
+msgstr "Otras"
+
 #: src/prefs_logging.c:428
 msgid "Logging"
 msgstr "Depuraci�n"
 
-#: src/prefs_matcher.c:309
+#: src/prefs_matcher.c:311
 msgid "more than"
 msgstr "m�s que"
 
-#: src/prefs_matcher.c:310
+#: src/prefs_matcher.c:312
 msgid "less than"
 msgstr "menos que"
 
-#: src/prefs_matcher.c:315
+#: src/prefs_matcher.c:317
 msgid "weeks"
 msgstr "semanas"
 
-#: src/prefs_matcher.c:319
+#: src/prefs_matcher.c:321
 msgid "higher than"
 msgstr "m�s alto que"
 
-#: src/prefs_matcher.c:320
+#: src/prefs_matcher.c:322
 msgid "lower than"
 msgstr "m�s bajo que"
 
-#: src/prefs_matcher.c:321 src/prefs_matcher.c:327
+#: src/prefs_matcher.c:323 src/prefs_matcher.c:329
 msgid "exactly"
 msgstr "exactamente"
 
-#: src/prefs_matcher.c:325
+#: src/prefs_matcher.c:327
 msgid "greater than"
 msgstr "mayor que"
 
-#: src/prefs_matcher.c:326
+#: src/prefs_matcher.c:328
 msgid "smaller than"
 msgstr "menor que"
 
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:333
 msgid "bytes"
 msgstr "bytes"
 
-#: src/prefs_matcher.c:332
+#: src/prefs_matcher.c:334
 msgid "kilobytes"
 msgstr "kilobytes"
 
-#: src/prefs_matcher.c:333
+#: src/prefs_matcher.c:335
 msgid "megabytes"
 msgstr "megabytes"
 
-#: src/prefs_matcher.c:337
+#: src/prefs_matcher.c:339
 msgid "contains"
 msgstr "contiene"
 
-#: src/prefs_matcher.c:338
+#: src/prefs_matcher.c:340
 msgid "doesn't contain"
 msgstr "no contiene"
 
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:362
 msgid "headers part"
 msgstr "secci�n cabeceras"
 
-#: src/prefs_matcher.c:361
+#: src/prefs_matcher.c:363
 msgid "body part"
 msgstr "secci�n cuerpo"
 
-#: src/prefs_matcher.c:362
+#: src/prefs_matcher.c:364
 msgid "whole message"
 msgstr "mensaje completo"
 
-#: src/prefs_matcher.c:368 src/summaryview.c:6049
+#: src/prefs_matcher.c:370 src/summaryview.c:5921
 msgid "Marked"
 msgstr "Marcado"
 
-#: src/prefs_matcher.c:369 src/summaryview.c:6047
+#: src/prefs_matcher.c:371 src/summaryview.c:5919
 msgid "Deleted"
 msgstr "Borrado"
 
-#: src/prefs_matcher.c:370
+#: src/prefs_matcher.c:372
 msgid "Replied"
 msgstr "Respondido"
 
-#: src/prefs_matcher.c:371 src/summaryview.c:6041
+#: src/prefs_matcher.c:373 src/summaryview.c:5913
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: src/prefs_matcher.c:373 src/summaryview.c:6033 src/toolbar.c:398
+#: src/prefs_matcher.c:375 src/summaryview.c:5905 src/toolbar.c:398
 #: src/toolbar.c:920 src/toolbar.c:1924
 msgid "Spam"
 msgstr "Basura"
 
-#: src/prefs_matcher.c:377
+#: src/prefs_matcher.c:379
 msgid "set"
 msgstr "establecido"
 
-#: src/prefs_matcher.c:378
+#: src/prefs_matcher.c:380
 msgid "not set"
 msgstr "no establecido"
 
-#: src/prefs_matcher.c:382
+#: src/prefs_matcher.c:384
 msgid "yes"
 msgstr "si"
 
-#: src/prefs_matcher.c:383
+#: src/prefs_matcher.c:385
 msgid "no"
 msgstr "no"
 
-#: src/prefs_matcher.c:387
+#: src/prefs_matcher.c:389
 msgid "Any tags"
 msgstr "Cualquier etiqueta"
 
-#: src/prefs_matcher.c:388
+#: src/prefs_matcher.c:390
 msgid "Specific tag"
 msgstr "Etiqueta espec�fica"
 
-#: src/prefs_matcher.c:392
+#: src/prefs_matcher.c:394
 msgid "ignored"
 msgstr "ignorado"
 
-#: src/prefs_matcher.c:393
+#: src/prefs_matcher.c:395
 msgid "not ignored"
 msgstr "no ignorado"
 
-#: src/prefs_matcher.c:394
+#: src/prefs_matcher.c:396
 msgid "watched"
 msgstr "observado"
 
-#: src/prefs_matcher.c:395
+#: src/prefs_matcher.c:397
 msgid "not watched"
 msgstr "no observado"
 
-#: src/prefs_matcher.c:399
+#: src/prefs_matcher.c:401
 msgid "found"
 msgstr "encontrado"
 
-#: src/prefs_matcher.c:400
+#: src/prefs_matcher.c:402
 msgid "not found"
 msgstr "no encontrado"
 
-#: src/prefs_matcher.c:404
+#: src/prefs_matcher.c:406
 msgid "0 (Passed)"
 msgstr "0 (Pasado)"
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:407
 msgid "non-0 (Failed)"
 msgstr "no-0 (Fallido)"
 
-#: src/prefs_matcher.c:538
+#: src/prefs_matcher.c:542
 msgid "Condition configuration"
 msgstr "Configuraci�n de la condici�n"
 
-#: src/prefs_matcher.c:582
+#: src/prefs_matcher.c:586
 msgid "Match criteria:"
 msgstr "Criterio de b�squeda:"
 
-#: src/prefs_matcher.c:591
+#: src/prefs_matcher.c:595
 msgid "All messages"
 msgstr "Todos los mensajes"
 
-#: src/prefs_matcher.c:593
+#: src/prefs_matcher.c:597
 msgid "Age"
 msgstr "Edad"
 
-#: src/prefs_matcher.c:594
+#: src/prefs_matcher.c:598
 msgid "Phrase"
 msgstr "Frase"
 
-#: src/prefs_matcher.c:595
+#: src/prefs_matcher.c:599
 msgid "Flags"
 msgstr "Marcas"
 
-#: src/prefs_matcher.c:596 src/prefs_msg_colors.c:412
+#: src/prefs_matcher.c:600 src/prefs_msg_colors.c:412
 msgid "Color labels"
 msgstr "Etiquetas de colores"
 
-#: src/prefs_matcher.c:597
+#: src/prefs_matcher.c:601
 msgid "Thread"
 msgstr "Hilo"
 
-#: src/prefs_matcher.c:600
+#: src/prefs_matcher.c:604
 msgid "Partially downloaded"
 msgstr "Parcialmente descargado"
 
-#: src/prefs_matcher.c:603
+#: src/prefs_matcher.c:607
 msgid "External program test"
 msgstr "Prueba con un programa externo"
 
-#: src/prefs_matcher.c:666 src/prefs_matcher.c:1473 src/prefs_matcher.c:1488
-#: src/prefs_matcher.c:2336
+#: src/prefs_matcher.c:670 src/prefs_matcher.c:1487 src/prefs_matcher.c:1502
+#: src/prefs_matcher.c:2361
 msgid "Filtering Matcher Menu|All"
 msgstr "Todos"
 
-#: src/prefs_matcher.c:697
+#: src/prefs_matcher.c:702
 msgid "Use regexp"
 msgstr "Usar exp.reg."
 
-#: src/prefs_matcher.c:773
+#: src/prefs_matcher.c:779
 msgid "Message must match"
 msgstr "El mensaje debe cumplir"
 
-#: src/prefs_matcher.c:777
+#: src/prefs_matcher.c:783
 msgid "at least one"
 msgstr "al menos una de"
 
-#: src/prefs_matcher.c:778
+#: src/prefs_matcher.c:784
 msgid "all"
 msgstr "todas"
 
-#: src/prefs_matcher.c:781
+#: src/prefs_matcher.c:787
 msgid "of above rules"
 msgstr "las reglas anteriores"
 
-#: src/prefs_matcher.c:1399 src/prefs_matcher.c:1457
+#: src/prefs_matcher.c:1413 src/prefs_matcher.c:1471
 msgid "Search pattern is not set."
 msgstr "No se estableci� el patr�n de b�squeda."
 
-#: src/prefs_matcher.c:1408
+#: src/prefs_matcher.c:1422
 msgid "Test command is not set."
 msgstr "No se estableci� la orden de prueba."
 
-#: src/prefs_matcher.c:1474
+#: src/prefs_matcher.c:1488
 msgid "all addresses in all headers"
 msgstr "todas las direcciones en todas las cabeceras"
 
-#: src/prefs_matcher.c:1477
+#: src/prefs_matcher.c:1491
 msgid "any address in any header"
 msgstr "cualquier direcci�n en cualquier cabecera"
 
-#: src/prefs_matcher.c:1479
+#: src/prefs_matcher.c:1493
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "la(s) direcci�n(es) en la cabecera �%s�"
 
-#: src/prefs_matcher.c:1480
+#: src/prefs_matcher.c:1494
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -11076,79 +11081,79 @@ 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:1693
+#: src/prefs_matcher.c:1707
 msgid "Headers part"
 msgstr "Secci�n cabeceras"
 
-#: src/prefs_matcher.c:1697
+#: src/prefs_matcher.c:1711
 msgid "Body part"
 msgstr "Secci�n cuerpo"
 
-#: src/prefs_matcher.c:1701
+#: src/prefs_matcher.c:1715
 msgid "Whole message"
 msgstr "Mensaje completo"
 
-#: src/prefs_matcher.c:1812 src/prefs_matcher.c:1851
+#: src/prefs_matcher.c:1832 src/prefs_matcher.c:1873
 msgid "in"
 msgstr "en"
 
-#: src/prefs_matcher.c:1814
+#: src/prefs_matcher.c:1834
 msgid "content is"
 msgstr "contenido es"
 
-#: src/prefs_matcher.c:1822
+#: src/prefs_matcher.c:1842
 msgid "Age is"
 msgstr "Edad es"
 
-#: src/prefs_matcher.c:1827
+#: src/prefs_matcher.c:1847
 msgid "Flag"
 msgstr "Marca"
 
-#: src/prefs_matcher.c:1828 src/prefs_matcher.c:1842
+#: src/prefs_matcher.c:1848 src/prefs_matcher.c:1864
 msgid "is"
 msgstr "es"
 
-#: src/prefs_matcher.c:1833
+#: src/prefs_matcher.c:1853
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/prefs_matcher.c:1841
+#: src/prefs_matcher.c:1863
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/prefs_matcher.c:1846
+#: src/prefs_matcher.c:1868
 msgid "Value:"
 msgstr "Valor:"
 
-#: src/prefs_matcher.c:1861
+#: src/prefs_matcher.c:1885
 msgid "Score is"
 msgstr "Puntuaci�n es"
 
-#: src/prefs_matcher.c:1862
+#: src/prefs_matcher.c:1886
 msgid "points"
 msgstr "puntos"
 
-#: src/prefs_matcher.c:1872
+#: src/prefs_matcher.c:1896
 msgid "Size is"
 msgstr "Tama�o es"
 
-#: src/prefs_matcher.c:1877
+#: src/prefs_matcher.c:1901
 msgid "Scope:"
 msgstr "Alcance:"
 
-#: src/prefs_matcher.c:1879
+#: src/prefs_matcher.c:1903
 msgid "tags"
 msgstr "etiquetas"
 
-#: src/prefs_matcher.c:1884
+#: src/prefs_matcher.c:1908
 msgid "type is"
 msgstr "tipo es"
 
-#: src/prefs_matcher.c:1888
+#: src/prefs_matcher.c:1912
 msgid "Program returns"
 msgstr "El programa devuelve"
 
-#: src/prefs_matcher.c:1957
+#: src/prefs_matcher.c:1981
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -11156,11 +11161,11 @@ msgstr ""
 "La entrada no fue guardada.\n"
 "�Cerrar igualmente?"
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2043
 msgid "Match Type: 'Test'"
 msgstr "Tipo de coincidencia: �Probar�"
 
-#: src/prefs_matcher.c:2020
+#: src/prefs_matcher.c:2044
 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"
@@ -11172,7 +11177,7 @@ msgstr ""
 "\n"
 "Se pueden usar los siguientes s�mbolos:"
 
-#: src/prefs_matcher.c:2117
+#: src/prefs_matcher.c:2142
 msgid "Current condition rules"
 msgstr "Reglas de condici�n actuales"
 
@@ -11216,31 +11221,31 @@ msgstr "Seleccionar la parte HTML en mensajes 
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_message.c:179 src/prefs_message.c:212
+#: src/prefs_message.c:179 src/prefs_message.c:213
 msgid "pixel(s)"
 msgstr "p�xel(s)"
 
-#: src/prefs_message.c:184
+#: src/prefs_message.c:185
 msgid "Scroll"
 msgstr "Desplazamiento"
 
-#: src/prefs_message.c:186
+#: src/prefs_message.c:187
 msgid "Half page"
 msgstr "Media p�gina"
 
-#: src/prefs_message.c:192
+#: src/prefs_message.c:193
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_message.c:198
+#: src/prefs_message.c:199
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_message.c:219
+#: src/prefs_message.c:220
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Mostrar descripciones de los adjuntos (en vez de nombres)"
 
-#: src/prefs_message.c:304
+#: src/prefs_message.c:305
 msgid "Text Options"
 msgstr "Opciones de texto"
 
@@ -11428,11 +11433,7 @@ msgstr "Elegir configuracide atajos de teclado"
 msgid "Select preset:"
 msgstr "Seleccionar combinaci�n:"
 
-#: src/prefs_other.c:116 src/prefs_other.c:462
-msgid "Old Sylpheed"
-msgstr "Antigua de Sylpheed"
-
-#: src/prefs_other.c:124
+#: src/prefs_other.c:123
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -11440,35 +11441,35 @@ msgstr ""
 "Puede tambi�n modificar cada atajo de men� presionando\n"
 "la(s) tecla(s) al situar el puntero sobre el elemento."
 
-#: src/prefs_other.c:523
+#: src/prefs_other.c:466
 msgid "Add address to destination when double-clicked"
 msgstr "A�adir la direcci�n al destino con doble clic"
 
-#: src/prefs_other.c:526
+#: src/prefs_other.c:469
 msgid "On exit"
 msgstr "Al salir"
 
-#: src/prefs_other.c:529
+#: src/prefs_other.c:472
 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 
-#: src/prefs_other.c:536
+#: src/prefs_other.c:479
 msgid "Empty trash on exit"
 msgstr "Vaciar la papelera al salir"
 
-#: src/prefs_other.c:539
+#: src/prefs_other.c:482
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 
-#: src/prefs_other.c:541
+#: src/prefs_other.c:484
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:487
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Habilitar los atajos de teclado configurables"
 
-#: src/prefs_other.c:547
+#: src/prefs_other.c:490
 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"
@@ -11479,29 +11480,29 @@ msgstr ""
 "de teclas.\n"
 "Desmarque esta opci�n si quiere bloquear todos los atajos existentes."
 
-#: src/prefs_other.c:554
+#: src/prefs_other.c:497
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Seleccionar configuraci�n de atajos de teclado..."
 
-#: src/prefs_other.c:567
+#: src/prefs_other.c:510
 msgid "Socket I/O timeout"
 msgstr "Tiempo l�mite de E/S en el socket"
 
-#: src/prefs_other.c:589
+#: src/prefs_other.c:532
 msgid "Ask before emptying trash"
 msgstr "Preguntar antes de vaciar la papelera"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:534
 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:596
+#: src/prefs_other.c:539
 msgid "Use secure file deletion if possible"
 msgstr "Usar borrado de ficheros seguro si es posible"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:543
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -11509,7 +11510,7 @@ msgstr ""
 "Usar borrado de ficheros seguro si es posible\n"
 "(el programa �shred� no est� disponible)"
 
-#: src/prefs_other.c:605
+#: src/prefs_other.c:548
 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."
@@ -11518,10 +11519,14 @@ 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:609
+#: src/prefs_other.c:552
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronizar carpetas sin conexi�n tan pronto como sea posible"
 
+#: src/prefs_other.c:652
+msgid "Miscellaneous"
+msgstr "Miscel�nea"
+
 #: src/prefs_quote.c:76
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "El %d\\n%f escribi�:\\n\\n%q"
@@ -12026,14 +12031,14 @@ 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."
+"Las cabeceras est�ndar mostradas (como �From:�, �Subject:�) ser�n traducidas a "
+"su idioma."
 
 #: src/prefs_summaries.c:686
 msgid "Summaries"
 msgstr "Res�menes"
 
-#: src/prefs_summary_column.c:79 src/summaryview.c:2802
+#: src/prefs_summary_column.c:79 src/summaryview.c:2635
 msgid "Attachment"
 msgstr "Adjunto"
 
@@ -12178,33 +12183,33 @@ msgstr "Plantillas actuales"
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_themes.c:343 src/prefs_themes.c:725
+#: src/prefs_themes.c:347 src/prefs_themes.c:728
 msgid "Default internal theme"
 msgstr "Tema interno por omisi�n"
 
-#: src/prefs_themes.c:365
+#: src/prefs_themes.c:369
 msgid "Themes"
 msgstr "Temas"
 
-#: src/prefs_themes.c:452
+#: src/prefs_themes.c:456
 msgid "Only root can remove system themes"
 msgstr "S�lo el administrador (root) puede eliminar temas globales"
 
-#: src/prefs_themes.c:455
+#: src/prefs_themes.c:459
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Eliminar el tema global �%s�"
 
-#: src/prefs_themes.c:458
+#: src/prefs_themes.c:462
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Eliminar tema �%s�"
 
-#: src/prefs_themes.c:464
+#: src/prefs_themes.c:468
 msgid "Are you sure you want to remove this theme?"
 msgstr "�Est� seguro de que quiere borrar este tema?"
 
-#: src/prefs_themes.c:474
+#: src/prefs_themes.c:478
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -12213,24 +12218,24 @@ msgstr ""
 "Error en el fichero %s\n"
 "al eliminar el tema."
 
-#: src/prefs_themes.c:478
+#: src/prefs_themes.c:482
 msgid "Removing theme directory failed."
 msgstr "Fall� la eliminaci�n del directorio del tema."
 
-#: src/prefs_themes.c:481
+#: src/prefs_themes.c:485
 msgid "Theme removed successfully"
 msgstr "Tema eliminado con �xito"
 
-#: src/prefs_themes.c:501
+#: src/prefs_themes.c:505
 msgid "Select theme folder"
 msgstr "Seleccionar carpeta del tema"
 
-#: src/prefs_themes.c:516
+#: src/prefs_themes.c:520
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Instalar tema �%s�"
 
-#: src/prefs_themes.c:519
+#: src/prefs_themes.c:523
 msgid ""
 "This folder doesn't seem to be a theme folder.\n"
 "Install anyway?"
@@ -12238,15 +12243,15 @@ msgstr ""
 "Esta carpeta no parece una carpeta de un tema.\n"
 "�Instalar de todas maneras?"
 
-#: src/prefs_themes.c:526
+#: src/prefs_themes.c:530
 msgid "Do you want to install theme for all users?"
 msgstr "�Quiere instalar el tema para todos los usuarios?"
 
-#: src/prefs_themes.c:547
+#: src/prefs_themes.c:550
 msgid "Theme exists"
 msgstr "El tema ya existe"
 
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:551
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -12258,25 +12263,25 @@ msgstr ""
 "\n"
 "�Desea reemplazarlo?"
 
-#: src/prefs_themes.c:554
+#: src/prefs_themes.c:557
 #, 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:562
+#: src/prefs_themes.c:565
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "No se puede crear el directorio de destino %s."
 
-#: src/prefs_themes.c:575
+#: src/prefs_themes.c:578
 msgid "Theme installed successfully."
 msgstr "Tema instalado con �xito."
 
-#: src/prefs_themes.c:582
+#: src/prefs_themes.c:585
 msgid "Failed installing theme"
 msgstr "Error al instalar el tema"
 
-#: src/prefs_themes.c:585
+#: src/prefs_themes.c:588
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -12285,58 +12290,58 @@ msgstr ""
 "Error en el fichero %s\n"
 "al instalar el tema."
 
-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:689
 #, 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:728
+#: src/prefs_themes.c:731
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "El tema interno tiene %d iconos"
 
-#: src/prefs_themes.c:734
+#: src/prefs_themes.c:737
 msgid "No info file available for this theme"
 msgstr "No hay fichero de informaci�n para este tema"
 
-#: src/prefs_themes.c:752
+#: src/prefs_themes.c:755
 msgid "Error: couldn't get theme status"
 msgstr "Error: no se pudo obtener el estado del tema"
 
-#: src/prefs_themes.c:776
+#: src/prefs_themes.c:779
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d ficheros (%d iconos), tama�o: %s"
 
-#: src/prefs_themes.c:859
+#: src/prefs_themes.c:862
 msgid "Selector"
 msgstr "Selector"
 
-#: src/prefs_themes.c:870
+#: src/prefs_themes.c:873
 msgid "Install new..."
 msgstr "Instalar nuevo..."
 
-#: src/prefs_themes.c:886
+#: src/prefs_themes.c:889
 msgid "Information"
 msgstr "Informaci�n"
 
-#: src/prefs_themes.c:900
+#: src/prefs_themes.c:903
 msgid "Author: "
 msgstr "Autor: "
 
-#: src/prefs_themes.c:908
+#: src/prefs_themes.c:911
 msgid "URL:"
 msgstr "URL:"
 
-#: src/prefs_themes.c:950
+#: src/prefs_themes.c:953
 msgid "Preview"
 msgstr "Apariencia"
 
-#: src/prefs_themes.c:1000
+#: src/prefs_themes.c:1003
 msgid "Use this"
 msgstr "Usar este"
 
-#: src/prefs_themes.c:1005
+#: src/prefs_themes.c:1008
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -12401,8 +12406,8 @@ msgid "Icon"
 msgstr "Icono"
 
 #: src/prefs_toolbar.c:998 src/prefs_toolbar.c:1012 src/prefs_toolbar.c:1026
-msgid "Customize Toolbars"
-msgstr "Configurar barras de herramientas"
+msgid "Toolbars"
+msgstr "Barras de herramientas"
 
 #: src/prefs_toolbar.c:999
 msgid "Main Window"
@@ -13011,155 +13016,135 @@ msgstr "Se lleg
 msgid "End of list reached; continue from beginning?"
 msgstr "Se termin� la lista, �comenzar desde el principio?"
 
-#: src/summaryview.c:516
-msgid "_mailing list"
-msgstr "_lista de correo"
-
-#: src/summaryview.c:561
-msgid "Create f_ilter rule"
-msgstr "Crear regla de f_iltrado"
-
-#: src/summaryview.c:578
-msgid "Message _source"
-msgstr "Fuente del men_saje"
-
-#: src/summaryview.c:582
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: src/summaryview.c:589
-msgid "All _headers"
-msgstr "Todas las ca_beceras"
-
-#: src/summaryview.c:709
+#: src/summaryview.c:541
 msgid "Toggle quick search bar"
 msgstr "Conmutar barra de b�squeda r�pida"
 
-#: src/summaryview.c:746
+#: src/summaryview.c:578
 msgid "Toggle multiple selection"
 msgstr "Commutar la selecci�n m�ltiple"
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1174
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:1342
+#: src/summaryview.c:1175
 msgid "Some marks are left. Process them?"
 msgstr "Quedan algunas marcas. �Procesarlas?"
 
-#: src/summaryview.c:1399
+#: src/summaryview.c:1232
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1878 src/summaryview.c:1930
+#: src/summaryview.c:1711 src/summaryview.c:1763
 msgid "No more unread messages"
 msgstr "No hay m�s mensajes sin leer"
 
-#: src/summaryview.c:1879
+#: src/summaryview.c:1712
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. �Buscar desde el final?"
 
-#: src/summaryview.c:1891 src/summaryview.c:1943 src/summaryview.c:1990
-#: src/summaryview.c:2042 src/summaryview.c:2121
+#: src/summaryview.c:1724 src/summaryview.c:1776 src/summaryview.c:1823
+#: src/summaryview.c:1875 src/summaryview.c:1954
 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:1899
+#: src/summaryview.c:1732
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1764
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. �Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1977 src/summaryview.c:2029
+#: src/summaryview.c:1810 src/summaryview.c:1862
 msgid "No more new messages"
 msgstr "No hay m�s mensajes nuevos"
 
-#: src/summaryview.c:1978
+#: src/summaryview.c:1811
 msgid "No new message found. Search from the end?"
 msgstr "No hay mensajes nuevos. �Buscar desde el final?"
 
-#: src/summaryview.c:1998
+#: src/summaryview.c:1831
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:2030
+#: src/summaryview.c:1863
 msgid "No new message found. Go to next folder?"
 msgstr "No hay m�s mensajes nuevos. �Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:2067 src/summaryview.c:2108
+#: src/summaryview.c:1900 src/summaryview.c:1941
 msgid "No more marked messages"
 msgstr "No hay m�s mensajes marcados"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:1901
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. �Buscar desde el final?"
 
-#: src/summaryview.c:2077
+#: src/summaryview.c:1910
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:2109
+#: src/summaryview.c:1942
 msgid "No marked message found. Go to next folder?"
 msgstr "No hay mensajes marcados. �Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:2146 src/summaryview.c:2171
+#: src/summaryview.c:1979 src/summaryview.c:2004
 msgid "No more labeled messages"
 msgstr "No hay m�s mensajes etiquetados"
 
-#: src/summaryview.c:2147
+#: src/summaryview.c:1980
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. �Buscar desde el final?"
 
-#: src/summaryview.c:2156 src/summaryview.c:2181
+#: src/summaryview.c:1989 src/summaryview.c:2014
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:2172
+#: src/summaryview.c:2005
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. �Buscar desde el principio?"
 
-#: src/summaryview.c:2463
+#: src/summaryview.c:2296
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por el asunto..."
 
-#: src/summaryview.c:2646
+#: src/summaryview.c:2479
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrado(s)"
 
-#: src/summaryview.c:2650
+#: src/summaryview.c:2483
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2651 src/summaryview.c:2658
+#: src/summaryview.c:2484 src/summaryview.c:2491
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2656
+#: src/summaryview.c:2489
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2671
+#: src/summaryview.c:2504
 msgid " item selected"
 msgstr " elemento seleccionado"
 
-#: src/summaryview.c:2673
+#: src/summaryview.c:2506
 msgid " items selected"
 msgstr " elementos seleccionados"
 
-#: src/summaryview.c:2691 src/summaryview.c:2729
+#: src/summaryview.c:2524 src/summaryview.c:2562
 #, 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:2699
+#: src/summaryview.c:2532
 #, c-format
 msgid ""
 "<b>Message summary</b>\n"
@@ -13188,28 +13173,28 @@ msgstr ""
 "<b>Ignorados:</b> %d\n"
 "<b>Observados:</b> %d"
 
-#: src/summaryview.c:2724
+#: src/summaryview.c:2557
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d seleccionados (%s/%s), %d sin leer"
 
-#: src/summaryview.c:2997
+#: src/summaryview.c:2832
 msgid "Sorting summary..."
 msgstr "Ordenando el resumen..."
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:2946
 msgid "Setting summary from message data..."
 msgstr "Estableciendo el resumen de los mensajes..."
 
-#: src/summaryview.c:3315
+#: src/summaryview.c:3150
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
-#: src/summaryview.c:3352
+#: src/summaryview.c:3187
 msgid "(No Recipient)"
 msgstr "(Sin destinatario)"
 
-#: src/summaryview.c:3375
+#: src/summaryview.c:3222
 #, c-format
 msgid ""
 "%s\n"
@@ -13218,7 +13203,7 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Desde: %s, en %s</span>"
 
-#: src/summaryview.c:3382
+#: src/summaryview.c:3229
 #, c-format
 msgid ""
 "%s\n"
@@ -13227,73 +13212,73 @@ msgstr ""
 "%s\n"
 "<span color='%s' style='italic'>Desde: %s, en %s</span>"
 
-#: src/summaryview.c:4245
+#: src/summaryview.c:4092
 msgid "You're not the author of the article.\n"
 msgstr "Usted no es el autor del art�culo.\n"
 
-#: src/summaryview.c:4333
+#: src/summaryview.c:4180
 #, 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:4336
+#: src/summaryview.c:4183
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:4493
+#: src/summaryview.c:4340
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:4592
+#: src/summaryview.c:4439
 msgid "Destination to copy is same as current folder."
 msgstr "El destino de copia es la carpeta actual."
 
-#: src/summaryview.c:4757
+#: src/summaryview.c:4604
 msgid "Append or Overwrite"
 msgstr "A�adir o sobreescribir"
 
-#: src/summaryview.c:4758
+#: src/summaryview.c:4605
 msgid "Append or overwrite existing file?"
 msgstr "�A�adir o sobreescribir el fichero existente?"
 
-#: src/summaryview.c:4759
+#: src/summaryview.c:4606
 msgid "_Append"
 msgstr "_A�adir"
 
-#: src/summaryview.c:4759
+#: src/summaryview.c:4606
 msgid "_Overwrite"
 msgstr "S_obreescribir"
 
-#: src/summaryview.c:4806
+#: src/summaryview.c:4653
 #, 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:5127
+#: src/summaryview.c:4974
 msgid "Building threads..."
 msgstr "Construyendo jerarqu�a..."
 
-#: src/summaryview.c:5346
+#: src/summaryview.c:5214
 msgid "Skip these rules"
 msgstr "Saltarse estas reglas"
 
-#: src/summaryview.c:5349
+#: src/summaryview.c:5217
 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:5352
+#: src/summaryview.c:5220
 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:5381
+#: src/summaryview.c:5249
 msgid "Filtering"
 msgstr "Filtrando"
 
-#: src/summaryview.c:5382
+#: src/summaryview.c:5250
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -13301,59 +13286,59 @@ msgstr ""
 "Hay ciertas reglas de filtrado que pertenecen a una cuenta.\n"
 "Por favor seleccione que quiere hacer con ellas:"
 
-#: src/summaryview.c:5384
+#: src/summaryview.c:5252
 msgid "_Filter"
 msgstr "_Filtrar"
 
-#: src/summaryview.c:5412
+#: src/summaryview.c:5280
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:5491
+#: src/summaryview.c:5359
 msgid "Processing configuration"
 msgstr "Configuraci�n de procesamiento"
 
-#: src/summaryview.c:6029
+#: src/summaryview.c:5901
 msgid "Ignored thread"
 msgstr "Hilo ignorado"
 
-#: src/summaryview.c:6031
+#: src/summaryview.c:5903
 msgid "Watched thread"
 msgstr "Hilo observado"
 
-#: src/summaryview.c:6039
+#: src/summaryview.c:5911
 msgid "Replied - click to see reply"
 msgstr "Respondido - pulse para ver la respuesta"
 
-#: src/summaryview.c:6051
+#: src/summaryview.c:5923
 msgid "To be moved"
 msgstr "Ser� movido"
 
-#: src/summaryview.c:6053
+#: src/summaryview.c:5925
 msgid "To be copied"
 msgstr "Ser� copiado"
 
-#: src/summaryview.c:6065
+#: src/summaryview.c:5937
 msgid "Signed, has attachment(s)"
 msgstr "Firmado, tiene adjunto(s)"
 
-#: src/summaryview.c:6067
+#: src/summaryview.c:5939
 msgid "Signed"
 msgstr "Firmado"
 
-#: src/summaryview.c:6069
+#: src/summaryview.c:5941
 msgid "Encrypted, has attachment(s)"
 msgstr "Cifrado, tiene adjunto(s)"
 
-#: src/summaryview.c:6071
+#: src/summaryview.c:5943
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: src/summaryview.c:6073
+#: src/summaryview.c:5945
 msgid "Has attachment(s)"
 msgstr "Tiene adjunto(s)"
 
-#: src/summaryview.c:7655
+#: src/summaryview.c:7489
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -13362,11 +13347,11 @@ msgstr ""
 "Error en la expresi�n regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:7762
+#: src/summaryview.c:7597
 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:7767
+#: src/summaryview.c:7602
 msgid "Go back to the folder list"
 msgstr "Volver a la lista de carpetas"
 
@@ -13394,17 +13379,17 @@ msgstr "_Abrir imagen"
 msgid "_Save image..."
 msgstr "_Guardar imagen..."
 
-#: src/textview.c:659
+#: src/textview.c:674
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
-#: src/textview.c:662
+#: src/textview.c:677
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
-#: src/textview.c:838
+#: src/textview.c:853
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -13418,79 +13403,79 @@ msgstr ""
 "\n"
 "  Utilize "
 
-#: src/textview.c:843
+#: src/textview.c:858
 msgid "'View Log'"
 msgstr "�Ver traza�"
 
-#: src/textview.c:844
+#: src/textview.c:859
 msgid " in the Tools menu for more information."
 msgstr " en el men� Herramientas para m�s informaci�n."
 
-#: src/textview.c:884
+#: src/textview.c:899
 msgid "  The following can be performed on this part\n"
 msgstr "  Puede efectuar las siguientes acciones en esta parte haciendo\n"
 
-#: src/textview.c:886
+#: src/textview.c:901
 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:890
+#: src/textview.c:905
 msgid "     - To save, select "
 msgstr "     - Para guardar, seleccione "
 
-#: src/textview.c:891
+#: src/textview.c:906
 msgid "'Save as...'"
 msgstr "�Guardar como...�"
 
-#: src/textview.c:893
+#: src/textview.c:908
 msgid " (Shortcut key: 'y')"
 msgstr " (Atajo de teclado: �y�)"
 
-#: src/textview.c:897
+#: src/textview.c:912
 msgid "     - To display as text, select "
 msgstr "     - Para mostrar como texto, seleccione "
 
-#: src/textview.c:898
+#: src/textview.c:913
 msgid "'Display as text'"
 msgstr "�Mostrar como texto�"
 
-#: src/textview.c:901
+#: src/textview.c:916
 msgid " (Shortcut key: 't')"
 msgstr " (Atajo de teclado: �t�)"
 
-#: src/textview.c:905
+#: src/textview.c:920
 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir con un programa externo, seleccione "
 
-#: src/textview.c:906
+#: src/textview.c:921
 msgid "'Open'"
 msgstr "�Abrir�"
 
-#: src/textview.c:909
+#: src/textview.c:924
 msgid " (Shortcut key: 'l')\n"
 msgstr " (Atajo de teclado: �l�)\n"
 
-#: src/textview.c:910
+#: src/textview.c:925
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente doble clic, o clic con el bot�n "
 
-#: src/textview.c:911
+#: src/textview.c:926
 msgid "mouse button)\n"
 msgstr "central del rat�n)\n"
 
-#: src/textview.c:912
+#: src/textview.c:928
 msgid "     - Or use "
 msgstr "     - O utilize"
 
-#: src/textview.c:913
+#: src/textview.c:929
 msgid "'Open with...'"
 msgstr "�Abrir con...�"
 
-#: src/textview.c:914
+#: src/textview.c:930
 msgid " (Shortcut key: 'o')"
 msgstr " (Atajo de teclado: �o�)"
 
-#: src/textview.c:1010
+#: src/textview.c:1027
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -13501,11 +13486,11 @@ msgstr ""
 "    %s\n"
 "C�digo de salida %d\n"
 
-#: src/textview.c:2083
+#: src/textview.c:2100
 msgid "Tags: "
 msgstr "Etiquetas: "
 
-#: src/textview.c:2769
+#: src/textview.c:2781
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
@@ -13524,11 +13509,11 @@ msgstr ""
 "\n"
 "�Abrirla de todas formas?"
 
-#: src/textview.c:2778
+#: src/textview.c:2790
 msgid "Phishing attempt warning"
 msgstr "Aviso de intento de �phishing�"
 
-#: src/textview.c:2779
+#: src/textview.c:2791
 msgid "_Open URL"
 msgstr "_Abrir URL"

	talons Fork of Claws Mail https://www.claws-mail
	Log \| Files \| Refs \| README \| LICENSE

M	ChangeLog	\|	5	+++++
M	PATCHSETS	\|	1	+
M	configure.ac	\|	2	+-
M	po/es.po	\|	3195	+++++++++++++++++++++++++++++++++++++++----------------------------------------