added 'Empty junk' context menu to Junk folder.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2640 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 397 insertions, 363 deletions

diff --git a/po/es.po b/po/es.po
index 1700d131..0d68dd97 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-02-24 08:05+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -318,7 +318,7 @@ msgstr ""
 "El fichero «%s» ya existe.\n"
 "No puedo crear la carpeta."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -503,11 +503,11 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración guardada.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Filtro de correo basura (manual)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Filtro de correo basura"
 
@@ -652,7 +652,7 @@ msgstr ""
 "junto con este programa; en caso contrario, escriba a la Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -688,7 +688,7 @@ msgstr ""
 "El orden de comprobación de mensajes será éste. Marque las casillas\n"
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -829,8 +829,8 @@ msgstr "Añadir dirección a la agenda"
 msgid "Address"
 msgstr "Dirección"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notas"
 
@@ -838,32 +838,32 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 msgid "Auto-registered address"
 msgstr "Direcciones auto-registradas"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Fichero/Nueva _agenda"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Fichero/Nueva _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Fichero/Nuevo _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -871,190 +871,190 @@ msgstr "/_Fichero/Nuevo servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Fichero/_Editar"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Fichero/_Borrar"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Dirección"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Dirección/Nuevo _grupo"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Dirección/Nueva _carpeta"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Herramientas/Importar fichero _CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/_Pegar"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Buscar:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Añadir"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Buscar"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "_Cerrar"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1063,36 +1063,36 @@ msgstr ""
 "¿Quiere borrar la carpeta Y todas las direcciones en «%s»? \n"
 "Si sólo borra la carpeta las direcciones se moverán a la carpeta padre."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1100,7 +1100,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1108,7 +1108,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1116,7 +1116,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1124,15 +1124,15 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,78 +1143,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Antigua agenda de direcciones convertida, no se pudo guardar el nuevo "
 "fichero índice"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda, pero se crearon nuevos ficheros "
 "vacíos."
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda, no se pudieron crear los ficheros "
 "para la nueva."
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda y no se pudieron crear ficheros para "
 "una nueva."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1226,11 +1226,11 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Aviso"
 
@@ -1277,7 +1277,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Ninguno"
 
@@ -1293,8 +1293,8 @@ msgstr "/_Añadir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -1368,7 +1368,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Ver"
 
@@ -1617,7 +1617,7 @@ msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1658,7 +1658,7 @@ msgstr "¿Enviar realmente este correo a las direcciones siguientes?"
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -1810,7 +1810,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Tamaño"
 
@@ -1940,28 +1940,28 @@ msgstr "Debe especificarse un nombre y un valor"
 msgid "Edit Person Data"
 msgstr "Editar datos personales"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Apodo"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Dirección de correo"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2073,12 +2073,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2095,7 +2095,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2280,193 +2280,199 @@ msgstr "El fichero ya existe. ¿Desea reemplazarlo?"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Basura"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta «%s»."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Crear _nueva carpeta..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Renombrar carpeta..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/_Mover carpeta..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/_Vaciar papelera"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/_Vaciar papelera"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hay mensajes nuevos"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir el árbol de carpetas"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/_Actualizar resumen"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Marcar _todo como leído"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "/_Enviar mensajes en la cola"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Buscar en los mensajes"
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Ed_itar la condición de búsqueda..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Des_cargar"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nuevos"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Total"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Estableciendo la información de la carpeta...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Estableciendo la información de la carpeta..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Se reconstruirá el árbol de carpetas. ¿Continuar?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo el árbol de carpetas..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Fallo al reconstruir el árbol de carpetas."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Basura"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "¿Descargar todos los mensajes bajo «%s»?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Descargar todos los mensajes"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en «%s»."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2476,26 +2482,26 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada «/» al final del nombre)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para «%s»:"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "No se puede renombrar la carpeta «%s»."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2504,11 +2510,11 @@ msgstr ""
 "¿Eliminar la carpeta de búsqueda «%s» ?\n"
 "(Los mensajes no se borrarán)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Borrar carpeta de búsqueda"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2521,20 +2527,30 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede borrar la carpeta «%s»."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "No basura"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "¿Borrar todos los mensajes de la papelera?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2543,34 +2559,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -2583,7 +2599,7 @@ msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Sin remitente)"
 
@@ -2654,112 +2670,112 @@ msgstr "Seleccionar la carpeta a importar"
 msgid "Select importing file"
 msgstr "Seleccionar el fichero a importar"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Especifique el nombre de la agenda y el fichero a importar."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Seleccione y ordene los nombres de campos CSV a importar."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Fichero importado."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Seleccione un fichero."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Debe proporcionar un nombre de agenda de direcciones."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Error leyendo los campos CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "Fichero CSV importado con éxito."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Seleccionar fichero CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Nombre del fichero"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Separados por comas"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Separados por tabuladores"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Campo CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Campo de la agenda"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr "Ordene los campos de la agenda con los botones «Arriba» y «Abajo»"
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Arriba"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Abajo"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Agenda de direcciones :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Nombre de fichero :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Registros :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Importar fichero CSV a la agenda"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Información de fichero"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Campos"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Finalizar"
 
@@ -2937,7 +2953,7 @@ msgstr "Saliendo"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3032,16 +3048,16 @@ msgstr "Contraseña"
 msgid "Protocol log"
 msgstr "Traza del protocolo"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de composición"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3051,23 +3067,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recive los mensajes nuevos"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe nuevos para todas las cuentas"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3075,47 +3091,47 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open idcarpeta/nºmsj abre el mensaje en una ventana nueva"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir nombredir  indicar el directorio con ficheros de configuración"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "  --ipcport numpuerto    especificar el puerto IPC para órdenes remotas"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 finalizar Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta ayuda y finaliza"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              da la información de la versión y finaliza"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Pulse cualquier tecla..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Codificación de los nombres de fichero"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3139,19 +3155,19 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Está componiendo un mensaje. ¿Seguro que quiere salir?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3159,20 +3175,20 @@ msgstr ""
 "GnuPG no esta convenientemente instalado, o es una versión antigua.\n"
 "Soporte para OpenPGP deshabilitado."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Cargando complementos..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "ya hay otro Sylpheed en ejecución.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3514,15 +3530,15 @@ msgstr "/_Ver/Codificación de caract_eres/Chino (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/_Ver/_Todas las cabeceras"
 
@@ -3821,8 +3837,8 @@ msgstr "Creando ventana principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "hecho.\n"
 
@@ -3891,7 +3907,7 @@ msgstr "Sylpheed - Árbol de carpetas"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Responder"
 
@@ -3907,15 +3923,15 @@ msgstr "/Responder al _remitente"
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
@@ -3959,19 +3975,19 @@ msgstr "¿Salir del programa?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "Seleccionar carpeta a abrir"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Opciones de línea de ordenes"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPCIÓN]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4001,7 +4017,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4031,15 +4047,15 @@ msgstr ""
 "muestra esta ayuda y termina\n"
 "muestra la información de la versión y termina"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr ""
@@ -4098,7 +4114,7 @@ msgstr "Adjuntos"
 msgid "Message View - Sylpheed"
 msgstr "Vista de mensaje - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
@@ -4119,7 +4135,7 @@ msgstr "/_Guardar como..."
 msgid "/Save _all..."
 msgstr "/Gu_ardar todo..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
@@ -4509,7 +4525,7 @@ msgstr "Entrada directa"
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
@@ -4761,7 +4777,7 @@ msgstr " Ayuda sintaxis "
 msgid "Registered actions"
 msgstr "Acciones registradas"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nueva)"
 
@@ -6115,28 +6131,28 @@ msgstr "Tipo"
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "No mostrar [...] o (...) al inicio del asunto en el resumen"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Borrar [...] o (...) al inicio del asunto al responder"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Aplicar en subcarpetas"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "utilizar también al responder"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
@@ -6172,19 +6188,19 @@ msgstr "Adjunto"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Fecha"
 
@@ -6194,7 +6210,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "Para"
 
@@ -6214,43 +6230,61 @@ msgstr ""
 "Seleccione los elementos a mostrar en el resumen. Puede modificar\n"
 "el orden utilizando los botones «Arriba» y «Abajo» o arrastrándolos."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Nombre de plantilla"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Registrar"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Sustituir "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Símbolos "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Plantillas registradas"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Plantillas"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Nombre de plantilla"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Nombre de plantilla"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Error de formato en la plantilla."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Borrar plantilla"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 
@@ -6484,7 +6518,7 @@ msgstr "Buscando %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Buscando %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
@@ -6581,7 +6615,7 @@ msgstr "A_cerca de"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - Buzón remoto POP3"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "No."
 
@@ -7143,7 +7177,7 @@ msgstr "Obteniendo la lista de grupos..."
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Hecho."
 
@@ -7152,344 +7186,344 @@ msgstr "Hecho."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de noticias recibidos (%s leídos)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Respon_der a"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Respon_der a/A _todos"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Respon_der a/Al _remitente"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Respon_der a/A la _lista de correo"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Mover..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Copiar..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Marcar"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Marcar/_Marcar"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Marcar/_Desmarcar"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _no leído"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _leído"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Marcar/Marcar _hilo como leído"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcar/Marca_r todos leídos"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/E_tiquetar de color"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Poner como correo _basura"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Poner como correo no bas_ura"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Re_editar"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Añadir _remitente a la agenda..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Crear regla de f_iltrado"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Crear regla de f_iltrado/_Automáticamente"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Crear regla de f_iltrado/Basada en _Desde"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crear regla de f_iltrado/Basada en _Para"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crear regla de f_iltrado/Basada en el _Asunto"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Revisando carpeta (%s) (%d)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Queda alguna marca. ¿Procesarla?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "No puedo establecer la conexión IMAP4.\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "_Buscar de nuevo"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "No hay más mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por asunto..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevos, %d no leídos, %d totales (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuevos, %d no leídos, %d totales"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Ordenando cabeceras..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tExtrayendo cabeceras de los mensajes..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Resumiendo los mensajes..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "Seleccionar carpeta a mover"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "El destino de la copia es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "Seleccionar carpeta a copiar"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."