[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-524-gcfb7606

ticho at claws-mail.org ticho at claws-mail.org
Sat Dec 15 18:51:48 CET 2018


The branch, gtk3 has been updated
       via  cfb7606882f867569b983ce66b64b1362fb87d6e (commit)
       via  a8d84bd455fd5d2a2bc26975fc834abeb2c20787 (commit)
       via  ab0b831cbd7ec6c8cf6f70f9271279dd226fb93f (commit)
       via  cd661fe56847a42023dbdb9ecb4d7315a3c757af (commit)
       via  8beb748646ec967ea5985a5d5ab640b673893d85 (commit)
       via  72538a866b81b1cc0b72476739d00aad0a8b4108 (commit)
       via  a3214e0d0d5e53410726a42e9e6f9df5bc655d59 (commit)
       via  cc6511ccf55570ec49278562ea1ab2b65cc408ff (commit)
       via  c4e727f316d89b6af20c068d78158b2b2e0e5aea (commit)
       via  2ee0241445cd46625b29a08c87497d2fe6550720 (commit)
       via  83d08a08ca6c8fa43423e2221b43debe4c655334 (commit)
       via  5e584dc8515ce4ddb54161f92796f6617b9422b2 (commit)
       via  4a00f71a540834421d3317051123fc81b8310cbd (commit)
       via  5aacb361658d2296312ad8b336322e25174fdea9 (commit)
       via  d4c9be8f9e1cd2dde13e659ea39ecc9089e45810 (commit)
       via  4669bbaa0f23d4f65d1b73076ee73da51b30d7cc (commit)
       via  094455836c6abb30e4aee50ef5693e80af06b37b (commit)
       via  cf7dbc82310f02de862d848b2551b1fb560c1766 (commit)
       via  c5d8e25ea1b70c3693df87e4e610ba5e1b9d469c (commit)
      from  10c21676f0214b86dc51714d524c9e1cfbded9fb (commit)

Summary of changes:
 AUTHORS                                            |    1 +
 NEWS                                               |   99 +
 README                                             |   99 +-
 RELEASE_NOTES                                      |  104 +-
 configure.ac                                       |    2 +-
 po/es.po                                           | 5554 +++++++++----------
 po/fr.po                                           | 5618 ++++++++++----------
 src/Makefile.am                                    |    3 -
 src/account.c                                      |    8 +-
 src/action.c                                       |    4 +-
 src/addr_compl.c                                   |    2 +-
 src/addressbook.c                                  |    4 +-
 src/addrharvest.c                                  |    2 +-
 src/addrmerge.c                                    |   10 +-
 src/common/codeconv.c                              |    2 +-
 src/common/tests/Makefile.am                       |    4 +
 src/common/tests/utils_get_uri_part_test.c         |  125 +
 src/common/tlds.h                                  |    8 +-
 src/common/utils.c                                 |   25 +-
 src/common/utils.h                                 |    4 -
 src/common/xml.c                                   |    2 +-
 src/compose.c                                      |    8 +-
 src/folder.c                                       |   22 +-
 src/foldersel.c                                    |    2 +-
 src/gtk/authors.h                                  |    1 +
 src/gtk/gtkaspell.c                                |   10 +-
 src/imap.c                                         |    8 +-
 src/ldapctrl.c                                     |    2 +-
 src/main.c                                         |    4 +-
 src/mainwindow.c                                   |    2 +-
 src/mh.c                                           |    2 +-
 src/news.c                                         |    8 +
 src/news_gtk.c                                     |    2 +-
 src/plugins/gdata/cm_gdata_contacts.c              |   12 +-
 src/plugins/notification/claws.def                 |    1 -
 src/plugins/notification/notification_command.c    |    2 +-
 src/plugins/notification/notification_core.c       |    4 +-
 .../notification/notification_foldercheck.c        |   24 +-
 src/plugins/notification/notification_popup.c      |    2 +-
 src/plugins/notification/notification_trayicon.c   |    2 +-
 src/plugins/vcalendar/claws.def                    |    1 -
 src/plugins/vcalendar/vcal_manager.c               |    4 +-
 src/prefs_customheader.c                           |    4 +-
 src/prefs_folder_item.c                            |    2 +-
 src/prefs_themes.c                                 |    8 +-
 src/procmime.c                                     |    2 +-
 src/stock_pixmap.c                                 |    2 +-
 src/summaryview.c                                  |   10 +-
 src/textview.c                                     |    2 +-
 src/wizard.c                                       |    4 +-
 tools/claws.i18n.status.pl                         |    4 +-
 51 files changed, 6171 insertions(+), 5670 deletions(-)
 create mode 100644 src/common/tests/utils_get_uri_part_test.c


- Log -----------------------------------------------------------------
commit cfb7606882f867569b983ce66b64b1362fb87d6e
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Dec 15 18:32:05 2018 +0100

    Remove strstr2() in favour of g_strstr_len()

diff --git a/src/action.c b/src/action.c
index 84bf850..cea5410 100644
--- a/src/action.c
+++ b/src/action.c
@@ -704,7 +704,7 @@ static gboolean execute_filtering_actions(gchar *action, GSList *msglist)
 		mainwin = mainwindow_get_mainwindow();
 	}
 
-	if (NULL == (sbegin = strstr2(action, "%as{")))
+	if (NULL == (sbegin = g_strstr_len(action, -1, "%as{")))
 		return FALSE;
 	sbegin += sizeof "%as{" - 1;
 	if (NULL == (send = strrchr(sbegin, '}')))
diff --git a/src/common/utils.c b/src/common/utils.c
index aa29659..b9a6f95 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -218,14 +218,6 @@ gchar *to_human_readable(goffset size)
 	}
 }
 
-/* strstr with NULL-checking */
-gchar *strstr2(const gchar *s1, const gchar *s2)
-{
-	if (s1 == NULL || s2 == NULL)
-		return NULL;
-	else
-		return strstr(s1, s2);
-}
 /* compare paths */
 gint path_cmp(const gchar *s1, const gchar *s2)
 {
diff --git a/src/common/utils.h b/src/common/utils.h
index d891b41..445d1e3 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -271,8 +271,6 @@ gchar *itos			(gint	      n);
 gchar *to_human_readable	(goffset      size);
 
 /* alternative string functions */
-gchar *strstr2		(const gchar	*s1,
-			 const gchar	*s2);
 gint path_cmp		(const gchar	*s1,
 			 const gchar	*s2);
 gchar *strretchomp	(gchar		*str);

commit a8d84bd455fd5d2a2bc26975fc834abeb2c20787
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Dec 15 18:25:59 2018 +0100

    Get rid of our strcmp2() in favour of glib's g_strcmp0()

diff --git a/src/account.c b/src/account.c
index 6f8521e..1ffe464 100644
--- a/src/account.c
+++ b/src/account.c
@@ -295,8 +295,8 @@ PrefsAccount *account_find_from_smtp_server(const gchar *address,
 
 	for (cur = account_list; cur != NULL; cur = cur->next) {
 		ac = (PrefsAccount *)cur->data;
-		if (!strcmp2(address, ac->address) &&
-		    !strcmp2(smtp_server, ac->smtp_server))
+		if (!g_strcmp0(address, ac->address) &&
+		    !g_strcmp0(smtp_server, ac->smtp_server))
 			return ac;
 	}
 
@@ -485,7 +485,7 @@ void account_open(PrefsAccount *ac_prefs, gboolean called_from_acc_list)
 		if (!prev_default && ac_prefs->is_default)
 			account_set_as_default(ac_prefs);
 
-		if (ac_prefs->folder && strcmp2(ac_name, ac_prefs->account_name) != 0) {
+		if (ac_prefs->folder && g_strcmp0(ac_name, ac_prefs->account_name) != 0) {
 			old_prefix = folder_get_identifier(FOLDER(ac_prefs->folder));
 			folder_set_name(FOLDER(ac_prefs->folder),
 					ac_prefs->account_name);
@@ -1950,7 +1950,7 @@ void account_signatures_matchlist_create(void)
 
 		if (ac_prefs->sig_sep && *ac_prefs->sig_sep != '\0') {
 			if (!g_slist_find_custom(account_signatures_list, ac_prefs->sig_sep,
-					(GCompareFunc)strcmp2)) {
+					(GCompareFunc)g_strcmp0)) {
 				account_signatures_list = g_slist_prepend(account_signatures_list,
 						g_strdup(ac_prefs->sig_sep));
 			}
diff --git a/src/action.c b/src/action.c
index af62f37..84bf850 100644
--- a/src/action.c
+++ b/src/action.c
@@ -489,7 +489,7 @@ static GtkWidget *find_item_in_menu(GtkWidget *menu, gchar *name)
 	while (amenu) {
 		GtkWidget *item = GTK_WIDGET(amenu->data);
 		if ((existing_name = g_object_get_data(G_OBJECT(item), "s_name")) != NULL &&
-		    !strcmp2(name, existing_name))
+		    !g_strcmp0(name, existing_name))
 		{
 			g_list_free(children);
 			 return item;
diff --git a/src/addr_compl.c b/src/addr_compl.c
index 713fd50..82e17f3 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -442,7 +442,7 @@ guint start_address_completion(gchar *folderpath)
 	gboolean different_book = FALSE;
 	clear_completion_cache();
 
-	if (strcmp2(completion_folder_path,folderpath))
+	if (g_strcmp0(completion_folder_path,folderpath))
 		different_book = TRUE;
 
 	g_free(completion_folder_path);
diff --git a/src/addressbook.c b/src/addressbook.c
index 3e2ccbd..b69b651 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -3161,7 +3161,7 @@ static ItemFolder * addressbook_setup_subf(
 		GList *cur = children;
 		for (; cur; cur = cur->next) {
 			ItemFolder *child = (ItemFolder *) cur->data;
-			if (!strcmp2(ADDRITEM_NAME(child), title)) {
+			if (!g_strcmp0(ADDRITEM_NAME(child), title)) {
 				nNode = gtk_cmctree_find_by_row_data_custom(
 					ctree, NULL, child,
 					addressbook_treenode_find_folder_cb );
@@ -3408,7 +3408,7 @@ static void addressbook_edit_address_post_cb( ItemPerson *person )
 		AddressBookFile *abf = addressbook_get_book_file();
 
 		if (abf && abf->type == ADBOOKTYPE_LDAP) {
-			if (strcmp2(person->nickName, ADDRITEM_NAME(person)))
+			if (g_strcmp0(person->nickName, ADDRITEM_NAME(person)))
 				addritem_person_set_nick_name( person, ADDRITEM_NAME(person));
 		}
 #endif
diff --git a/src/addrmerge.c b/src/addrmerge.c
index 6aa8315..767dc66 100644
--- a/src/addrmerge.c
+++ b/src/addrmerge.c
@@ -133,7 +133,7 @@ static void addrmerge_do_merge(struct AddrMergePage *page)
 
 		if( person ) {
 			gchar *filename = addritem_person_get_picture(person);
-			if ((strcmp2(person->picture, target->picture) &&
+			if ((g_strcmp0(person->picture, target->picture) &&
 					filename && is_file_exist(filename)))
 				claws_unlink(filename);
 			if (filename)
@@ -461,10 +461,10 @@ void addrmerge_merge(
 			nameTarget = person;
 		} else if (nameTarget == person) {
 			continue;
-		} else if (strcmp2(person->firstName, nameTarget->firstName) ||
-				strcmp2(person->lastName, nameTarget->lastName) ||
-				strcmp2(person->nickName, nameTarget->nickName) ||
-				strcmp2(ADDRITEM_NAME(person), ADDRITEM_NAME(nameTarget))) {
+		} else if (g_strcmp0(person->firstName, nameTarget->firstName) ||
+				g_strcmp0(person->lastName, nameTarget->lastName) ||
+				g_strcmp0(person->nickName, nameTarget->nickName) ||
+				g_strcmp0(ADDRITEM_NAME(person), ADDRITEM_NAME(nameTarget))) {
 			pickName = TRUE;
 			break;
 		}
diff --git a/src/common/codeconv.c b/src/common/codeconv.c
index 9b59e7d..1922f00 100644
--- a/src/common/codeconv.c
+++ b/src/common/codeconv.c
@@ -844,7 +844,7 @@ gchar *conv_codeset_strdup(const gchar *inbuf,
 
 	cm_return_val_if_fail(inbuf != NULL, NULL);
 
-	if (!strcmp2(src_code, dest_code)) {
+	if (!g_strcmp0(src_code, dest_code)) {
 		CharSet dest_charset = conv_get_charset_from_str(dest_code);
 		if (codeconv_strict_mode && dest_charset == C_UTF_8) {
 			/* ensure valid UTF-8 if target is UTF-8 */
diff --git a/src/common/utils.c b/src/common/utils.c
index 5774c4d..aa29659 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -218,14 +218,6 @@ gchar *to_human_readable(goffset size)
 	}
 }
 
-/* strcmp with NULL-checking */
-gint strcmp2(const gchar *s1, const gchar *s2)
-{
-	if (s1 == NULL || s2 == NULL)
-		return -1;
-	else
-		return strcmp(s1, s2);
-}
 /* strstr with NULL-checking */
 gchar *strstr2(const gchar *s1, const gchar *s2)
 {
@@ -840,7 +832,7 @@ GList *add_history(GList *list, const gchar *str)
 
 	cm_return_val_if_fail(str != NULL, list);
 
-	old = g_list_find_custom(list, (gpointer)str, (GCompareFunc)strcmp2);
+	old = g_list_find_custom(list, (gpointer)str, (GCompareFunc)g_strcmp0);
 	if (old) {
 		oldstr = old->data;
 		list = g_list_remove(list, old->data);
diff --git a/src/common/utils.h b/src/common/utils.h
index dfb327f..d891b41 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -271,8 +271,6 @@ gchar *itos			(gint	      n);
 gchar *to_human_readable	(goffset      size);
 
 /* alternative string functions */
-gint strcmp2		(const gchar	*s1,
-			 const gchar	*s2);
 gchar *strstr2		(const gchar	*s1,
 			 const gchar	*s2);
 gint path_cmp		(const gchar	*s1,
diff --git a/src/common/xml.c b/src/common/xml.c
index 5ed7597..17f1a9f 100644
--- a/src/common/xml.c
+++ b/src/common/xml.c
@@ -196,7 +196,7 @@ gint xml_get_dtd(XMLFile *file)
 			extract_quote(bufp, '"');
 			file->encoding = g_strdup(bufp);
 			file->need_codeconv =
-				strcmp2(bufp, CS_INTERNAL);
+				g_strcmp0(bufp, CS_INTERNAL);
 		} else {
 			file->encoding = g_strdup(CS_INTERNAL);
 			file->need_codeconv = FALSE;
diff --git a/src/compose.c b/src/compose.c
index da1a273..3ec9ce7 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -4333,7 +4333,7 @@ static gboolean compose_join_next_line(Compose *compose,
 	next_quote_str = compose_get_quote_str(buffer, &iter_, &quote_len);
 
 	if ((quote_str || next_quote_str) &&
-	    strcmp2(quote_str, next_quote_str) != 0) {
+	    g_strcmp0(quote_str, next_quote_str) != 0) {
 		g_free(next_quote_str);
 		return FALSE;
 	}
@@ -6455,7 +6455,7 @@ static int compose_add_attachments(Compose *compose, MimeInfo *parent)
 		}
 		if (ainfo->name && mimepart->type != MIMETYPE_MESSAGE) {
 			if (mimepart->type == MIMETYPE_APPLICATION && 
-			   !strcmp2(mimepart->subtype, "octet-stream"))
+			   !g_strcmp0(mimepart->subtype, "octet-stream"))
 				g_hash_table_insert(mimepart->typeparameters,
 						g_strdup("name"), g_strdup(ainfo->name));
 			g_hash_table_insert(mimepart->dispositionparameters,
@@ -9487,11 +9487,11 @@ static void compose_attach_property_create(gboolean *cancelled)
 
 		tmp = g_strdup_printf("%s/%s", type->type, type->sub_type);
 
-		if (g_list_find_custom(strlist, tmp, (GCompareFunc)strcmp2))
+		if (g_list_find_custom(strlist, tmp, (GCompareFunc)g_strcmp0))
 			g_free(tmp);
 		else
 			strlist = g_list_insert_sorted(strlist, (gpointer)tmp,
-					(GCompareFunc)strcmp2);
+					(GCompareFunc)g_strcmp0);
 	}
 
 	for (mime_type_list = strlist; mime_type_list != NULL; 
diff --git a/src/folder.c b/src/folder.c
index ea240d3..1637ea0 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -844,7 +844,7 @@ gint folder_read_list(void)
 	if (!node) return -1;
 
 	xmlnode = node->data;
-	if (strcmp2(xmlnode->tag->tag, "folderlist") != 0) {
+	if (g_strcmp0(xmlnode->tag->tag, "folderlist") != 0) {
 		g_warning("wrong folder list");
 		xml_free_tree(node);
 		return -1;
@@ -1280,7 +1280,7 @@ Folder *folder_find_from_name(const gchar *name, FolderClass *klass)
 	for (list = folder_list; list != NULL; list = list->next) {
 		folder = list->data;
 		if (folder->klass == klass && 
-		    strcmp2(name, folder->name) == 0)
+		    g_strcmp0(name, folder->name) == 0)
 			return folder;
 	}
 
@@ -1366,7 +1366,7 @@ FolderItem *folder_find_child_item_by_name(FolderItem *item, const gchar *name)
 
 	for (node = item->node->children; node != NULL; node = node->next) {
 		child = FOLDER_ITEM(node->data);
-		if (strcmp2(child->name, name) == 0) {
+		if (g_strcmp0(child->name, name) == 0) {
 			return child;
 		}
 	}
@@ -1592,23 +1592,23 @@ gchar *folder_item_get_name(FolderItem *item)
 
 	switch (item->stype) {
 	case F_INBOX:
-		name = g_strdup(!strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
+		name = g_strdup(!g_strcmp0(item->name, INBOX_DIR) ? _("Inbox") :
 				item->name);
 		break;
 	case F_OUTBOX:
-		name = g_strdup(!strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
+		name = g_strdup(!g_strcmp0(item->name, OUTBOX_DIR) ? _("Sent") :
 				item->name);
 		break;
 	case F_QUEUE:
-		name = g_strdup(!strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
+		name = g_strdup(!g_strcmp0(item->name, QUEUE_DIR) ? _("Queue") :
 				item->name);
 		break;
 	case F_TRASH:
-		name = g_strdup(!strcmp2(item->name, TRASH_DIR) ? _("Trash") :
+		name = g_strdup(!g_strcmp0(item->name, TRASH_DIR) ? _("Trash") :
 				item->name);
 		break;
 	case F_DRAFT:
-		name = g_strdup(!strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
+		name = g_strdup(!g_strcmp0(item->name, DRAFT_DIR) ? _("Drafts") :
 				item->name);
 		break;
 	default:
@@ -1624,7 +1624,7 @@ gchar *folder_item_get_name(FolderItem *item)
 			name = g_strconcat(item->name, " (", item->folder->klass->uistr, ")", NULL);
 		} else {
 			if (FOLDER_CLASS(item->folder) == news_get_class() &&
-			    item->path && !strcmp2(item->name, item->path))
+			    item->path && !g_strcmp0(item->name, item->path))
 				name = get_abbrev_newsgroup_name
 					(item->path,
 					 prefs_common.ng_abbrev_len);
@@ -4073,7 +4073,7 @@ static gpointer xml_to_folder_item(gpointer nodedata, gpointer data)
 	cm_return_val_if_fail(xmlnode != NULL, NULL);
 	cm_return_val_if_fail(folder != NULL, NULL);
 
-	if (strcmp2(xmlnode->tag->tag, "folderitem") != 0) {
+	if (g_strcmp0(xmlnode->tag->tag, "folderitem") != 0) {
 		g_warning("tag name != \"folderitem\"");
 		return NULL;
 	}
@@ -4121,7 +4121,7 @@ static Folder *folder_get_from_xml(GNode *node)
 	cm_return_val_if_fail(node->data != NULL, NULL);
 
 	xmlnode = node->data;
-	if (strcmp2(xmlnode->tag->tag, "folder") != 0) {
+	if (g_strcmp0(xmlnode->tag->tag, "folder") != 0) {
 		g_warning("tag name != \"folder\"");
 		return NULL;
 	}
diff --git a/src/foldersel.c b/src/foldersel.c
index 82e9c90..a90f01c 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -483,7 +483,7 @@ static void foldersel_set_tree(Folder *cur_folder, FolderSelectionType type)
 		}
 		
 		if (cur_folder && (cur_folder->klass != folder->klass
-		    && strcmp2(cur_folder->name, folder->name) != 0))
+		    && g_strcmp0(cur_folder->name, folder->name) != 0))
 		    continue;
 		
 		foldersel_insert_gnode_in_store(tree_store, folder->node, NULL);
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index 83830fe..0b10001 100644
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -1742,7 +1742,7 @@ gint gtkaspell_set_dictionary_menu_active_item(GtkComboBox *combo,
 				   SET_GTKASPELL_FULLNAME, &dict_name,
 				   -1);
 		
-		if ((dict_name != NULL) && !strcmp2(dict_name, dictionary)) {
+		if ((dict_name != NULL) && !g_strcmp0(dict_name, dictionary)) {
 			gtk_combo_box_set_active_iter(combo, &iter);
 			g_free(dict_name);
 			return 1;
@@ -1821,7 +1821,7 @@ static GtkWidget *make_dictionary_list_submenu(GtkAspell *gtkaspell)
 		item = gtk_check_menu_item_new_with_label(dict->fullname);
 		g_object_set_data(G_OBJECT(item), "dict_name",
 				  dict->dictname); 
-		if (strcmp2(dict->fullname,
+		if (g_strcmp0(dict->fullname,
 		    gtkaspell->gtkaspeller->dictionary->fullname))
 			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), FALSE);
 		else {
@@ -2228,7 +2228,7 @@ static void change_dict_cb(GtkWidget *w, GtkAspell *gtkaspell)
   
         fullname = (gchar *) g_object_get_data(G_OBJECT(w), "dict_name");
 	
-	if (!strcmp2(fullname, _("None")))
+	if (!g_strcmp0(fullname, _("None")))
 		return;
 
 	gtkaspell_change_dict(gtkaspell, fullname, TRUE);
@@ -2314,9 +2314,9 @@ static gint compare_dict(Dictionary *a, Dictionary *b)
 		return (aparts < bparts) ? -1 : +1;
 	else {
 		gint compare;
-		compare = strcmp2(a->dictname, b->dictname);
+		compare = g_strcmp0(a->dictname, b->dictname);
 		if (!compare)
-			compare = strcmp2(a->fullname, b->fullname);
+			compare = g_strcmp0(a->fullname, b->fullname);
 		return compare;
 	}
 }
diff --git a/src/imap.c b/src/imap.c
index 1e98aac..9b78b79 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -2709,7 +2709,7 @@ static gint imap_scan_tree_real(Folder *folder, gboolean subs_only)
 	}
 
 	if (!item || ((item->path || root_folder) &&
-		      strcmp2(item->path, root_folder) != 0)) {
+		      g_strcmp0(item->path, root_folder) != 0)) {
 		folder_tree_destroy(folder);
 		item = folder_item_new(folder, folder->name, root_folder);
 		item->folder = folder;
@@ -2806,7 +2806,7 @@ static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item, gbo
 		new_item = NULL;
 		for (cur = item_list; cur != NULL; cur = cur->next) {
 			FolderItem *cur_item = FOLDER_ITEM(cur->data);
-			if (!strcmp2(old_item->path, cur_item->path)) {
+			if (!g_strcmp0(old_item->path, cur_item->path)) {
 				new_item = cur_item;
 				break;
 			}
@@ -2839,7 +2839,7 @@ static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item, gbo
 
 		for (node = item->node->children; node != NULL;
 		     node = node->next) {
-			if (!strcmp2(FOLDER_ITEM(node->data)->path,
+			if (!g_strcmp0(FOLDER_ITEM(node->data)->path,
 				     cur_item->path)) {
 				new_item = FOLDER_ITEM(node->data);
 				folder_item_destroy(cur_item);
@@ -2987,7 +2987,7 @@ GList *imap_scan_subtree(Folder *folder, FolderItem *item, gboolean unsubs_only,
 			}
 			folder_item_destroy(cur_item);
 			oldlitem = g_list_find_custom(
-					child_list, tmp, (GCompareFunc)strcmp2);
+					child_list, tmp, (GCompareFunc)g_strcmp0);
 			if (oldlitem) {
 				child_list = g_list_remove_link(child_list, oldlitem);
 				g_free(oldlitem->data);
diff --git a/src/ldapctrl.c b/src/ldapctrl.c
index 2bba4f6..2a67c62 100644
--- a/src/ldapctrl.c
+++ b/src/ldapctrl.c
@@ -633,7 +633,7 @@ char **ldapctl_full_attribute_array( LdapControl *ctl ) {
 	
 	while (node) {
 		if( g_list_find_custom(tmp, (gpointer)def->data, 
-				(GCompareFunc)strcmp2) == NULL) {
+				(GCompareFunc)g_strcmp0) == NULL) {
 			tmp = g_list_append(tmp, g_strdup(node->data));
 		}
 		node = node->next;
diff --git a/src/main.c b/src/main.c
index fcfaa00..0241d1e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2459,7 +2459,7 @@ static gint prohibit_duplicate_launch(void)
 		memset(buf, 0, sizeof(buf));
 		fd_gets(uxsock, buf, sizeof(buf) - 1);
 		buf[sizeof(buf) - 1] = '\0';
-		if (strcmp2(buf, x_display)) {
+		if (g_strcmp0(buf, x_display)) {
 			g_print("Claws Mail is already running on display %s.\n",
 				buf);
 		} else {
@@ -2566,7 +2566,7 @@ static void lock_socket_input_cb(gpointer data,
 		while (fd_gets(sock, buf, sizeof(buf) - 1) > 0) {
 			buf[sizeof(buf) - 1] = '\0';
 			strretchomp(buf);
-			if (!strcmp2(buf, "."))
+			if (!g_strcmp0(buf, "."))
 				break;
 
 			ainfo = g_new0(AttachInfo, 1);
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 8609ecc..a5ad013 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3393,7 +3393,7 @@ static gint mailing_list_create_submenu (MainWindow *mainwin, MsgInfo *msginfo)
 	}
 		
 	/* Mailing list post */
-	if (!strcmp2 (msginfo->extradata->list_post, "NO")) {
+	if (!g_strcmp0 (msginfo->extradata->list_post, "NO")) {
 		g_free(msginfo->extradata->list_post);
 		msginfo->extradata->list_post = g_strdup (_("No posting allowed"));
  	}
diff --git a/src/mh.c b/src/mh.c
index e7d0d6c..0500ada 100644
--- a/src/mh.c
+++ b/src/mh.c
@@ -1204,7 +1204,7 @@ static void mh_scan_tree_recursive(FolderItem *item)
 			for (node = node->children; node != NULL; node = node->next) {
 				FolderItem *cur_item = FOLDER_ITEM(node->data);
 				gchar *curpath = folder_item_get_path(cur_item);
-				if (!strcmp2(curpath, entry)) {
+				if (!g_strcmp0(curpath, entry)) {
 					new_item = cur_item;
 					g_free(curpath);
 					break;
diff --git a/src/news_gtk.c b/src/news_gtk.c
index cc9236f..15e1804 100644
--- a/src/news_gtk.c
+++ b/src/news_gtk.c
@@ -138,7 +138,7 @@ static FolderItem *news_find_child_item(FolderItem *item, const gchar *path)
 
 	for (node = item->node->children; node != NULL; node = node->next) {
 		child = FOLDER_ITEM(node->data);
-		if (strcmp2(child->path, path) == 0) {
+		if (g_strcmp0(child->path, path) == 0) {
 			return child;
 		}
 	}
diff --git a/src/plugins/gdata/cm_gdata_contacts.c b/src/plugins/gdata/cm_gdata_contacts.c
index 63531b0..c2aa1b6 100644
--- a/src/plugins/gdata/cm_gdata_contacts.c
+++ b/src/plugins/gdata/cm_gdata_contacts.c
@@ -723,7 +723,7 @@ void cm_gdata_load_contacts_cache_from_file(void)
   xmlnode = rootnode->data;
 
   /* Check that root entry is "gdata" */
-  if(strcmp2(xmlnode->tag->tag, "gdata") != 0) {
+  if(g_strcmp0(xmlnode->tag->tag, "gdata") != 0) {
     g_warning("wrong gdata cache file");
     xml_free_tree(rootnode);
     return;
@@ -733,7 +733,7 @@ void cm_gdata_load_contacts_cache_from_file(void)
     GList *attributes;
     xmlnode = childnode->data;
 
-    if(strcmp2(xmlnode->tag->tag, "contacts") != 0)
+    if(g_strcmp0(xmlnode->tag->tag, "contacts") != 0)
       continue;
 
     for(contactnode = childnode->children; contactnode; contactnode = contactnode->next)
@@ -748,13 +748,13 @@ void cm_gdata_load_contacts_cache_from_file(void)
         XMLAttr *attr = attributes->data;
 
         if(attr && attr->name && attr->value) {
-          if(!strcmp2(attr->name, "full_name"))
+          if(!g_strcmp0(attr->name, "full_name"))
             cached_contact->full_name = g_strdup(attr->value);
-          else if(!strcmp2(attr->name, "given_name"))
+          else if(!g_strcmp0(attr->name, "given_name"))
             cached_contact->given_name = g_strdup(attr->value);
-          else if(!strcmp2(attr->name, "family_name"))
+          else if(!g_strcmp0(attr->name, "family_name"))
             cached_contact->family_name = g_strdup(attr->value);
-          else if(!strcmp2(attr->name, "address"))
+          else if(!g_strcmp0(attr->name, "address"))
             cached_contact->address = g_strdup(attr->value);
         }
       }
diff --git a/src/plugins/notification/claws.def b/src/plugins/notification/claws.def
index fdc2ab6..806486d 100644
--- a/src/plugins/notification/claws.def
+++ b/src/plugins/notification/claws.def
@@ -65,7 +65,6 @@ procmsg_get_message_file_path
 procmsg_msg_list_free
 stock_pixbuf_gdk
 stock_pixbuf_gdk follow
-strcmp2
 xml_attr_new
 xml_file_put_xml_decl
 xml_free_tree
diff --git a/src/plugins/notification/notification_command.c b/src/plugins/notification/notification_command.c
index c7a1806..bda5717 100644
--- a/src/plugins/notification/notification_command.c
+++ b/src/plugins/notification/notification_command.c
@@ -71,7 +71,7 @@ void notification_command_msg(MsgInfo *msginfo)
       FolderItem *list_item = (FolderItem*) list->data;
       
       list_identifier = folder_item_get_identifier(list_item);
-      if(!strcmp2(list_identifier, identifier))
+      if(!g_strcmp0(list_identifier, identifier))
 	found = TRUE;
 
       g_free(list_identifier);
diff --git a/src/plugins/notification/notification_core.c b/src/plugins/notification/notification_core.c
index d7e9820..3751fd3 100644
--- a/src/plugins/notification/notification_core.c
+++ b/src/plugins/notification/notification_core.c
@@ -187,7 +187,7 @@ void notification_core_get_msg_count_of_foldername(gchar *foldername, Notificati
 
   for(list = folder_get_list(); list != NULL; list = list->next) {
     walk_folder = list->data;
-    if(strcmp2(foldername, walk_folder->name) == 0) {
+    if(g_strcmp0(foldername, walk_folder->name) == 0) {
       folder = walk_folder;
       break;
     }
@@ -539,7 +539,7 @@ static gboolean notification_traverse_collect(GNode *node, gpointer data)
     for(walk = cdata->folder_items; walk != NULL; walk = g_slist_next(walk)) {
       list_item = walk->data;
       folder_id_list = folder_item_get_identifier(list_item);
-      eq = !strcmp2(folder_id_list,folder_id_cur);
+      eq = !g_strcmp0(folder_id_list,folder_id_cur);
       g_free(folder_id_list);
       if(eq) {
 	folder_in_list = TRUE;
diff --git a/src/plugins/notification/notification_foldercheck.c b/src/plugins/notification/notification_foldercheck.c
index f53537d..7e4d10c 100644
--- a/src/plugins/notification/notification_foldercheck.c
+++ b/src/plugins/notification/notification_foldercheck.c
@@ -150,7 +150,7 @@ guint notification_register_folder_specific_list(gchar *node_name)
   while(ii < specific_folder_array_size) {
     entry = g_array_index(specific_folder_array,SpecificFolderArrayEntry*,ii);
     if(entry) {
-      if(!strcmp2(entry->name,node_name))
+      if(!g_strcmp0(entry->name,node_name))
 	return ii;
     }
     ii++;
@@ -328,7 +328,7 @@ gboolean notification_foldercheck_read_array(void)
   xmlnode = rootnode->data;
 
   /* Check that root entry is "foldercheckarray" */
-  if(strcmp2(xmlnode->tag->tag, "foldercheckarray") != 0) {
+  if(g_strcmp0(xmlnode->tag->tag, "foldercheckarray") != 0) {
     g_warning("wrong foldercheck array file");
     xml_free_tree(rootnode);
     return FALSE;
@@ -342,7 +342,7 @@ gboolean notification_foldercheck_read_array(void)
     SpecificFolderArrayEntry *entry = NULL;
 
     xmlnode = branchnode->data;
-    if(strcmp2(xmlnode->tag->tag, "branch") != 0) {
+    if(g_strcmp0(xmlnode->tag->tag, "branch") != 0) {
       g_warning("tag name != \"branch\"");
       return FALSE;
     }
@@ -352,7 +352,7 @@ gboolean notification_foldercheck_read_array(void)
     for(; list != NULL; list = list->next) {
       XMLAttr *attr = list->data;
 
-      if(attr && attr->name && attr->value &&  !strcmp2(attr->name, "name")) {
+      if(attr && attr->name && attr->value &&  !g_strcmp0(attr->name, "name")) {
 	id = notification_register_folder_specific_list(attr->value);
 	entry = foldercheck_get_entry_from_id(id);
 	/* We have found something */
@@ -376,7 +376,7 @@ gboolean notification_foldercheck_read_array(void)
 
       /* Check if tag is "folderitem" */
       xmlnode = node->data;
-      if(strcmp2(xmlnode->tag->tag, "folderitem") != 0) {
+      if(g_strcmp0(xmlnode->tag->tag, "folderitem") != 0) {
 	g_warning("tag name != \"folderitem\"");
 	continue; /* to next node in branch */
       }
@@ -387,7 +387,7 @@ gboolean notification_foldercheck_read_array(void)
 	XMLAttr *attr = list->data;
 
 	if(attr && attr->name && attr->value &&
-	   !strcmp2(attr->name, "identifier")) {
+	   !g_strcmp0(attr->name, "identifier")) {
 	  item = folder_find_item_from_identifier(attr->value);
 	  break;
 	}
@@ -779,23 +779,23 @@ static void foldercheck_append_item(GtkTreeStore *store, FolderItem *item,
   if (item->stype != F_NORMAL && FOLDER_IS_LOCAL(item->folder)) {
     switch (item->stype) {
     case F_INBOX:
-      if (!strcmp2(item->name, INBOX_DIR))
+      if (!g_strcmp0(item->name, INBOX_DIR))
 	name = "Inbox";
       break;
     case F_OUTBOX:
-      if (!strcmp2(item->name, OUTBOX_DIR))
+      if (!g_strcmp0(item->name, OUTBOX_DIR))
 	name = "Sent";
       break;
     case F_QUEUE:
-      if (!strcmp2(item->name, QUEUE_DIR))
+      if (!g_strcmp0(item->name, QUEUE_DIR))
 	name = "Queue";
       break;
     case F_TRASH:
-      if (!strcmp2(item->name, TRASH_DIR))
+      if (!g_strcmp0(item->name, TRASH_DIR))
 	name = "Trash";
       break;
     case F_DRAFT:
-      if (!strcmp2(item->name, DRAFT_DIR))
+      if (!g_strcmp0(item->name, DRAFT_DIR))
 	name = "Drafts";
       break;
     default:
@@ -935,7 +935,7 @@ static gboolean foldercheck_foreach_update_to_list(GtkTreeModel *model,
   for(walk = entry->list; walk != NULL; walk = g_slist_next(walk)) {
     FolderItem *list_item = (FolderItem*) walk->data;
     ident_list = folder_item_get_identifier(list_item);
-    if(!strcmp2(ident_list,ident_tree)) {
+    if(!g_strcmp0(ident_list,ident_tree)) {
       toggle_item = TRUE;
       g_free(ident_list);
       break;
diff --git a/src/plugins/notification/notification_popup.c b/src/plugins/notification/notification_popup.c
index 0f26a98..c6f283d 100644
--- a/src/plugins/notification/notification_popup.c
+++ b/src/plugins/notification/notification_popup.c
@@ -125,7 +125,7 @@ void notification_popup_msg(MsgInfo *msginfo)
       FolderItem *list_item = (FolderItem*) list->data;
 
       list_identifier = folder_item_get_identifier(list_item);
-      if(!strcmp2(list_identifier, identifier))
+      if(!g_strcmp0(list_identifier, identifier))
 	found = TRUE;
 
       g_free(list_identifier);
diff --git a/src/plugins/notification/notification_trayicon.c b/src/plugins/notification/notification_trayicon.c
index ee7689d..f67d81d 100644
--- a/src/plugins/notification/notification_trayicon.c
+++ b/src/plugins/notification/notification_trayicon.c
@@ -173,7 +173,7 @@ void notification_trayicon_msg(MsgInfo *msginfo)
       FolderItem *list_item = (FolderItem*) list->data;
 
       list_identifier = folder_item_get_identifier(list_item);
-      if(!strcmp2(list_identifier, identifier))
+      if(!g_strcmp0(list_identifier, identifier))
 	found = TRUE;
 
       g_free(list_identifier);
diff --git a/src/plugins/vcalendar/claws.def b/src/plugins/vcalendar/claws.def
index a764123..d9cbf4a 100644
--- a/src/plugins/vcalendar/claws.def
+++ b/src/plugins/vcalendar/claws.def
@@ -150,7 +150,6 @@ remove_dir_recursive
 slist_free_strings
 slist_free_strings_full
 statusbar_progress_all
-strcmp2
 strretchomp
 str_write_to_file
 subst_for_filename
diff --git a/src/plugins/vcalendar/vcal_manager.c b/src/plugins/vcalendar/vcal_manager.c
index fe71bf6..073fd36 100644
--- a/src/plugins/vcalendar/vcal_manager.c
+++ b/src/plugins/vcalendar/vcal_manager.c
@@ -1002,7 +1002,7 @@ static VCalEvent *event_get_from_xml (const gchar *uid, GNode *node)
 	g_return_val_if_fail(node->data != NULL, NULL);
 
 	xmlnode = node->data;
-	if (strcmp2(xmlnode->tag->tag, "event") != 0) {
+	if (g_strcmp0(xmlnode->tag->tag, "event") != 0) {
 		g_warning("tag name != \"event\"");
 		return NULL;
 	}
@@ -1070,7 +1070,7 @@ static VCalEvent *event_get_from_xml (const gchar *uid, GNode *node)
 		icalparameter_cutype cutype   = ICAL_CUTYPE_INDIVIDUAL;
 		
 		xmlnode = node->data;
-		if (strcmp2(xmlnode->tag->tag, "answer") != 0) {
+		if (g_strcmp0(xmlnode->tag->tag, "answer") != 0) {
 			g_warning("tag name != \"answer\"");
 			return event;
 		}
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index 512540e..106841e 100644
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -906,7 +906,7 @@ static gboolean prefs_custom_header_selected(GtkTreeSelection *selector,
 
 	ENTRY_SET_TEXT(customhdr.hdr_entry, ch->name);
 	ENTRY_SET_TEXT(customhdr.val_entry, ch->value);
-	if (!strcmp2("Face",ch->name)) {
+	if (!g_strcmp0("Face",ch->name)) {
 		preview = GTK_IMAGE(face_get_from_header (ch->value));
 		pixbuf = gtk_image_get_pixbuf(preview);
 		gtk_image_set_from_pixbuf (GTK_IMAGE(customhdr.preview), pixbuf);
@@ -914,7 +914,7 @@ static gboolean prefs_custom_header_selected(GtkTreeSelection *selector,
 		g_object_ref_sink (G_OBJECT(preview));
 	} 
 #if HAVE_LIBCOMPFACE
-else if (!strcmp2("X-Face", ch->name)) {
+else if (!g_strcmp0("X-Face", ch->name)) {
 		preview = GTK_IMAGE(xface_get_from_header(ch->value));	
 		pixbuf = gtk_image_get_pixbuf(preview);
 		gtk_image_set_from_pixbuf (GTK_IMAGE(customhdr.preview), pixbuf);
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index c1a4f42..79e464a 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -701,7 +701,7 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
 
 	if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->simplify_subject_rec_checkbtn))) {
 		gboolean old_simplify_subject = prefs->enable_simplify_subject;
-		int regexp_diffs = strcmp2(prefs->simplify_subject_regexp, gtk_editable_get_chars(
+		int regexp_diffs = g_strcmp0(prefs->simplify_subject_regexp, gtk_editable_get_chars(
 					GTK_EDITABLE(page->entry_simplify_subject), 0, -1));
 		prefs->enable_simplify_subject =
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_simplify_subject));
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 24c6356..2c8d5b1 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -357,7 +357,7 @@ static void prefs_themes_set_themes_menu(GtkComboBox *combo, const ThemesData *t
 				   0, tname->name,
 				   1, tname->item->data, -1);
 
-		if (tdata->displayed != NULL && !strcmp2(tdata->displayed,tpath))
+		if (tdata->displayed != NULL && !g_strcmp0(tdata->displayed,tpath))
 			active = i;
 		++i;
 
@@ -377,7 +377,7 @@ static void prefs_themes_set_themes_menu(GtkComboBox *combo, const ThemesData *t
 static int prefs_themes_cmp_name(gconstpointer a_p, gconstpointer b_p)
 {
 	/* compare two ThemeData structures by their name attribute */
-	return strcmp2((gchar *)(((ThemeName*)a_p)->name),
+	return g_strcmp0((gchar *)(((ThemeName*)a_p)->name),
 					(gchar *)(((ThemeName*)b_p)->name));
 }
 
@@ -404,7 +404,7 @@ static void prefs_themes_get_themes_and_names(ThemesData *tdata)
 		name->item = tpaths;
 
 		tdata->names = g_list_append(tdata->names, name);
-		if (!strcmp2(tpaths->data, prefs_common.pixmap_theme_path)) {
+		if (!g_strcmp0(tpaths->data, prefs_common.pixmap_theme_path)) {
 			tdata->displayed = (gchar *)tpaths->data;
 		}
 		tpaths = g_list_next(tpaths);
@@ -618,7 +618,7 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
 		prefs_themes_get_themes_and_names(tdata);
 		insted = g_list_find_custom(tdata->themes,
 					    (gpointer)(cinfo->dest),
-					    (GCompareFunc)strcmp2);
+					    (GCompareFunc)g_strcmp0);
 		if (NULL != insted) {
 			alertpanel_notice(_("Theme installed successfully."));
 			tdata->displayed = (gchar *)(insted->data);
diff --git a/src/procmime.c b/src/procmime.c
index 73c7967..1a375be 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1978,7 +1978,7 @@ static MimeParser *procmime_get_mimeparser_for_type(MimeMediaType type, const gc
 	GSList *cur;
 	for (cur = registered_parsers; cur; cur = cur->next) {
 		MimeParser *parser = (MimeParser *)cur->data;
-		if (parser->type == type && !strcmp2(parser->sub_type, sub_type))
+		if (parser->type == type && !g_strcmp0(parser->sub_type, sub_type))
 			return parser;
 	}
 	return NULL;
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 2ca5a43..67cd3c3 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -689,7 +689,7 @@ gint stock_pixbuf_gdk(StockPixmap icon, GdkPixbuf **pixbuf)
 
 	pix_d = &pixmaps[icon];
 
-	theme_changed = (strcmp2(pix_d->icon_path, prefs_common.pixmap_theme_path) != 0);
+	theme_changed = (g_strcmp0(pix_d->icon_path, prefs_common.pixmap_theme_path) != 0);
 	if (!pix_d->pixbuf || theme_changed) {
 		GdkPixbuf *pix = NULL;
 
diff --git a/src/textview.c b/src/textview.c
index 23c68fa..17e5ada 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -3153,7 +3153,7 @@ static void add_uri_to_addrbook_cb (GtkAction *action, TextView *textview)
 	fromaddress = g_strdup(uri->uri + 7);
 	
 	if (textview->messageview->msginfo &&
-	   !strcmp2(fromaddress, textview->messageview->msginfo->from))
+	   !g_strcmp0(fromaddress, textview->messageview->msginfo->from))
 		use_picture = TRUE;
 
 	fromname = procheader_get_fromname(fromaddress);

commit ab0b831cbd7ec6c8cf6f70f9271279dd226fb93f
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Dec 14 18:51:40 2018 +0100

    Added unit tests for get_uri_part().

diff --git a/src/common/tests/Makefile.am b/src/common/tests/Makefile.am
index b03e287..767f6de 100644
--- a/src/common/tests/Makefile.am
+++ b/src/common/tests/Makefile.am
@@ -30,6 +30,10 @@ TEST_PROGS += unmime_test
 unmime_test_SOURCES = unmime_test.c
 unmime_test_LDADD = $(common_ldadd) ../unmime.o ../quoted-printable.o ../utils.o ../file-utils.o ../codeconv.o
 
+TEST_PROGS += utils_get_uri_part_test
+utils_get_uri_part_test_SOURCES = utils_get_uri_part_test.c
+utils_get_uri_part_test_LDADD = $(common_ldadd) ../utils.o ../file-utils.o ../codeconv.o ../quoted-printable.o ../unmime.o
+
 noinst_PROGRAMS = $(TEST_PROGS)
 
 .PHONY: test
diff --git a/src/common/tests/utils_get_uri_part_test.c b/src/common/tests/utils_get_uri_part_test.c
new file mode 100644
index 0000000..18ab31c
--- /dev/null
+++ b/src/common/tests/utils_get_uri_part_test.c
@@ -0,0 +1,125 @@
+#include <stdio.h>
+#include <glib.h>
+
+#include "utils.h"
+
+#include "mock_prefs_common_get_use_shred.h"
+#include "mock_prefs_common_get_flush_metadata.h"
+
+struct td_get_uri_part {
+	gchar *str;
+	gboolean ret;
+	guint uri_length;
+};
+
+struct td_get_uri_part td_get_uri_basic = {
+	"http://www.example.com", TRUE, 22
+};
+struct td_get_uri_part td_get_uri_slash = {
+	"http://www.example.com/", TRUE, 23
+};
+struct td_get_uri_part td_get_uri_question = {
+	"http://www.example.com/foo?", TRUE, 27
+};
+struct td_get_uri_part td_get_uri_parenthesis = {
+	"http://www.example.com/f(o)o", TRUE, 28
+};
+struct td_get_uri_part td_get_uri_brace = {
+	"http://www.example.com/f[oo", TRUE, 24
+};
+struct td_get_uri_part td_get_uri_umlaut = {
+	"http://www.examöple.com", TRUE, 24
+};
+struct td_get_uri_part td_get_uri_kanji = {
+	"http://www.漢字.com", TRUE, 21
+};
+struct td_get_uri_part td_get_uri_nonprintable = {
+	"http://www.exam\x01ple.com", TRUE, 15
+};
+
+#define URI "http://www.example.com"
+static void
+test_utils_get_uri_part_nowhitespace()
+{
+	gboolean ret;
+	gchar *str = g_strdup("Nowhitespace"URI"nowhitespace");
+	const gchar *bp, *ep;
+
+	ret = get_uri_part(str, str + 12, &bp, &ep, FALSE);
+
+	g_assert_true(ret);
+	g_assert_true(ep == str + strlen(str));
+
+	g_free(str);
+}
+
+static void
+test_utils_get_uri_part_whitespace()
+{
+	gboolean ret;
+	gchar *str = g_strdup("Whitespace "URI" whitespace");
+	const gchar *bp, *ep;
+
+	ret = get_uri_part(str, str + 11, &bp, &ep, FALSE);
+
+	g_assert_true(ret);
+	g_assert_true(ep == bp + strlen(URI));
+
+	g_free(str);
+}
+#undef URI
+
+static void
+test_utils_get_uri_part(gconstpointer user_data)
+{
+	const struct td_get_uri_part *data = (struct td_get_uri_part *)user_data;
+	gboolean ret;
+	const gchar *bp, *ep;
+
+	ret = get_uri_part(data->str, data->str, &bp, &ep, FALSE);
+
+	g_assert_nonnull(bp);
+	g_assert_nonnull(ep);
+
+	g_assert_true(ret == data->ret);
+	g_assert_true(ep >= bp);
+	g_assert_true(bp + data->uri_length == ep);
+}
+
+int
+main(int argc, char *argv[])
+{
+	g_test_init(&argc, &argv, NULL);
+
+	g_test_add_func("/common/utils/get_uri_part/nowhitespace",
+			test_utils_get_uri_part_nowhitespace);
+	g_test_add_func("/common/utils/get_uri_part/whitespace",
+			test_utils_get_uri_part_whitespace);
+
+	g_test_add_data_func("/common/utils/get_uri_part/basic",
+			&td_get_uri_basic,
+			test_utils_get_uri_part);
+	g_test_add_data_func("/common/utils/get_uri_part/slash",
+			&td_get_uri_slash,
+			test_utils_get_uri_part);
+	g_test_add_data_func("/common/utils/get_uri_part/question",
+			&td_get_uri_question,
+			test_utils_get_uri_part);
+	g_test_add_data_func("/common/utils/get_uri_part/parenthesis",
+			&td_get_uri_parenthesis,
+			test_utils_get_uri_part);
+	g_test_add_data_func("/common/utils/get_uri_part/brace",
+			&td_get_uri_brace,
+			test_utils_get_uri_part);
+	g_test_add_data_func("/common/utils/get_uri_part/umlaut",
+			&td_get_uri_umlaut,
+			test_utils_get_uri_part);
+	g_test_add_data_func("/common/utils/get_uri_part/kanji",
+			&td_get_uri_kanji,
+			test_utils_get_uri_part);
+	g_test_add_data_func("/common/utils/get_uri_part/nonprintable",
+			&td_get_uri_nonprintable,
+			test_utils_get_uri_part);
+
+	return g_test_run();
+}

commit cd661fe56847a42023dbdb9ecb4d7315a3c757af
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Dec 14 18:50:38 2018 +0100

    Make URI highlighting in textview and compose Unicode-aware.
    
    Fixes bug #3519: Links including umlauts are broken

diff --git a/src/common/utils.c b/src/common/utils.c
index f288888..5774c4d 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3404,9 +3404,10 @@ gboolean get_uri_part(const gchar *start, const gchar *scanpos,
 	*bp = scanpos;
 
 	/* find end point of URI */
-	for (ep_ = scanpos; *ep_ != '\0'; ep_++) {
-		if (!g_ascii_isgraph(*(const guchar *)ep_) ||
-		    !IS_ASCII(*(const guchar *)ep_) ||
+	for (ep_ = scanpos; *ep_ != '\0'; ep_ = g_utf8_next_char(ep_)) {
+		gunichar u = g_utf8_get_char_validated(ep_, -1);
+		if (!g_unichar_isgraph(u) ||
+		    u == (gunichar)-1 ||
 		    strchr("[]{}<>\"", *ep_)) {
 			break;
 		} else if (strchr("(", *ep_)) {

commit 8beb748646ec967ea5985a5d5ab640b673893d85
Author: Paul <paul at claws-mail.org>
Date:   Fri Dec 14 08:20:09 2018 +0000

    add Poruguese translator

diff --git a/tools/claws.i18n.status.pl b/tools/claws.i18n.status.pl
index abc8131..b48fc57 100644
--- a/tools/claws.i18n.status.pl
+++ b/tools/claws.i18n.status.pl
@@ -29,7 +29,7 @@
 	'nl.po' => 'Dutch',
 	'pl.po' => 'Polish',
 	'pt_BR.po' => 'Brazilian Portuguese',
-#	'pt_PT.po' => 'Portuguese',
+	'pt_PT.po' => 'Portuguese',
 	'ro.po' => 'Romanian',
 	'ru.po' => 'Russian',
 	'sk.po' => 'Slovak',
@@ -61,7 +61,7 @@
 	'nl.po' => 'Marcel Pol <mpol at gmx.net>',
 	'pl.po' => 'Jakub Jankiewicz <jcubic at jcubic.pl>',
 	'pt_BR.po' => 'Frederico Goncalves Guimaraes <fggdebian at yahoo.com.br>',
-#	'pt_PT.po' => 'Tiago Faria <gouki at goukihq.org>',
+	'pt_PT.po' => 'Pedro Albuquerque <palbuquerque73 at gmail.com>',
 	'ro.po' => 'Cristian Secară <liste at secarica.ro>',
 	'ru.po' => 'Mikhail Kurinnoi <viewizard at viewizard.com>',
 	'sk.po' => 'Slavko <slavino at slavino.sk>',

commit 72538a866b81b1cc0b72476739d00aad0a8b4108
Author: Paul <paul at claws-mail.org>
Date:   Fri Dec 14 07:31:46 2018 +0000

    for release 3.17.2

diff --git a/NEWS b/NEWS
index 232559c..b666d39 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,104 @@
 Changes of the  Claws Mail GTK2 branch
 
+* 3.17.2
+--------
+
+* Message List: A context menu has been added to the column headers,
+  it has two entries: a new option, 'Lock column headers', and 'Set
+  displayed colums'.
+
+* Folder List:  A context menu has been added to the column headers,
+  containing 'Set displayed columns'.
+
+* Preferences: The Display/Summaries option page has been split into
+  three notebook pages: Folder List, Message List, and Defaults.
+  The Message List page contains the new 'Lock column headers'
+  option. The Defaults page contains several new options for new
+  folders.
+
+* New Folder Properties: It is now possible to control signing and
+  encrypting options on the Compose page. By default it follows the
+  Account preferences, but they can be overridden to always sign
+  and/or encrypt, or never sign/encrypt.
+
+* Saving sent messages: The global preference, 'Save sent messages',
+  can now be overriden by the Folder Property and Account
+  preferences. The global preference no longer needs to be activated
+  for the Account Preference, 'Put sent messages in ...' option to
+  function. Likewise, the Folder Property, 'Save copy of outgoing
+  messages to this folder instead of Sent', no longer relies on the
+  global preference being set.
+
+* SSL/TLS certificates: The SHA-256 fingerprint is now displayed, and
+  the MD5 fingerprint has been removed.
+
+* SSL/TLS certificates list: Status and Expiry columns have been
+  added, and expired and invalid certificates are now clearly
+  indicated.
+
+* QuickSearch: body searches are now quicker.
+
+* QuickSearch: symbols used in Extended searches are now expanded
+  in the 'Edit' dialogue.
+
+* Re-editing: Flags and tags are now preserved when re-editing a
+  message.
+
+* Fancy plugin: The minimum required webkitgtk version is now 1.10.0.
+
+* PDF Viewer plugin: Ctrl+scroll now zooms.
+
+* Tools: added cm-break.pl script, which breaks thread references for
+  the selected messages; textviewer.pl has been updated and now
+  requires perl 5.14.1.
+
+* The legacy "sylpheed-claws" symlink is no longer installed in the
+  bindir.
+
+* New translation: Portuguese.
+
+* Updated translations: Brazilian Portuguese, Catalan, Czech, Danish,
+  Dutch, French, German, Russian, Slovak, Spanish, Swedish, Turkish.
+
+* bug fixes:
+	o bug 3418, 'Building on a Cross Compiling toolchain doesn't
+		     work'
+	o bug 3889, 'Address and quoted message inconsistent in
+		     reply'
+	o bug 4114, 'autogen.sh: Fix argument quoting'
+	o bug 4115, 'autogen: avoid unwarranted re-configure'
+	o bug 4120, 'New cert files are created in $HOME instead of
+		     in ~/.claws-mail/certs'
+	o byg 4121, 'Moving a subfolder in another folder erases its
+		     processing rules' (sic)
+	o bug 4132, '"Mark all as (un)read" dialog appears when
+		     acting on 1 message only'
+	o bug 4133, 'trying to read message from an NNTP group (with
+		     all expired articles.'
+	o regression where mail was not being checked at startup when
+	  it should have been
+	o links not being opened in browser when Fancy menu is opened
+	  with a keyboard
+	o show correct address:port in SOCKS5 proxy connection failure
+	  message
+	o prevent unexpected loss of drafted message
+	o Quicksearch eating keypresses it didn't handle
+	o build on Debian 7
+	o build on FreeBSD, sys/wait.h is needed for WEXITSTATUS
+	  macro
+	o Reply from mainwindow menu and toolbar when mainwindow's
+	  messageview is hidden
+	o CID 1438531 Fix wrong test leading to dead code
+	o CID 1439871 and validate Unicode char strictly
+	o CID 1439996 and remove unnecessary comparison
+	o Fancy: left-click on links not opening in browser
+	o RSSyl: lost processing rules when renaming folder
+	o annoyance where your current reading is disturbed when a
+	  new msg is filtered into the current folder
+	o don't leave the user in limbo when privacy system is 'none'
+	  and auto signing/encrypting is set
+	o several memory leaks
+
 * 3.17.1
 --------
 
diff --git a/README b/README
index 36a7f0c..7fee5f1 100644
--- a/README
+++ b/README
@@ -587,6 +587,7 @@ https://www.thewildbeast.co.uk/claws-mail/bugzilla/index.cgi
 
 GTK 2 Version
 -------------
+2018-12-14	3.17.2
 2018-08-26	3.17.1
 2018-08-15	3.17.0
 2017-12-17	3.16.0
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index bc983e8..598101f 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,4 +1,4 @@
-26th August 2018                                    Claws Mail 3.17.1
+14th December 2018                                  Claws Mail 3.17.2
 
 		    CLAWS MAIL  RELEASE NOTES
                     http://www.claws-mail.org
@@ -6,14 +6,104 @@
 Claws Mail is a GTK+ based, user-friendly, lightweight, and fast 
 email client.
 
-This is a bug-fix release:
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+New in this release:
+~~~~~~~~~~~~~~~~~~~~
+
+* Message List: A context menu has been added to the column headers,
+  it has two entries: a new option, 'Lock column headers', and 'Set
+  displayed colums'.
+
+* Folder List:  A context menu has been added to the column headers,
+  containing 'Set displayed columns'.
+
+* Preferences: The Display/Summaries option page has been split into
+  three notebook pages: Folder List, Message List, and Defaults.
+  The Message List page contains the new 'Lock column headers'
+  option. The Defaults page contains several new options for new
+  folders.
+
+* New Folder Properties: It is now possible to control signing and
+  encrypting options on the Compose page. By default it follows the
+  Account preferences, but they can be overridden to always sign
+  and/or encrypt, or never sign/encrypt.
+
+* Saving sent messages: The global preference, 'Save sent messages',
+  can now be overriden by the Folder Property and Account
+  preferences. The global preference no longer needs to be activated
+  for the Account Preference, 'Put sent messages in ...' option to
+  function. Likewise, the Folder Property, 'Save copy of outgoing
+  messages to this folder instead of Sent', no longer relies on the
+  global preference being set.
+
+* SSL/TLS certificates: The SHA-256 fingerprint is now displayed, and
+  the MD5 fingerprint has been removed.
+
+* SSL/TLS certificates list: Status and Expiry columns have been
+  added, and expired and invalid certificates are now clearly
+  indicated.
+
+* QuickSearch: body searches are now quicker.
+
+* QuickSearch: symbols used in Extended searches are now expanded
+  in the 'Edit' dialogue.
+
+* Re-editing: Flags and tags are now preserved when re-editing a
+  message.
+
+* Fancy plugin: The minimum required webkitgtk version is now 1.10.0.
+
+* PDF Viewer plugin: Ctrl+scroll now zooms.
+
+* Tools: added cm-break.pl script, which breaks thread references for
+  the selected messages; textviewer.pl has been updated and now
+  requires perl 5.14.1.
+
+* The legacy "sylpheed-claws" symlink is no longer installed in the
+  bindir.
+
+* New translation: Portuguese.
+
+* Updated translations: Brazilian Portuguese, Catalan, Czech, Danish,
+  Dutch, French, German, Russian, Slovak, Spanish, Swedish, Turkish.
 
 * bug fixes:
-	o bug 4072, 'Crash when clicking 'reply' or 'reply with
-	  quote''
-	o Account signature: Warn and fail rather than crashing when
-	  format string is faulty.
+	o bug 3418, 'Building on a Cross Compiling toolchain doesn't
+		     work'
+	o bug 3889, 'Address and quoted message inconsistent in
+		     reply'
+	o bug 4114, 'autogen.sh: Fix argument quoting'
+	o bug 4115, 'autogen: avoid unwarranted re-configure'
+	o bug 4120, 'New cert files are created in $HOME instead of
+		     in ~/.claws-mail/certs'
+	o byg 4121, 'Moving a subfolder in another folder erases its
+		     processing rules' (sic)
+	o bug 4132, '"Mark all as (un)read" dialog appears when
+		     acting on 1 message only'
+	o bug 4133, 'trying to read message from an NNTP group (with
+		     all expired articles.'
+	o regression where mail was not being checked at startup when
+	  it should have been
+	o links not being opened in browser when Fancy menu is opened
+	  with a keyboard
+	o show correct address:port in SOCKS5 proxy connection failure
+	  message
+	o prevent unexpected loss of drafted message
+	o Quicksearch eating keypresses it didn't handle
+	o build on Debian 7
+	o build on FreeBSD, sys/wait.h is needed for WEXITSTATUS
+	  macro
+	o Reply from mainwindow menu and toolbar when mainwindow's
+	  messageview is hidden
+	o CID 1438531 Fix wrong test leading to dead code
+	o CID 1439871 and validate Unicode char strictly
+	o CID 1439996 and remove unnecessary comparison
+	o Fancy: left-click on links not opening in browser
+	o RSSyl: lost processing rules when renaming folder
+	o annoyance where your current reading is disturbed when a
+	  new msg is filtered into the current folder
+	o don't leave the user in limbo when privacy system is 'none'
+	  and auto signing/encrypting is set
+	o several memory leaks
 
 For further details of the numbered bugs and RFEs listed above
 see https://www.claws-mail.org/bug/[BUG NUMBER]

commit a3214e0d0d5e53410726a42e9e6f9df5bc655d59
Author: Paul <paul at claws-mail.org>
Date:   Fri Dec 14 07:21:32 2018 +0000

    document new Portuguese translator

diff --git a/AUTHORS b/AUTHORS
index 2b04e2d..e6eb907 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -57,6 +57,7 @@ Claws Mail translation team
 	[pl] 	Jakub Jankiewicz 	<jcubic at jcubic.pl>
 	[pt_BR] Frederico Goncalves Guimaraes 
 					<frederico at teia.bio.br>
+	[pt_PT] Pedro Albuquerque 	<palbuquerque73 at gmail.com>
 	[ro]	Cristian Secară 	<liste at secarica.ro>
 	[ru]	Mikhail Kurinnoi 	<viewizard at viewizard.com>
 	[sk]	Slavko 			<slavino at slavino.sk>
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 20634f7..628f7d9 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -50,6 +50,7 @@ static char *TRANS_TEAM_LIST[] = {
 "[nl] Marcel Pol <mpol at gmx.net>",
 "[pl] Jakub Jankiewicz <jcubic at jcubic.pl>",
 "[pt_BR] Frederico Goncalves Guimaraes <frederico at teia.bio.br>",
+"[pt_PT] Pedro Albuquerque <palbuquerque73 at gmail.com>",
 "[ro] Cristian Secară <liste at secarica.ro>",
 "[ru] Mikhail Kurinnoi <viewizard at viewizard.com>",
 "[sk] Slavko <slavino at slavino.sk>",

commit cc6511ccf55570ec49278562ea1ab2b65cc408ff
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Dec 14 01:15:21 2018 +0100

    Update list of TLDs for release

diff --git a/src/common/tlds.h b/src/common/tlds.h
index e42a7b2..e1872ff 100644
--- a/src/common/tlds.h
+++ b/src/common/tlds.h
@@ -6,7 +6,7 @@
 #define __TLDS_H__
 
 static const gchar *toplvl_domains [] = {
-	/* Version 2018081400, Last Updated Tue Aug 14 07:07:01 2018 UTC */
+	/* Version 2018121300, Last Updated Thu Dec 13 07:07:01 2018 UTC */
 	"aaa",
 	"aarp",
 	"abarth",
@@ -530,7 +530,6 @@ static const gchar *toplvl_domains [] = {
 	"goldpoint",
 	"golf",
 	"goo",
-	"goodhands",
 	"goodyear",
 	"goog",
 	"google",
@@ -659,7 +658,6 @@ static const gchar *toplvl_domains [] = {
 	"jetzt",
 	"jewelry",
 	"jio",
-	"jlc",
 	"jll",
 	"jm",
 	"jmp",
@@ -942,7 +940,6 @@ static const gchar *toplvl_domains [] = {
 	"pa",
 	"page",
 	"panasonic",
-	"panerai",
 	"paris",
 	"pars",
 	"partners",
@@ -1176,7 +1173,6 @@ static const gchar *toplvl_domains [] = {
 	"starhub",
 	"statebank",
 	"statefarm",
-	"statoil",
 	"stc",
 	"stcgroup",
 	"stockholm",
@@ -1222,7 +1218,6 @@ static const gchar *toplvl_domains [] = {
 	"tech",
 	"technology",
 	"tel",
-	"telecity",
 	"telefonica",
 	"temasek",
 	"tennis",
@@ -1317,7 +1312,6 @@ static const gchar *toplvl_domains [] = {
 	"virgin",
 	"visa",
 	"vision",
-	"vista",
 	"vistaprint",
 	"viva",
 	"vivo",

commit c4e727f316d89b6af20c068d78158b2b2e0e5aea
Author: Ricardo Mones <ricardo at mones.org>
Date:   Thu Dec 13 19:49:23 2018 +0100

    Update Spanish translation

diff --git a/po/es.po b/po/es.po
index e64e93a..6878f50 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.17.0\n"
+"Project-Id-Version: Claws Mail 3.17.2\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2018-08-08 07:59+0100\n"
-"PO-Revision-Date: 2018-08-14 18:28+0200\n"
+"POT-Creation-Date: 2018-12-13 09:17+0100\n"
+"PO-Revision-Date: 2018-12-13 09:59+0200\n"
 "Last-Translator: Ricardo Mones <ricardo at mones.org>\n"
 "Language-Team: Spanish\n"
 "Language: es\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:401 src/account.c:468
+#: src/account.c:402 src/account.c:469
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -28,15 +28,15 @@ msgstr ""
 "Hay ventanas de composición abiertas.\n"
 "Cierre todas las ventanas de composición antes de editar las cuentas."
 
-#: src/account.c:446
+#: src/account.c:447
 msgid "Can't create folder."
 msgstr "No se puede crear la carpeta."
 
-#: src/account.c:734
+#: src/account.c:735
 msgid "Edit accounts"
 msgstr "Editar cuentas"
 
-#: src/account.c:751
+#: src/account.c:752
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -46,60 +46,60 @@ msgstr ""
 "orden dado, la casilla indica que cuentas se incluirán. El texto en negrita "
 "indica la cuenta predeterminada."
 
-#: src/account.c:822
+#: src/account.c:823
 msgid " _Set as default account "
 msgstr " _Establecer como primaria "
 
-#: src/account.c:914
+#: src/account.c:915
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Las cuentas con carpetas remotas no se pueden copiar."
 
-#: src/account.c:921
+#: src/account.c:922
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 
-#: src/account.c:1118
+#: src/account.c:1119
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Realmente quiere borrar la cuenta «%s»?"
 
-#: src/account.c:1120
+#: src/account.c:1121
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: src/account.c:1121
+#: src/account.c:1122
 msgid "Delete account"
 msgstr "Borrar cuenta"
 
-#: src/account.c:1595
+#: src/account.c:1596
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1601
+#: src/account.c:1602
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 
-#: src/account.c:1608 src/addrduplicates.c:471 src/addressadd.c:222
-#: src/addressbook.c:127 src/compose.c:7413 src/editaddress.c:1472
-#: src/editaddress.c:1501 src/editaddress.c:1517
+#: src/account.c:1609 src/addrduplicates.c:471 src/addressadd.c:222
+#: src/addressbook.c:128 src/compose.c:7462 src/editaddress.c:1473
+#: src/editaddress.c:1502 src/editaddress.c:1518
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:170
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:427
+#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:427
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
-#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:469
-#: src/plugins/pdf_viewer/poppler_viewer.c:1828
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:470
+#: src/plugins/pdf_viewer/poppler_viewer.c:1846
 #: src/plugins/pgpcore/select-keys.c:463 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1874 src/prefs_template.c:79 src/prefs_themes.c:990
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account.c:1616 src/prefs_account.c:1200 src/prefs_account.c:4622
+#: src/account.c:1617 src/prefs_account.c:1196 src/prefs_account.c:4644
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:1624 src/ssl_manager.c:100
+#: src/account.c:1625 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Servidor"
 
@@ -126,11 +126,11 @@ msgstr ""
 "La acción seleccionada no se puede usar en la ventana de composición\n"
 "porque contiene %%f, %%F, %%as o %%p."
 
-#: src/action.c:719
+#: src/action.c:720
 msgid "There is no filtering action set"
 msgstr "No hay acciones de filtrado establecidas"
 
-#: src/action.c:721
+#: src/action.c:722
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -139,7 +139,7 @@ msgstr ""
 "Acciones de filtrado inválidas:\n"
 "%s"
 
-#: src/action.c:986
+#: src/action.c:987
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -150,35 +150,35 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:988 src/compose.c:5222 src/compose.c:5227 src/ldaputil.c:333
-#: src/plugins/bogofilter/bogofilter.c:857
-#: src/plugins/tnef_parse/tnef_parse.c:75
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1845
-#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:62
+#: src/action.c:989 src/compose.c:5257 src/compose.c:5262 src/ldaputil.c:333
+#: src/plugins/bogofilter/bogofilter.c:858
+#: src/plugins/tnef_parse/tnef_parse.c:76
+#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1828
+#: src/plugins/vcalendar/vcal_folder.c:1846
+#: src/plugins/vcalendar/vcal_folder.c:1849 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/action.c:1206 src/action.c:1385
+#: src/action.c:1207 src/action.c:1379
 msgid "Completed"
 msgstr "Completado"
 
-#: src/action.c:1242
+#: src/action.c:1243
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Ejecutando: %s\n"
 
-#: src/action.c:1246
+#: src/action.c:1247
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 
-#: src/action.c:1292
+#: src/action.c:1293
 msgid "Action's input/output"
 msgstr "Entrada/salida de la acción"
 
-#: src/action.c:1631
+#: src/action.c:1625
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -189,11 +189,11 @@ msgstr ""
 "(«%%h» será sustituido con el parámetro)\n"
 "  %s"
 
-#: src/action.c:1636
+#: src/action.c:1630
 msgid "Action's hidden user argument"
 msgstr "Parámetro de usuario oculto para la acción"
 
-#: src/action.c:1640
+#: src/action.c:1634
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -204,24 +204,24 @@ msgstr ""
 "(«%%u» será sustituido con el parámetro)\n"
 "  %s"
 
-#: src/action.c:1645
+#: src/action.c:1639
 msgid "Action's user argument"
 msgstr "Parámetro de usuario para la acción"
 
-#: src/addrclip.c:480
+#: src/addrclip.c:481
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "No se puede copiar una carpeta a si misma o su sub-estructura."
 
-#: src/addrclip.c:503
+#: src/addrclip.c:504
 msgid "Cannot copy an address book to itself."
 msgstr "No se puede copiar una agenda a si misma."
 
-#: src/addrclip.c:594
+#: src/addrclip.c:595
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "No se puede mover la carpeta a si misma o a su sub-estructura."
 
-#: src/addr_compl.c:689 src/addressbook.c:5013
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/addr_compl.c:689 src/addressbook.c:5016
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "Grupo"
 
@@ -293,14 +293,14 @@ msgstr ""
 "¿Realmente quiere reemplazar todos los nombres de\n"
 "atributos con los valores iniciales predeterminados?"
 
-#: src/addrcustomattr.c:217 src/addressbook.c:437 src/addressbook.c:466
-#: src/addressbook.c:483 src/edittags.c:286
-#: src/plugins/archive/archiver_gtk.c:1312 src/prefs_actions.c:1084
+#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
+#: src/addressbook.c:484 src/edittags.c:286
+#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1085
 #: src/prefs_filtering.c:1699 src/prefs_template.c:1111
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1085
+#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1086
 #: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "Delete _all"
 msgstr "_Borrar todo"
@@ -365,11 +365,11 @@ msgstr "Dirección"
 msgid "Address book path"
 msgstr "Ruta a la agenda de direcciones"
 
-#: src/addrduplicates.c:790 src/addressbook.c:1442 src/addressbook.c:1495
+#: src/addrduplicates.c:790 src/addressbook.c:1441 src/addressbook.c:1494
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1496
+#: src/addrduplicates.c:791 src/addressbook.c:1495
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
@@ -377,11 +377,11 @@ msgstr "¿Borrar realmente la(s) dirección(es)?"
 msgid "Delete address"
 msgstr "Borrar dirección"
 
-#: src/addrduplicates.c:841 src/addressbook.c:1443
+#: src/addrduplicates.c:841 src/addressbook.c:1442
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Esta dirección es solo de lectura y no se puede borrar."
 
-#: src/addressadd.c:192 src/prefs_filtering_action.c:201
+#: src/addressadd.c:192 src/prefs_filtering_action.c:195
 msgid "Add to address book"
 msgstr "Añadir a la agenda"
 
@@ -389,8 +389,8 @@ msgstr "Añadir a la agenda"
 msgid "Contact"
 msgstr "Contacto"
 
-#: src/addressadd.c:245 src/addressbook.c:129 src/editaddress.c:1256
-#: src/editaddress.c:1300 src/editgroup.c:290
+#: src/addressadd.c:245 src/addressbook.c:130 src/editaddress.c:1257
+#: src/editaddress.c:1301 src/editgroup.c:292
 msgid "Remarks"
 msgstr "Notas"
 
@@ -398,7 +398,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:596 src/addressbook.c:3261 src/addressbook.c:3312
+#: src/addressadd.c:596 src/addressbook.c:3264 src/addressbook.c:3315
 msgid "Add address(es)"
 msgstr "Añadir dirección(es)"
 
@@ -406,267 +406,267 @@ msgstr "Añadir dirección(es)"
 msgid "Can't add the specified address"
 msgstr "No se puede añadir la dirección especificada"
 
-#: src/addressbook.c:128 src/addressbook.c:5001 src/editaddress.c:1245
-#: src/editaddress.c:1283 src/editgroup.c:289 src/expldifdlg.c:517
-#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
+#: src/addressbook.c:129 src/addressbook.c:5004 src/editaddress.c:1246
+#: src/editaddress.c:1284 src/editgroup.c:291 src/expldifdlg.c:517
+#: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
 msgid "Email Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:405
 msgid "_Book"
 msgstr "_Agenda"
 
-#: src/addressbook.c:405 src/addressbook.c:436 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:604 src/mainwindow.c:515
-#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
+#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:515
+#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/addressbook.c:406 src/compose.c:609 src/mainwindow.c:518
-#: src/messageview.c:213
+#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:518
+#: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: src/addressbook.c:407 src/compose.c:610 src/mainwindow.c:520
-#: src/messageview.c:214
+#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:520
+#: src/messageview.c:216
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: src/addressbook.c:410 src/addressbook.c:468
+#: src/addressbook.c:411 src/addressbook.c:469
 msgid "New _Book"
 msgstr "Nueva _agenda"
 
-#: src/addressbook.c:411 src/addressbook.c:469
+#: src/addressbook.c:412 src/addressbook.c:470
 msgid "New _Folder"
 msgstr "Nueva _carpeta"
 
-#: src/addressbook.c:412
+#: src/addressbook.c:413
 msgid "New _vCard"
 msgstr "Nueva _vCard"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:417
 msgid "New _JPilot"
 msgstr "Nuevo _JPilot"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:420
 msgid "New LDAP _Server"
 msgstr "Nuevo servidor LDAP"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:424
 msgid "_Edit book"
 msgstr "_Editar agenda"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:425
 msgid "_Delete book"
 msgstr "_Borrar agenda"
 
-#: src/addressbook.c:426 src/compose.c:621
+#: src/addressbook.c:427 src/compose.c:624
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Guardar..."
 
-#: src/addressbook.c:427 src/compose.c:625 src/messageview.c:223
+#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/addressbook.c:430 src/addressbook.c:480 src/messageview.c:227
+#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
 msgid "_Select all"
 msgstr "_Seleccionar todo"
 
-#: src/addressbook.c:432 src/addressbook.c:472 src/addressbook.c:488
+#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:633 src/mainwindow.c:549 src/messageview.c:226
+#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
+#: src/compose.c:636 src/mainwindow.c:549 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:634 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
+#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/addressbook.c:439 src/addressbook.c:485
+#: src/addressbook.c:440 src/addressbook.c:486
 msgid "New _Address"
 msgstr "Nueva _dirección"
 
-#: src/addressbook.c:440 src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
 msgid "New _Group"
 msgstr "Nuevo _grupo"
 
-#: src/addressbook.c:442 src/addressbook.c:492
+#: src/addressbook.c:443 src/addressbook.c:493
 msgid "_Mail To"
 msgstr "_Correo para"
 
-#: src/addressbook.c:443 src/addressbook.c:496
+#: src/addressbook.c:444 src/addressbook.c:497
 msgid "_Merge"
 msgstr "_Fusionar"
 
-#: src/addressbook.c:447
+#: src/addressbook.c:448
 msgid "Import _LDIF file..."
 msgstr "Importar fichero _LDIF..."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:449
 msgid "Import M_utt file..."
 msgstr "Importar fichero M_utt..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:450
 msgid "Import _Pine file..."
 msgstr "Importar fichero _Pine..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:452
 msgid "Export _HTML..."
 msgstr "Exportar _HTML..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:453
 msgid "Export LDI_F..."
 msgstr "Exportar LDI_F..."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:455
 msgid "Find duplicates..."
 msgstr "Buscar duplicados..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:456
 msgid "Edit custom attributes..."
 msgstr "Editar atributos de usuario..."
 
-#: src/addressbook.c:458 src/compose.c:711 src/mainwindow.c:814
-#: src/messageview.c:338
+#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:814
+#: src/messageview.c:340
 msgid "_About"
 msgstr "_Acerca de"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:495
 msgid "_Browse Entry"
 msgstr "_Ver entrada"
 
-#: src/addressbook.c:508 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:143
-#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:403
+#: src/addressbook.c:509 src/crash.c:456 src/crash.c:475 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
+#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
 #: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
 #: src/prefs_themes.c:851 src/prefs_themes.c:852
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/addressbook.c:515 src/addressbook.c:534 src/importldif.c:121
+#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
 msgid "Success"
 msgstr "Éxito"
 
-#: src/addressbook.c:516 src/importldif.c:122
+#: src/addressbook.c:517 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Argumentos incorrectos"
 
-#: src/addressbook.c:517 src/importldif.c:123
+#: src/addressbook.c:518 src/importldif.c:123
 msgid "File not specified"
 msgstr "No se especificó el fichero"
 
-#: src/addressbook.c:518 src/importldif.c:124
+#: src/addressbook.c:519 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Error abriendo el fichero"
 
-#: src/addressbook.c:519 src/importldif.c:125
+#: src/addressbook.c:520 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Error leyendo el fichero"
 
-#: src/addressbook.c:520 src/importldif.c:126
+#: src/addressbook.c:521 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Encontrado final del fichero"
 
-#: src/addressbook.c:521 src/importldif.c:127
+#: src/addressbook.c:522 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Error reservando memoria"
 
-#: src/addressbook.c:522 src/importldif.c:128
+#: src/addressbook.c:523 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Formato de fichero erróneo"
 
-#: src/addressbook.c:523 src/importldif.c:129
+#: src/addressbook.c:524 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Error escribiendo en el fichero"
 
-#: src/addressbook.c:524 src/importldif.c:130
+#: src/addressbook.c:525 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Error abriendo el directorio"
 
-#: src/addressbook.c:525 src/importldif.c:131
+#: src/addressbook.c:526 src/importldif.c:131
 msgid "No path specified"
 msgstr "No se especificó una ruta"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:536
 msgid "Error connecting to LDAP server"
 msgstr "Error conectando al servidor LDAP"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:537
 msgid "Error initializing LDAP"
 msgstr "Error inicializando LDAP"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:538
 msgid "Error binding to LDAP server"
 msgstr "Error enlazando con el servidor LDAP"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:539
 msgid "Error searching LDAP database"
 msgstr "Error buscando en la base de datos LDAP"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:540
 msgid "Timeout performing LDAP operation"
 msgstr "Fuera de tiempo en la operación LDAP"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:541
 msgid "Error in LDAP search criteria"
 msgstr "Error en el criterio de búsqueda LDAP"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:542
 msgid "No LDAP entries found for search criteria"
 msgstr "No se encontraron entradas LDAP para el criterio de búsqueda"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:543
 msgid "LDAP search terminated on request"
 msgstr "Se solicitó concluir la búsqueda LDAP"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:544
 msgid "Error starting STARTTLS connection"
 msgstr "Error iniciando la conexión con STARTTLS"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:545
 msgid "Distinguished Name (dn) is missing"
 msgstr "Falta el nombre distinguido (dn)"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:546
 msgid "Missing required information"
 msgstr "Falta la información necesaria"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:547
 msgid "Another contact exists with that key"
 msgstr "Ya existe un contacto con esa clave"
 
-#: src/addressbook.c:547
+#: src/addressbook.c:548
 msgid "Strong(er) authentication required"
 msgstr "Se necesita autenticación (más) fuerte"
 
-#: src/addressbook.c:915
+#: src/addressbook.c:916
 msgid "Sources"
 msgstr "Fuentes"
 
-#: src/addressbook.c:919 src/prefs_matcher.c:631 src/prefs_other.c:488
+#: src/addressbook.c:920 src/prefs_matcher.c:642 src/prefs_other.c:490
 #: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:1115 src/editldap.c:793
+#: src/addressbook.c:1114 src/editldap.c:793
 msgid "Search"
 msgstr "Buscar"
 
-#: src/addressbook.c:1487
+#: src/addressbook.c:1486
 msgid "Delete group"
 msgstr "Borrar grupo"
 
-#: src/addressbook.c:1488
+#: src/addressbook.c:1487
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -674,26 +674,26 @@ msgstr ""
 "¿Quiere borrar el(los) grupo(s)?\n"
 "Las direcciones que contienen no se perderán."
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2214
 msgid "Cannot paste. Target address book is readonly."
 msgstr "No puedo pegar. El libro de direcciones destino es solo de lectura."
 
-#: src/addressbook.c:2225
+#: src/addressbook.c:2224
 msgid "Cannot paste into an address group."
 msgstr "No se puede pegar dentro de un grupo de direcciones."
 
-#: src/addressbook.c:2958
+#: src/addressbook.c:2961
 #, 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:2961 src/addressbook.c:2987 src/addressbook.c:2994
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
+#: src/addressbook.c:2964 src/addressbook.c:2990 src/addressbook.c:2997
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
 #: src/toolbar.c:497
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:2970
+#: src/addressbook.c:2973
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -702,20 +702,20 @@ msgstr ""
 "¿Quiere borrar «%s»? Si borra sólo la carpeta las direcciones que contenga "
 "se moverán a la carpeta padre."
 
-#: src/addressbook.c:2973 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
+#: src/addressbook.c:2976 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:2974
+#: src/addressbook.c:2977
 msgid "Delete _folder only"
 msgstr "Borrar sólo _carpeta"
 
-#: src/addressbook.c:2974
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr "Borrar carpeta y _direcciones"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -724,7 +724,7 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene no se perderán."
 
-#: src/addressbook.c:2992
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -733,28 +733,28 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene se perderán."
 
-#: src/addressbook.c:3106
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr " Buscar «%s»"
 
-#: src/addressbook.c:3244 src/addressbook.c:3293
+#: src/addressbook.c:3247 src/addressbook.c:3296
 msgid "New Contacts"
 msgstr "Nuevos contactos"
 
-#: src/addressbook.c:4132
+#: src/addressbook.c:4135
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se puede guardar el fichero índice."
 
-#: src/addressbook.c:4136
+#: src/addressbook.c:4139
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pueden guardar los ficheros de direcciones"
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4149
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:4151
+#: src/addressbook.c:4154
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -762,7 +762,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se puede guardar el nuevo fichero índice."
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4167
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -770,7 +770,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4173
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -778,7 +778,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "no se pudo guardar el fichero índice para la nueva."
 
-#: src/addressbook.c:4175
+#: src/addressbook.c:4178
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -786,57 +786,57 @@ msgstr ""
 "No se puede convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para la nueva."
 
-#: src/addressbook.c:4182 src/addressbook.c:4188
+#: src/addressbook.c:4185 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:4303
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:4304
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr "No se puede leer el índice de direcciones"
 
-#: src/addressbook.c:4635
+#: src/addressbook.c:4638
 msgid "Busy searching..."
 msgstr "Buscando..."
 
-#: src/addressbook.c:4965 src/prefs_send.c:220
+#: src/addressbook.c:4968 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:4977
+#: src/addressbook.c:4980
 msgid "Address Books"
 msgstr "Agendas de direcciones"
 
-#: src/addressbook.c:4989
+#: src/addressbook.c:4992
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:5025 src/exporthtml.c:884 src/folderview.c:354
-#: src/folderview.c:442 src/prefs_account.c:3169 src/prefs_folder_column.c:77
+#: src/addressbook.c:5028 src/exporthtml.c:885 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3169 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:5037
+#: src/addressbook.c:5040
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5049 src/addressbook.c:5061
+#: src/addressbook.c:5052 src/addressbook.c:5064
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5073
+#: src/addressbook.c:5076
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
-#: src/addressbook.c:5085
+#: src/addressbook.c:5088
 msgid "LDAP Query"
 msgstr "Petición LDAP"
 
 #: src/addressbook_foldersel.c:200 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:984 src/importldif.c:541
+#: src/exporthtml.c:985 src/importldif.c:541
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
@@ -857,8 +857,8 @@ msgid "Collecting addresses..."
 msgstr "Recopilando direcciones..."
 
 #: src/addrgather.c:254
-msgid "address added by claws-mail"
-msgstr "dirección añadida por claws-mail"
+msgid "address added by Claws Mail"
+msgstr "dirección añadida por Claws Mail"
 
 #: src/addrgather.c:285
 msgid "Addresses collected successfully."
@@ -889,7 +889,7 @@ msgstr "Procesar las siguientes cabeceras"
 msgid "Include subfolders"
 msgstr "Incluir subcarpetas"
 
-#: src/addrgather.c:492 src/prefs_filtering_action.c:1405
+#: src/addrgather.c:492 src/prefs_filtering_action.c:1383
 msgid "Header Name"
 msgstr "Nombre cabecera"
 
@@ -914,44 +914,44 @@ msgstr "Recopilar direcciones de correo de los mensajes seleccionados"
 msgid "Collect email addresses from folder"
 msgstr "Recopilar direcciones de correo de la carpeta"
 
-#: src/addrindex.c:124
+#: src/addrindex.c:125
 msgid "Common addresses"
 msgstr "Direcciones comunes"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:126
 msgid "Personal addresses"
 msgstr "Direcciones personales"
 
-#: src/addrindex.c:131
+#: src/addrindex.c:132
 msgid "Common address"
 msgstr "Dirección común"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:133
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/addrindex.c:1829
+#: src/addrindex.c:1830
 msgid "Address(es) update"
 msgstr "Actualizar dirección(es)"
 
-#: src/addrindex.c:1830
+#: src/addrindex.c:1831
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Falló la actualización. No se escribieron los cambios en el directorio."
 
-#: src/alertpanel.c:144 src/compose.c:9737
+#: src/alertpanel.c:144 src/compose.c:9783
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:157 src/compose.c:5813 src/compose.c:6341
-#: src/compose.c:12180 src/file_checker.c:78 src/file_checker.c:101
-#: src/messageview.c:856 src/plugins/pgpcore/sgpgme.c:806
-#: src/plugins/vcalendar/vcalendar.c:124 src/summaryview.c:5024
+#: src/alertpanel.c:157 src/compose.c:5848 src/compose.c:6390
+#: src/compose.c:12246 src/file_checker.c:79 src/file_checker.c:102
+#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:807
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5071
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5750 src/inc.c:719
-#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:310
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5785 src/inc.c:723
+#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
 msgid "Error"
 msgstr "Error"
 
@@ -983,66 +983,66 @@ msgstr "Nombre LDAP"
 msgid "Attribute Value"
 msgstr "Valor del atributo"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:70
 msgid "Nothing"
 msgstr "Nada"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:71
 msgid "a viewer"
 msgstr "un visor"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:72
 msgid "a MIME parser"
 msgstr "un parser MIME"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:73
 msgid "folders"
 msgstr "carpetas"
 
-#: src/common/plugin.c:73
+#: src/common/plugin.c:74
 msgid "filtering"
 msgstr "filtrado"
 
-#: src/common/plugin.c:74
+#: src/common/plugin.c:75
 msgid "a privacy interface"
 msgstr "un interfaz de privacidad"
 
-#: src/common/plugin.c:75
+#: src/common/plugin.c:76
 msgid "a notifier"
 msgstr "un notificador"
 
-#: src/common/plugin.c:76
+#: src/common/plugin.c:77
 msgid "an utility"
 msgstr "una utilidad"
 
-#: src/common/plugin.c:77
+#: src/common/plugin.c:78
 msgid "things"
 msgstr "cosas"
 
-#: src/common/plugin.c:334
+#: src/common/plugin.c:335
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 "Este módulo proporciona %s (%s), que ya está proporcionado por el módulo %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:438
 msgid "Plugin already loaded"
 msgstr "El módulo ya está cargado"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:449
 msgid "Failed to allocate memory for Plugin"
 msgstr "Falló la petición de memoria para el Módulo"
 
-#: src/common/plugin.c:482
+#: src/common/plugin.c:483
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr "Este módulo no está bajo licencia compatible con GPL v3 o posterior."
 
-#: src/common/plugin.c:491
+#: src/common/plugin.c:492
 msgid "This module is for Claws Mail GTK1."
 msgstr "Este módulo es para la versión GTK1 de Claws Mail."
 
-#: src/common/plugin.c:769
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1051,7 +1051,7 @@ msgstr ""
 "Su versión de Claws Mail es más moderna que la versión con la que se "
 "construyó el módulo «%s»"
 
-#: src/common/plugin.c:772
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1059,16 +1059,16 @@ msgstr ""
 "Su versión de Claws Mail es más moderna que la versión con la que se "
 "construyó el módulo."
 
-#: src/common/plugin.c:781
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Su versión de Claws Mail es demasiado antigua para el módulo «%s»."
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Su versión de Claws Mail es demasiado antigua para el módulo."
 
-#: src/common/session.c:202 src/imap.c:1225
+#: src/common/session.c:202 src/imap.c:1226
 msgid "SSL/TLS handshake failed\n"
 msgstr "Negociación SSL/TLS fallida\n"
 
@@ -1088,7 +1088,7 @@ msgstr "respuesta SMTP incorrecta\n"
 msgid "error occurred on SMTP session\n"
 msgstr "hubo un error en la sesión SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:905
+#: src/common/smtp.c:535 src/pop.c:906
 msgid "error occurred on authentication\n"
 msgstr "hubo un error en la autenticación\n"
 
@@ -1097,7 +1097,7 @@ msgstr "hubo un error en la autenticación\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "El mensaje es demasiado grande (Máximo %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:898
+#: src/common/smtp.c:617 src/pop.c:899
 msgid "couldn't start STARTTLS session\n"
 msgstr "no se pudo iniciar la sesión STARTTLS\n"
 
@@ -1129,81 +1129,81 @@ msgstr "%s:%s: falló la búsqueda de la máquina (%s).\n"
 msgid "write on fd%d: %s\n"
 msgstr "escribir en fd%d: %s\n"
 
-#: src/common/ssl_certificate.c:326
+#: src/common/ssl_certificate.c:339
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "No se encuentra el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:334
+#: src/common/ssl_certificate.c:347
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "No se puede leer el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:343
+#: src/common/ssl_certificate.c:356
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "No se puede importar el fichero de certificado P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:628
+#: src/common/ssl_certificate.c:641
 msgid "Internal error"
 msgstr "Error interno"
 
-#: src/common/ssl_certificate.c:633
+#: src/common/ssl_certificate.c:646
 msgid "Uncheckable"
 msgstr "No se puede comprobar"
 
-#: src/common/ssl_certificate.c:637
+#: src/common/ssl_certificate.c:650
 msgid "Self-signed certificate"
 msgstr "Certificado firmado por si mismo"
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:653
 msgid "Revoked certificate"
 msgstr "Certificado revocado"
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:655
 msgid "No certificate issuer found"
 msgstr "No se encontró el emisor del certificado"
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:657
 msgid "Certificate issuer is not a CA"
 msgstr "El emisor del certificado no es una AC"
 
-#: src/common/ssl_certificate.c:869
+#: src/common/ssl_certificate.c:882
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "No se puede abrir el fichero de certificado %s: %s\n"
 
-#: src/common/ssl_certificate.c:873
+#: src/common/ssl_certificate.c:886
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "Falta el fichero de certificado %s (%s)\n"
 
-#: src/common/ssl_certificate.c:892
+#: src/common/ssl_certificate.c:905
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "No se puede abrir el fichero de clave %s (%s)\n"
 
-#: src/common/ssl_certificate.c:896
+#: src/common/ssl_certificate.c:909
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "Falta el fichero de claves %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1044
+#: src/common/ssl_certificate.c:1057
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "No se puede leer el fichero de certificado P12 %s\n"
 
-#: src/common/ssl_certificate.c:1047
+#: src/common/ssl_certificate.c:1060
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "No se puede abrir el fichero de certificado P12 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1051
+#: src/common/ssl_certificate.c:1064
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "Falta el fichero de certificado P12 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1076 src/gtk/sslcertwindow.c:85
+#: src/common/ssl_certificate.c:1089 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
 #: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
@@ -1214,581 +1214,595 @@ msgstr "<no en el certificado>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Asunto vacío por expr. reg.)"
 
-#: src/common/utils.c:220
+#: src/common/utils.c:198
 #, c-format
 msgid "%dB"
 msgstr "%d B"
 
-#: src/common/utils.c:221
+#: src/common/utils.c:199
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d kB"
 
-#: src/common/utils.c:222
+#: src/common/utils.c:200
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d MB"
 
-#: src/common/utils.c:223
+#: src/common/utils.c:201
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f GB"
 
-#: src/common/utils.c:4749
+#: src/common/utils.c:4009
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/common/utils.c:4750
+#: src/common/utils.c:4010
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/common/utils.c:4751
+#: src/common/utils.c:4011
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/common/utils.c:4752
+#: src/common/utils.c:4012
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/common/utils.c:4753
+#: src/common/utils.c:4013
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/common/utils.c:4754
+#: src/common/utils.c:4014
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/common/utils.c:4755
+#: src/common/utils.c:4015
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/common/utils.c:4757
+#: src/common/utils.c:4017
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Enero"
 
-#: src/common/utils.c:4758
+#: src/common/utils.c:4018
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrero"
 
-#: src/common/utils.c:4759
+#: src/common/utils.c:4019
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marzo"
 
-#: src/common/utils.c:4760
+#: src/common/utils.c:4020
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4761
+#: src/common/utils.c:4021
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mayo"
 
-#: src/common/utils.c:4762
+#: src/common/utils.c:4022
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junio"
 
-#: src/common/utils.c:4763
+#: src/common/utils.c:4023
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julio"
 
-#: src/common/utils.c:4764
+#: src/common/utils.c:4024
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: src/common/utils.c:4765
+#: src/common/utils.c:4025
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septiembre"
 
-#: src/common/utils.c:4766
+#: src/common/utils.c:4026
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4767
+#: src/common/utils.c:4027
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Noviembre"
 
-#: src/common/utils.c:4768
+#: src/common/utils.c:4028
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Diciembre"
 
-#: src/common/utils.c:4770
+#: src/common/utils.c:4030
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: src/common/utils.c:4771
+#: src/common/utils.c:4031
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4772
+#: src/common/utils.c:4032
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4773
+#: src/common/utils.c:4033
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mié"
 
-#: src/common/utils.c:4774
+#: src/common/utils.c:4034
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jue"
 
-#: src/common/utils.c:4775
+#: src/common/utils.c:4035
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Vie"
 
-#: src/common/utils.c:4776
+#: src/common/utils.c:4036
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/common/utils.c:4778
+#: src/common/utils.c:4038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Ene"
 
-#: src/common/utils.c:4779
+#: src/common/utils.c:4039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4780
+#: src/common/utils.c:4040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4041
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4042
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "May"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4043
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4784
+#: src/common/utils.c:4044
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4045
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4046
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4787
+#: src/common/utils.c:4047
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4788
+#: src/common/utils.c:4048
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4049
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dic"
 
-#: src/common/utils.c:4800
+#: src/common/utils.c:4060
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4801
+#: src/common/utils.c:4061
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4802
+#: src/common/utils.c:4062
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4803
+#: src/common/utils.c:4063
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:593
+#: src/compose.c:596
 msgid "_Add..."
 msgstr "_Añadir..."
 
-#: src/compose.c:594 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:326
+#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: src/compose.c:596 src/folderview.c:253
+#: src/compose.c:599 src/folderview.c:258
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: src/compose.c:603 src/mainwindow.c:517 src/messageview.c:212
+#: src/compose.c:606 src/mainwindow.c:517 src/messageview.c:214
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: src/compose.c:606
+#: src/compose.c:609
 msgid "_Spelling"
 msgstr "_Ortografía"
 
-#: src/compose.c:608 src/compose.c:675
+#: src/compose.c:611 src/compose.c:678
 msgid "_Options"
 msgstr "_Opciones"
 
-#: src/compose.c:612
+#: src/compose.c:615
 msgid "S_end"
 msgstr "_Enviar"
 
-#: src/compose.c:613
+#: src/compose.c:616
 msgid "Send _later"
 msgstr "Enviar _después"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "_Attach file"
 msgstr "_Adjuntar fichero"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "_Insert file"
 msgstr "_Insertar fichero"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Insert si_gnature"
 msgstr "Insertar _firma"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "_Replace signature"
 msgstr "_Reemplazar firma"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "_Print"
 msgstr "I_mprimir"
 
-#: src/compose.c:628 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: src/compose.c:629 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/compose.c:636
+#: src/compose.c:639
 msgid "_Special paste"
 msgstr "Pegar e_special"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "As _quotation"
 msgstr "Como _citación"
 
-#: src/compose.c:638
+#: src/compose.c:641
 msgid "_Wrapped"
 msgstr "_Recortado"
 
-#: src/compose.c:639
+#: src/compose.c:642
 msgid "_Unwrapped"
 msgstr "_Sin recortar"
 
-#: src/compose.c:641 src/mainwindow.c:550
+#: src/compose.c:644 src/mainwindow.c:550
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Seleccionar todo"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "A_dvanced"
 msgstr "Avanza_das"
 
-#: src/compose.c:644
+#: src/compose.c:647
 msgid "Move a character backward"
 msgstr "Ir al carácter anterior"
 
-#: src/compose.c:645
+#: src/compose.c:648
 msgid "Move a character forward"
 msgstr "Ir al carácter siguiente"
 
-#: src/compose.c:646
+#: src/compose.c:649
 msgid "Move a word backward"
 msgstr "Ir a la palabra anterior"
 
-#: src/compose.c:647
+#: src/compose.c:650
 msgid "Move a word forward"
 msgstr "Ir a la palabra siguiente"
 
-#: src/compose.c:648
+#: src/compose.c:651
 msgid "Move to beginning of line"
 msgstr "Ir al principio de la línea"
 
-#: src/compose.c:649
+#: src/compose.c:652
 msgid "Move to end of line"
 msgstr "Ir al final de la línea"
 
-#: src/compose.c:650
+#: src/compose.c:653
 msgid "Move to previous line"
 msgstr "Ir a la línea anterior"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Move to next line"
 msgstr "Ir a la línea siguiente"
 
-#: src/compose.c:652
+#: src/compose.c:655
 msgid "Delete a character backward"
 msgstr "Borrar el carácter anterior"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Delete a character forward"
 msgstr "Borrar el carácter siguiente"
 
-#: src/compose.c:654
+#: src/compose.c:657
 msgid "Delete a word backward"
 msgstr "Borrar la palabra anterior"
 
-#: src/compose.c:655
+#: src/compose.c:658
 msgid "Delete a word forward"
 msgstr "Borrar la palabra siguiente"
 
-#: src/compose.c:656
+#: src/compose.c:659
 msgid "Delete line"
 msgstr "Borrar línea"
 
-#: src/compose.c:657
+#: src/compose.c:660
 msgid "Delete to end of line"
 msgstr "Borrar hasta el final de la línea"
 
-#: src/compose.c:660 src/messageview.c:229
+#: src/compose.c:663 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Buscar"
 
-#: src/compose.c:663
+#: src/compose.c:666
 msgid "_Wrap current paragraph"
 msgstr "_Recortar el párrafo actual"
 
-#: src/compose.c:664
+#: src/compose.c:667
 msgid "Wrap all long _lines"
 msgstr "Recortar todas las líneas largas"
 
-#: src/compose.c:666
+#: src/compose.c:669
 msgid "Edit with e_xternal editor"
 msgstr "Editar con un editor e_xterno"
 
-#: src/compose.c:669
+#: src/compose.c:672
 msgid "_Check all or check selection"
 msgstr "_Comprobar todo o la selección"
 
-#: src/compose.c:670
+#: src/compose.c:673
 msgid "_Highlight all misspelled words"
 msgstr "_Resaltar todas las faltas ortográficas"
 
-#: src/compose.c:671
+#: src/compose.c:674
 msgid "Check _backwards misspelled word"
 msgstr "Comprobar faltas hacia _atrás"
 
-#: src/compose.c:672
+#: src/compose.c:675
 msgid "_Forward to next misspelled word"
 msgstr "Avanzar hasta la siguiente _falta"
 
-#: src/compose.c:679
+#: src/compose.c:682
 msgid "Reply _mode"
 msgstr "_Modo de respuesta"
 
-#: src/compose.c:681
+#: src/compose.c:684
 msgid "Privacy _System"
 msgstr "_Sistema de privacidad"
 
-#: src/compose.c:685
+#: src/compose.c:688
 msgid "_Priority"
 msgstr "_Prioridad"
 
-#: src/compose.c:687 src/mainwindow.c:612 src/messageview.c:265
+#: src/compose.c:690 src/mainwindow.c:612 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "Codificación de caract_eres"
 
-#: src/compose.c:692 src/mainwindow.c:617 src/messageview.c:270
+#: src/compose.c:695 src/mainwindow.c:617 src/messageview.c:272
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: src/compose.c:693 src/mainwindow.c:618 src/messageview.c:271
+#: src/compose.c:696 src/mainwindow.c:618 src/messageview.c:273
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:694 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:697 src/mainwindow.c:619 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/compose.c:695 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:275
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:696 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:699 src/mainwindow.c:621 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:697 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:700 src/mainwindow.c:622 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/compose.c:698 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:701 src/mainwindow.c:623 src/messageview.c:278
 msgid "Chinese"
 msgstr "Chino"
 
-#: src/compose.c:699 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:702 src/mainwindow.c:624 src/messageview.c:279
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:700 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:280
 msgid "Thai"
 msgstr "Tailandés"
 
-#: src/compose.c:703 src/mainwindow.c:735 src/messageview.c:314
+#: src/compose.c:706 src/mainwindow.c:735 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Agenda de direcciones"
 
-#: src/compose.c:705
+#: src/compose.c:708
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:707 src/mainwindow.c:763 src/messageview.c:334
+#: src/compose.c:710 src/mainwindow.c:763 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "Accio_nes"
 
-#: src/compose.c:716
+#: src/compose.c:719
 msgid "Aut_o wrapping"
 msgstr "Aut_o-recorte"
 
-#: src/compose.c:717
+#: src/compose.c:720
 msgid "Auto _indent"
 msgstr "Auto-_sangrado"
 
-#: src/compose.c:718
+#: src/compose.c:721
 msgid "Si_gn"
 msgstr "Fir_mar"
 
-#: src/compose.c:719
+#: src/compose.c:722
 msgid "_Encrypt"
 msgstr "_Cifrado"
 
-#: src/compose.c:720
+#: src/compose.c:723
 msgid "_Request Return Receipt"
 msgstr "Solicitar acuse de _recibo"
 
-#: src/compose.c:721
+#: src/compose.c:724
 msgid "Remo_ve references"
 msgstr "Eliminar re_ferencias"
 
-#: src/compose.c:722
+#: src/compose.c:725
 msgid "Show _ruler"
 msgstr "Mostrar _regleta"
 
-#: src/compose.c:727 src/compose.c:737
+#: src/compose.c:730 src/compose.c:740
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:728 src/mainwindow.c:666 src/messageview.c:303
+#: src/compose.c:731 src/mainwindow.c:666 src/messageview.c:305
+#: src/summaryview.c:430
 msgid "_All"
 msgstr "_Todo"
 
-#: src/compose.c:729 src/mainwindow.c:667 src/messageview.c:304
+#: src/compose.c:732 src/mainwindow.c:667 src/messageview.c:306
+#: src/summaryview.c:431
 msgid "_Sender"
 msgstr "_Remitente"
 
-#: src/compose.c:730
+#: src/compose.c:733
 msgid "_Mailing-list"
 msgstr "_Lista-Correo"
 
-#: src/compose.c:735
+#: src/compose.c:738
 msgid "_Highest"
 msgstr "_Muy alta"
 
-#: src/compose.c:736
+#: src/compose.c:739
 msgid "Hi_gh"
 msgstr "_Alta"
 
-#: src/compose.c:738
+#: src/compose.c:741
 msgid "Lo_w"
 msgstr "_Baja"
 
-#: src/compose.c:739
+#: src/compose.c:742
 msgid "_Lowest"
 msgstr "M_uy baja"
 
-#: src/compose.c:744 src/mainwindow.c:879 src/messageview.c:351
+#: src/compose.c:747 src/mainwindow.c:879 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Automático"
 
-#: src/compose.c:745 src/mainwindow.c:880 src/messageview.c:352
+#: src/compose.c:748 src/mainwindow.c:880 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:746 src/mainwindow.c:881 src/messageview.c:353
+#: src/compose.c:749 src/mainwindow.c:881 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:750 src/mainwindow.c:885 src/messageview.c:357
+#: src/compose.c:753 src/mainwindow.c:885 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:753 src/mainwindow.c:888 src/messageview.c:360
+#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griego (ISO-8859-_7)"
 
-#: src/compose.c:758 src/mainwindow.c:893 src/messageview.c:365
+#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
-#: src/compose.c:1040
+#: src/compose.c:1015 src/compose.c:1697
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+"Ha optado por firmar y/o cifrar este mensaje, pero no ha seleccionado "
+"ningún sistema de privacidad.\n"
+"\n"
+"La firma y el cifrado han sido desactivados para este mensaje."
+
+#: src/compose.c:1051
 msgid "New message From format error."
 msgstr "Error de formato en el «Desde» del mensaje nuevo."
 
-#: src/compose.c:1133
+#: src/compose.c:1144
 msgid "New message subject format error."
 msgstr "Error de formato en el asunto del mensaje nuevo."
 
-#: src/compose.c:1165 src/quote_fmt.c:563
+#: src/compose.c:1176 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Componer» en la línea %d."
 
-#: src/compose.c:1430
+#: src/compose.c:1445
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "No se puede responder. El correo original probablemente no existe."
 
-#: src/compose.c:1613 src/quote_fmt.c:580
+#: src/compose.c:1630 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1796,12 +1810,12 @@ msgstr ""
 "El campo «Desde» de la plantilla «Responder» contiene una dirección de "
 "correo inválida."
 
-#: src/compose.c:1662 src/quote_fmt.c:583
+#: src/compose.c:1679 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Responder» en la línea %d."
 
-#: src/compose.c:1796 src/compose.c:1988 src/quote_fmt.c:600
+#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1809,55 +1823,55 @@ msgstr ""
 "El campo «Desde» de la plantilla «Reenviar» contiene una dirección de correo "
 "inválida."
 
-#: src/compose.c:1857 src/quote_fmt.c:603
+#: src/compose.c:1883 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Reenviar» en la línea %d."
 
-#: src/compose.c:2031
+#: src/compose.c:2059
 msgid "Fw: multiple emails"
 msgstr "Rv: múltiples correos"
 
-#: src/compose.c:2533
+#: src/compose.c:2566
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla de «Redirigir» en la línea %d."
 
-#: src/compose.c:2600 src/gtk/headers.h:14
+#: src/compose.c:2633 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2603 src/gtk/headers.h:15
+#: src/compose.c:2636 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2606 src/gtk/headers.h:12
+#: src/compose.c:2639 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
-#: src/compose.c:2609 src/compose.c:4971 src/compose.c:4973
+#: src/compose.c:2642 src/compose.c:5006 src/compose.c:5008
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grupos:"
 
-#: src/compose.c:2612 src/gtk/headers.h:34
+#: src/compose.c:2645 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Seguimiento-A:"
 
-#: src/compose.c:2615 src/gtk/headers.h:17
+#: src/compose.c:2648 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En-Respuesta-A:"
 
-#: src/compose.c:2619 src/compose.c:4968 src/compose.c:4976
-#: src/gtk/headers.h:13 src/summary_search.c:423
+#: src/compose.c:2652 src/compose.c:5003 src/compose.c:5011
+#: src/gtk/headers.h:13 src/summary_search.c:421
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2809
+#: src/compose.c:2842
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "No se pudo adjuntar un fichero (falló la conversión de caracteres)."
 
-#: src/compose.c:2815
+#: src/compose.c:2848
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1872,16 +1886,16 @@ msgstr[1] ""
 "Se han adjuntado los siguientes ficheros: \n"
 "%s"
 
-#: src/compose.c:3095
+#: src/compose.c:3128
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "La «marca de cita» de la plantilla no es válida."
 
-#: src/compose.c:3624
+#: src/compose.c:3657
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "No se puede obtener el tamaño del fichero «%s»."
 
-#: src/compose.c:3642
+#: src/compose.c:3675
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1890,57 +1904,57 @@ msgstr ""
 "Está a punto de insertar un fichero de %s en el cuerpo del mensaje. ¿Está "
 "seguro de que desea hacerlo?"
 
-#: src/compose.c:3645
+#: src/compose.c:3678
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: src/compose.c:3646 src/compose.c:10781 src/compose.c:11659
+#: src/compose.c:3679 src/compose.c:10832 src/compose.c:11726
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: src/compose.c:3771
+#: src/compose.c:3804
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:3772
+#: src/compose.c:3805
 msgid "Empty file"
 msgstr "Fichero vacío"
 
-#: src/compose.c:3773
+#: src/compose.c:3806
 msgid "_Attach anyway"
 msgstr "_Adjuntar igualmente"
 
-#: src/compose.c:3782
+#: src/compose.c:3815
 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 
-#: src/compose.c:3809
+#: src/compose.c:3842
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:4814 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4847 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:4821 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4854 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:4824 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4857 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sin asunto] - Componer mensaje%s"
 
-#: src/compose.c:4826 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4859 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Componer un mensaje nuevo"
 
-#: src/compose.c:4853 src/messageview.c:885
+#: src/compose.c:4886 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1948,61 +1962,61 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:5068 src/compose.c:5105
+#: src/compose.c:5103 src/compose.c:5140
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección predeterminada «%s». ¿Enviar de todas "
 "formas?"
 
-#: src/compose.c:5070 src/compose.c:5107 src/compose.c:5145 src/compose.c:5188
-#: src/prefs_account.c:3754 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5105 src/compose.c:5142 src/compose.c:5180 src/compose.c:5223
+#: src/prefs_account.c:3778 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:5072 src/compose.c:5109 src/compose.c:5146 src/compose.c:5189
-#: src/compose.c:5751 src/folderview.c:2543 src/messageview.c:857
-#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3042
+#: src/compose.c:5107 src/compose.c:5144 src/compose.c:5181 src/compose.c:5224
+#: src/compose.c:5786 src/folderview.c:2579 src/messageview.c:859
+#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:5126
+#: src/compose.c:5161
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:5141
+#: src/compose.c:5176
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "El asunto esta vacío. %s"
 
-#: src/compose.c:5142 src/compose.c:5185
+#: src/compose.c:5177 src/compose.c:5220
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "¿Enviarlo igualmente?"
 
-#: src/compose.c:5143 src/compose.c:5186
+#: src/compose.c:5178 src/compose.c:5221
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "¿Ponerlo en la cola igualmente?"
 
-#: src/compose.c:5145 src/compose.c:5188 src/toolbar.c:520
+#: src/compose.c:5180 src/compose.c:5223 src/toolbar.c:520
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:5146 src/compose.c:5189
+#: src/compose.c:5181 src/compose.c:5224
 msgid "_Queue"
 msgstr "_A la cola"
 
-#: src/compose.c:5184
+#: src/compose.c:5219
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Enviando a %d destinatarios. %s"
 
-#: src/compose.c:5213
+#: src/compose.c:5248
 msgid "Could not queue message."
 msgstr "El mensaje no se pudo poner en la cola."
 
-#: src/compose.c:5216
+#: src/compose.c:5251
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2013,7 +2027,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5220
+#: src/compose.c:5255
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2024,7 +2038,7 @@ msgstr ""
 "\n"
 "Falló la firma: %s"
 
-#: src/compose.c:5225
+#: src/compose.c:5260
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2035,7 +2049,7 @@ msgstr ""
 "\n"
 "Falló el cifrado: %s"
 
-#: src/compose.c:5230
+#: src/compose.c:5265
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2045,7 +2059,7 @@ msgstr ""
 "\n"
 "Falló la conversión del conjunto caracteres."
 
-#: src/compose.c:5234
+#: src/compose.c:5269
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2055,7 +2069,7 @@ msgstr ""
 "\n"
 "No se pudo obtener la clave de cifrado del destinatario."
 
-#: src/compose.c:5294 src/compose.c:5354
+#: src/compose.c:5329 src/compose.c:5389
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2063,7 +2077,7 @@ msgstr ""
 "El mensaje está en la cola pero no se pudo enviar.\n"
 "Utilice «Enviar mensaje(s) en cola» en la ventana principal para enviarlo"
 
-#: src/compose.c:5350
+#: src/compose.c:5385
 #, c-format
 msgid ""
 "%s\n"
@@ -2072,7 +2086,7 @@ msgstr ""
 "%s\n"
 "Utilice «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
 
-#: src/compose.c:5747
+#: src/compose.c:5782
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2083,7 +2097,7 @@ msgstr ""
 "al conjunto de caracteres %s especificado.\n"
 "¿Enviarlo como %s?"
 
-#: src/compose.c:5809
+#: src/compose.c:5844
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2096,69 +2110,69 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:6041
+#: src/compose.c:6076
 msgid "Encryption warning"
 msgstr "Aviso de cifrado"
 
-#: src/compose.c:6042
+#: src/compose.c:6077
 msgid "C_ontinue"
 msgstr "C_ontinuar"
 
-#: src/compose.c:6091
+#: src/compose.c:6126
 msgid "No account for sending mails available!"
 msgstr "¡No hay ninguna cuenta disponible para enviar correos!"
 
-#: src/compose.c:6100
+#: src/compose.c:6135
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "La cuenta seleccionada no es NNTP: es imposible enviar el post."
 
-#: src/compose.c:6340
+#: src/compose.c:6389
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "El adjunto %s ya no existe. ¿Ignorar?"
 
-#: src/compose.c:6342 src/mainwindow.c:657 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6391 src/mainwindow.c:657 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Cancelar envío"
 
-#: src/compose.c:6342
+#: src/compose.c:6391
 msgid "Ignore attachment"
 msgstr "Ignorar adjunto"
 
-#: src/compose.c:6398
+#: src/compose.c:6447
 #, c-format
 msgid "Original %s part"
 msgstr "Parte original %s"
 
-#: src/compose.c:6998
+#: src/compose.c:7047
 msgid "Add to address _book"
 msgstr "Añadir a la agen_da"
 
-#: src/compose.c:7165
+#: src/compose.c:7214
 msgid "Delete entry contents"
 msgstr "Borrar contenidos de la cuenta"
 
-#: src/compose.c:7169 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7218 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar «tab» para autocompletar con la agenda"
 
-#: src/compose.c:7401
+#: src/compose.c:7450
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7407 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:451
-#: src/prefs_matcher.c:629 src/prefs_summaries.c:441
-#: src/prefs_summary_column.c:84 src/summaryview.c:449
+#: src/compose.c:7456 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:451
+#: src/prefs_matcher.c:640 src/prefs_summaries.c:612
+#: src/prefs_summary_column.c:84 src/summaryview.c:469
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:7470
+#: src/compose.c:7518
 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 
-#: src/compose.c:7498 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7549 src/editjpilot.c:276 src/editldap.c:517
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
-#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1080
+#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2167,27 +2181,27 @@ msgstr "Guardar mensaje en "
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: src/compose.c:7520
+#: src/compose.c:7565
 msgid "Select folder to save message to"
 msgstr "Seleccionar la carpeta en la que guardar el mensaje"
 
-#: src/compose.c:7977
+#: src/compose.c:8022
 msgid "Hea_der"
 msgstr "_Cabecera"
 
-#: src/compose.c:7982
+#: src/compose.c:8027
 msgid "_Attachments"
 msgstr "_Adjuntos"
 
-#: src/compose.c:7996
+#: src/compose.c:8041
 msgid "Othe_rs"
 msgstr "Ot_ros"
 
-#: src/compose.c:8011
+#: src/compose.c:8056
 msgid "S_ubject:"
 msgstr "As_unto:"
 
-#: src/compose.c:8235
+#: src/compose.c:8280
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2196,19 +2210,19 @@ msgstr ""
 "No se puede iniciar el corrector ortográfico.\n"
 "%s"
 
-#: src/compose.c:8382
+#: src/compose.c:8427
 msgid "_From:"
 msgstr "_Desde:"
 
-#: src/compose.c:8399
+#: src/compose.c:8444
 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 
-#: src/compose.c:8401
+#: src/compose.c:8446
 msgid "Sender address to be used"
 msgstr "Dirección del remitente a usar"
 
-#: src/compose.c:8583
+#: src/compose.c:8628
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2217,50 +2231,50 @@ msgstr ""
 "No se ha podido cargar el sistema de privacidad «%s». No será posible firmar "
 "o cifrar este mensaje."
 
-#: src/compose.c:8694 src/plugins/archive/archiver_gtk.c:1179
+#: src/compose.c:8739 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/compose.c:8795 src/prefs_template.c:751
+#: src/compose.c:8840 src/prefs_template.c:751
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla en la línea %d."
 
-#: src/compose.c:8892
+#: src/compose.c:8937
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Error de formato en la cabecera «%s» de la plantilla."
 
-#: src/compose.c:9315
+#: src/compose.c:9361
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:9330
+#: src/compose.c:9376
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:9404
+#: src/compose.c:9450
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:9421
+#: src/compose.c:9467
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:9454
+#: src/compose.c:9500
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:9474
+#: src/compose.c:9520
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:9475
+#: src/compose.c:9521
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:9734
+#: src/compose.c:9780
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2271,19 +2285,19 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:10202 src/messageview.c:1086
+#: src/compose.c:10253 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail necesita acceso a la red para poder enviar este correo."
 
-#: src/compose.c:10395
+#: src/compose.c:10446
 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 
-#: src/compose.c:10399
+#: src/compose.c:10450
 msgid "Could not save draft"
 msgstr "No se puede guardar el borrador"
 
-#: src/compose.c:10400
+#: src/compose.c:10451
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2291,24 +2305,24 @@ msgstr ""
 "No se ha podido guardar el borrador.\n"
 "¿Desea cancelar la salida o descartar este correo?"
 
-#: src/compose.c:10402
+#: src/compose.c:10453
 msgid "_Cancel exit"
 msgstr "_Cancelar salida"
 
-#: src/compose.c:10402
+#: src/compose.c:10453
 msgid "_Discard email"
 msgstr "_Descartar correo"
 
-#: src/compose.c:10591 src/compose.c:10605
+#: src/compose.c:10642 src/compose.c:10656
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:10619
+#: src/compose.c:10670
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero «%s»."
 
-#: src/compose.c:10621
+#: src/compose.c:10672
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2317,50 +2331,50 @@ msgstr ""
 "El fichero «%s» contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 
-#: src/compose.c:10700
+#: src/compose.c:10751
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:10701
+#: src/compose.c:10752
 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
-#: src/compose.c:10702 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10753 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10702 src/compose.c:10707
+#: src/compose.c:10753 src/compose.c:10758
 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 
-#: src/compose.c:10705 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10756 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: src/compose.c:10706
+#: src/compose.c:10757
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Este mensaje se ha modificado. ¿Guardar los últimos cambios?"
 
-#: src/compose.c:10707
+#: src/compose.c:10758
 msgid "_Don't save"
 msgstr "_No guardar"
 
-#: src/compose.c:10778
+#: src/compose.c:10829
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:10780
+#: src/compose.c:10831
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:10781 src/prefs_actions.c:329 src/prefs_filtering_action.c:594
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:769 src/prefs_template.c:310
+#: src/compose.c:10832 src/prefs_actions.c:330 src/prefs_filtering_action.c:582
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:794 src/prefs_template.c:310
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:11652
+#: src/compose.c:11719
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2375,20 +2389,20 @@ msgstr[1] ""
 "¿Quiere insertar el contenido de estos %d ficheros en el cuerpo del correo o "
 "prefiere adjuntarlos al mismo?"
 
-#: src/compose.c:11658
+#: src/compose.c:11725
 msgid "Insert or attach?"
 msgstr "¿Insertar o adjuntar?"
 
-#: src/compose.c:11659
+#: src/compose.c:11726
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: src/compose.c:11877
+#: src/compose.c:11944
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de formato de cita en la línea %d."
 
-#: src/compose.c:12174
+#: src/compose.c:12240
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2435,11 +2449,11 @@ msgstr "Crear informe de error"
 msgid "Save crash information"
 msgstr "Guardar información de terminación incorrecta"
 
-#: src/editaddress.c:149 src/editaddress.c:287
+#: src/editaddress.c:150 src/editaddress.c:288
 msgid "Add New Person"
 msgstr "Añadir persona nueva"
 
-#: src/editaddress.c:151
+#: src/editaddress.c:152
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2465,7 +2479,7 @@ msgstr ""
 "Pulse «Aceptar» para seguir editando este contacto.\n"
 "Pulse «Cancelar» para cerrar sin guardar."
 
-#: src/editaddress.c:162
+#: src/editaddress.c:163
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2487,35 +2501,35 @@ msgstr ""
 "Pulse «Aceptar» para seguir editando este contacto.\n"
 "Pulse «Cancelar» para cerrar sin guardar."
 
-#: src/editaddress.c:288
+#: src/editaddress.c:289
 msgid "Edit Person Details"
 msgstr "Editar detalles personales"
 
-#: src/editaddress.c:506
+#: src/editaddress.c:507
 msgid "An Email address must be supplied."
 msgstr "Debe especificarse una dirección de correo."
 
-#: src/editaddress.c:709 src/editaddress_other_attributes_ldap.c:205
+#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
 msgid "A Name and Value must be supplied."
 msgstr "Debe especificarse un Nombre y un Valor"
 
-#: src/editaddress.c:819 src/prefs_folder_item.c:1693
+#: src/editaddress.c:820 src/prefs_folder_item.c:1784
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/editaddress.c:820
+#: src/editaddress.c:821
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/editaddress.c:850 src/editaddress.c:899
+#: src/editaddress.c:851 src/editaddress.c:900
 msgid "Edit Person Data"
 msgstr "Editar datos personales"
 
-#: src/editaddress.c:928
+#: src/editaddress.c:929
 msgid "Choose a picture"
 msgstr "Elegir una imagen"
 
-#: src/editaddress.c:947
+#: src/editaddress.c:948
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2524,58 +2538,58 @@ msgstr ""
 "Falló al importar la imagen: \n"
 "%s"
 
-#: src/editaddress.c:989
+#: src/editaddress.c:990
 msgid "_Set picture"
 msgstr "A_sociar imagen"
 
-#: src/editaddress.c:990
+#: src/editaddress.c:991
 msgid "_Unset picture"
 msgstr "Q_uitar imagen asociada"
 
-#: src/editaddress.c:1048
+#: src/editaddress.c:1049
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:1095 src/editaddress.c:1097 src/expldifdlg.c:516
-#: src/exporthtml.c:761 src/ldif.c:746
+#: src/editaddress.c:1096 src/editaddress.c:1098 src/expldifdlg.c:516
+#: src/exporthtml.c:762 src/ldif.c:747
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#: src/editaddress.c:1106 src/editaddress.c:1110 src/ldif.c:754
+#: src/editaddress.c:1107 src/editaddress.c:1111 src/ldif.c:755
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/editaddress.c:1107 src/editaddress.c:1109 src/ldif.c:750
+#: src/editaddress.c:1108 src/editaddress.c:1110 src/ldif.c:751
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/editaddress.c:1113 src/editaddress.c:1115
+#: src/editaddress.c:1114 src/editaddress.c:1116
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/editaddress.c:1251 src/editaddress.c:1292
+#: src/editaddress.c:1252 src/editaddress.c:1293
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1477 src/editaddress.c:1510 src/editaddress.c:1526
+#: src/editaddress.c:1478 src/editaddress.c:1511 src/editaddress.c:1527
 #: src/editaddress_other_attributes_ldap.c:376
-#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:221
+#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:222
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1592
+#: src/editaddress.c:1593
 msgid "_User Data"
 msgstr "Datos de _usuario"
 
-#: src/editaddress.c:1593
+#: src/editaddress.c:1594
 msgid "_Email Addresses"
 msgstr "_Direcciones de correo"
 
-#: src/editaddress.c:1596 src/editaddress.c:1599
+#: src/editaddress.c:1597 src/editaddress.c:1600
 msgid "O_ther Attributes"
 msgstr "O_tros atributos"
 
-#: src/editaddress.c:1767
+#: src/editaddress.c:1768
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2605,8 +2619,8 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2173
-#: src/wizard.c:1197 src/wizard.c:1617
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2178
+#: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Fichero"
 
@@ -2618,19 +2632,19 @@ msgstr "Añadir nueva agenda"
 msgid "A Group Name must be supplied."
 msgstr "Debe proporcionar un nombre de grupo"
 
-#: src/editgroup.c:294
+#: src/editgroup.c:296
 msgid "Edit Group Data"
 msgstr "Editar datos del grupo"
 
-#: src/editgroup.c:323 src/exporthtml.c:597
+#: src/editgroup.c:325 src/exporthtml.c:598
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: src/editgroup.c:342
+#: src/editgroup.c:344
 msgid "Addresses in Group"
 msgstr "Direcciones en el grupo"
 
-#: src/editgroup.c:377
+#: src/editgroup.c:378
 msgid "Available Addresses"
 msgstr "Direcciones disponibles"
 
@@ -2655,12 +2669,12 @@ msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
 #: src/editgroup.c:556 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
+#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "New folder"
 msgstr "Nueva carpeta"
 
 #: src/editgroup.c:557 src/foldersel.c:571 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2688,14 +2702,14 @@ msgstr "Añadir nueva entrada JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Seleccionar base de búsqueda"
 
-#: src/editldap_basedn.c:172 src/editldap.c:440 src/prefs_account.c:2925
+#: src/editldap_basedn.c:172 src/editldap.c:440 src/prefs_account.c:2930
 #: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "Nombre de máquina"
 
 #: src/editldap_basedn.c:182 src/editldap.c:457
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2932
-#: src/prefs_proxy.c:105 src/ssl_manager.c:108
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2937
+#: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Puerto"
 
@@ -2756,7 +2770,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:469 src/prefs_account.c:3827
+#: src/editldap.c:469 src/prefs_account.c:3851
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2922,8 +2936,8 @@ msgstr "Contraseña de enlace"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "La contraseña a usar al conectar como el usuario \"DN de enlace\"."
 
-#: src/editldap.c:738 src/prefs_account.c:1406 src/prefs_account.c:2018
-#: src/prefs_account.c:2737 src/prefs_account.c:2765 src/prefs_account.c:2970
+#: src/editldap.c:738 src/prefs_account.c:1402 src/prefs_account.c:2023
+#: src/prefs_account.c:2742 src/prefs_account.c:2770 src/prefs_account.c:2975
 #: src/prefs_proxy.c:146
 msgid "Show password"
 msgstr "Mostrar contraseña"
@@ -2947,11 +2961,11 @@ msgstr ""
 "El número máximo de entradas que deberían retornarse en los resultados de la "
 "búsqueda."
 
-#: src/editldap.c:792 src/prefs_account.c:3718
+#: src/editldap.c:792 src/prefs_account.c:3742
 msgid "Basic"
 msgstr "Básicas"
 
-#: src/editldap.c:794 src/gtk/quicksearch.c:708
+#: src/editldap.c:794 src/gtk/quicksearch.c:706
 msgid "Extended"
 msgstr "Extendido"
 
@@ -2959,8 +2973,8 @@ msgstr "Extendido"
 msgid "Add New LDAP Server"
 msgstr "Añadir nuevo servidor LDAP"
 
-#: src/edittags.c:192 src/prefs_filtering_action.c:1426
-#: src/prefs_summaries.c:448
+#: src/edittags.c:192 src/prefs_filtering_action.c:1402
+#: src/prefs_summaries.c:619
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -3085,25 +3099,26 @@ msgstr "Fichero HTML de salida"
 msgid "B_rowse"
 msgstr "Explo_rar"
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:300
+#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:301
 msgid "Stylesheet"
 msgstr "Hoja de estilos"
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1577
-#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:125 src/mainwindow.c:1170
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
+#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:123 src/mainwindow.c:1170
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1041
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6197
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1037
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6244
 msgid "None"
 msgstr "Ninguno"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:519 src/prefs_other.c:126
-#: src/prefs_other.c:414
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
+#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
+#: src/prefs_other.c:127 src/prefs_other.c:415
 msgid "Default"
 msgstr "Por omisión"
 
 #: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
+#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
 msgid "Full"
 msgstr "Completo"
 
@@ -3334,7 +3349,7 @@ msgstr "Exportar agenda a un fichero LDIF"
 msgid "Distinguished Name"
 msgstr "Nombre distinguido"
 
-#: src/export.c:113 src/summaryview.c:8369
+#: src/export.c:113 src/summaryview.c:8459
 msgid "Export to mbox file"
 msgstr "Exportar a fichero mbox"
 
@@ -3370,46 +3385,46 @@ msgstr "Seleccione fichero de exportación"
 msgid "Select folder to export"
 msgstr "Seleccionar la carpeta a exportar"
 
-#: src/exporthtml.c:767
+#: src/exporthtml.c:768
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: src/exporthtml.c:771 src/importldif.c:980
-#: src/plugins/archive/archiver_gtk.c:771
+#: src/exporthtml.c:772 src/importldif.c:980
+#: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/exporthtml.c:974
+#: src/exporthtml.c:975
 msgid "Claws Mail Address Book"
 msgstr "Agenda de direcciones de Claws Mail"
 
-#: src/exporthtml.c:1069 src/exportldif.c:606
+#: src/exporthtml.c:1070 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
 msgstr "El nombre ya existe pero no es un directorio."
 
-#: src/exporthtml.c:1072 src/exportldif.c:609
+#: src/exporthtml.c:1073 src/exportldif.c:610
 msgid "No permissions to create directory."
 msgstr "No tiene permisos para crear el directorio."
 
-#: src/exporthtml.c:1075 src/exportldif.c:612
+#: src/exporthtml.c:1076 src/exportldif.c:613
 msgid "Name is too long."
 msgstr "El nombre es demasiado largo."
 
-#: src/exporthtml.c:1078 src/exportldif.c:615
+#: src/exporthtml.c:1079 src/exportldif.c:616
 msgid "Not specified."
 msgstr "Sin especificar."
 
-#: src/file_checker.c:76
+#: src/file_checker.c:77
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr "¡Falta el fichero «%s»! ¿Desea usar la copia de respaldo de «%s»?"
 
-#: src/file_checker.c:85 src/file_checker.c:108
+#: src/file_checker.c:86 src/file_checker.c:109
 #, c-format
 msgid "Could not copy %s to %s"
 msgstr "No se puede copiar «%s» a «%s»"
 
-#: src/file_checker.c:99
+#: src/file_checker.c:100
 #, c-format
 msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3592,61 +3607,61 @@ msgstr ""
 "filtrando mensaje (%s%s%s)\n"
 "%sfichero de mensaje: %s\n"
 
-#: src/folder.c:1591 src/prefs_folder_item.c:315
+#: src/folder.c:1595 src/prefs_folder_item.c:319
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/folder.c:1595
+#: src/folder.c:1599
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/folder.c:1599 src/plugins/attachwarner/attachwarner.c:218
-#: src/prefs_folder_item.c:318
+#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
+#: src/prefs_folder_item.c:322
 msgid "Queue"
 msgstr "Cola"
 
-#: src/folder.c:1603 src/prefs_folder_item.c:319
+#: src/folder.c:1607 src/prefs_folder_item.c:323
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/folder.c:1607 src/prefs_folder_item.c:317
+#: src/folder.c:1611 src/prefs_folder_item.c:321
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/folder.c:2038
+#: src/folder.c:2042
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Procesando (%s)...\n"
 
-#: src/folder.c:3283
+#: src/folder.c:3287
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s a %s...\n"
 
-#: src/folder.c:3283
+#: src/folder.c:3287
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Moviendo %s a %s...\n"
 
-#: src/folder.c:3593
+#: src/folder.c:3597
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualizando caché para %s..."
 
-#: src/folder.c:4455
+#: src/folder.c:4459
 msgid "Processing messages..."
 msgstr "Procesando mensajes..."
 
-#: src/folder.c:4590
+#: src/folder.c:4594
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso sin conexión...\n"
 
-#: src/folder.c:4849
+#: src/folder.c:4853
 msgid "A folder name cannot begin or end with a dot."
 msgstr "El nombre de una carpeta no puede empezar o terminar con un punto."
 
-#: src/folder.c:4853
+#: src/folder.c:4857
 msgid "A folder name can not end with a space."
 msgstr "El nombre de una carpeta no puede terminar con un espacio."
 
@@ -3655,102 +3670,106 @@ msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
 #: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
 #: src/foldersel.c:580 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2064
+#: src/plugins/rssyl/rssyl_cb_menu.c:202
+#: src/plugins/vcalendar/vcal_folder.c:2065
 #, 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:595 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
+#: src/plugins/vcalendar/vcal_folder.c:2072
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
 #: src/foldersel.c:602 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:124
+#: src/plugins/rssyl/rssyl_cb_menu.c:125
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "No se puede crear la carpeta «%s»."
 
-#: src/folderview.c:246
+#: src/folderview.c:251
 msgid "Mark all re_ad"
 msgstr "Marcar todos como l_eídos"
 
-#: src/folderview.c:247
+#: src/folderview.c:252
 msgid "Mark all u_nread"
 msgstr "Marcar todos como _no leídos"
 
-#: src/folderview.c:248
+#: src/folderview.c:253
 msgid "Mark all read recursi_vely"
 msgstr "Marcar todos como leídos recurs_ivamente"
 
-#: src/folderview.c:249
+#: src/folderview.c:254
 msgid "Mark all unread recursi_vely"
 msgstr "Marcar todos como no leídos recursi_vamente"
 
-#: src/folderview.c:251
+#: src/folderview.c:256
 msgid "R_un processing rules"
 msgstr "Ejec_utar reglas de procesamiento"
 
-#: src/folderview.c:252 src/mainwindow.c:554
+#: src/folderview.c:257 src/mainwindow.c:554
 msgid "_Search folder..."
 msgstr "_Buscar en carpeta..."
 
-#: src/folderview.c:254
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr "Pr_ocesamiento..."
 
-#: src/folderview.c:255
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "_Vaciar papelera..."
 
-#: src/folderview.c:256
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr "Enviar _cola..."
 
-#: src/folderview.c:396 src/folderview.c:443
+#: src/folderview.c:268
+msgid "Set Displayed columns"
+msgstr "Establecer columnas visibles"
+
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:392 src/summaryview.c:6471
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6518
 msgid "New"
 msgstr "Nuevos"
 
-#: src/folderview.c:397 src/folderview.c:444
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:391 src/summaryview.c:6473
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6520
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:398 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:446 src/summaryview.c:450
+#: src/folderview.c:457 src/summaryview.c:470
 msgid "#"
 msgstr "N.º"
 
-#: src/folderview.c:781
+#: src/folderview.c:808
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:866 src/summaryview.c:4235
+#: src/folderview.c:893 src/summaryview.c:4282
 msgid "Mark all as read"
 msgstr "Marcar todo como leído"
 
-#: src/folderview.c:867
+#: src/folderview.c:894
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3758,15 +3777,15 @@ msgstr ""
 "¿Desea marcar todos los correos en esta carpeta y sus subcarpetas como "
 "leídos?"
 
-#: src/folderview.c:869 src/summaryview.c:4236
+#: src/folderview.c:896 src/summaryview.c:4283
 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:872 src/summaryview.c:4281
+#: src/folderview.c:899 src/summaryview.c:4328
 msgid "Mark all as unread"
 msgstr "Marcar todo como no leído"
 
-#: src/folderview.c:873
+#: src/folderview.c:900
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
@@ -3774,95 +3793,95 @@ msgstr ""
 "¿Desea marcar todos los correos en esta carpeta y sus subcarpetas como no "
 "leídos?"
 
-#: src/folderview.c:875 src/summaryview.c:4282
+#: src/folderview.c:902 src/summaryview.c:4329
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 "¿Quiere realmente marcar todos los correos en la carpeta como no leídos?"
 
-#: src/folderview.c:1065 src/imap.c:4631
+#: src/folderview.c:1092 src/imap.c:4628
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Revisando carpeta %s/%s..."
 
-#: src/folderview.c:1068 src/imap.c:4635 src/mainwindow.c:5235 src/setup.c:96
+#: src/folderview.c:1095 src/imap.c:4632 src/mainwindow.c:5247 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Revisando carpeta %s..."
 
-#: src/folderview.c:1099
+#: src/folderview.c:1126
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:1100
+#: src/folderview.c:1127
 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:1110
+#: src/folderview.c:1137
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo árbol de carpetas..."
 
-#: src/folderview.c:1112
+#: src/folderview.c:1139
 msgid "Scanning folder tree..."
 msgstr "Explorando árbol de carpetas..."
 
-#: src/folderview.c:1203
+#: src/folderview.c:1230
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No se puede explorar la carpeta %s\n"
 
-#: src/folderview.c:1257
+#: src/folderview.c:1284
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:2228
+#: src/folderview.c:2264
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Cerrando carpeta %s..."
 
-#: src/folderview.c:2323
+#: src/folderview.c:2359
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abriendo carpeta %s..."
 
-#: src/folderview.c:2341
+#: src/folderview.c:2377
 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 
-#: src/folderview.c:2483 src/mainwindow.c:2880 src/mainwindow.c:2885
+#: src/folderview.c:2519 src/mainwindow.c:2882 src/mainwindow.c:2887
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2484
+#: src/folderview.c:2520
 msgid "Delete all messages in trash?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2521
 msgid "_Empty trash"
 msgstr "_Vaciar papelera"
 
-#: src/folderview.c:2529 src/inc.c:1635 src/toolbar.c:3020
+#: src/folderview.c:2565 src/inc.c:1663 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Notificación conexión"
 
-#: src/folderview.c:2530 src/toolbar.c:3021
+#: src/folderview.c:2566 src/toolbar.c:3033
 msgid "You're working offline. Override?"
 msgstr "Está trabajando sin conexión ¿Ignorar?"
 
-#: src/folderview.c:2541 src/toolbar.c:3040
+#: src/folderview.c:2577 src/toolbar.c:3052
 msgid "Send queued messages"
 msgstr "Enviar mensajes en la cola"
 
-#: src/folderview.c:2542 src/toolbar.c:3041
+#: src/folderview.c:2578 src/toolbar.c:3053
 msgid "Send all queued messages?"
 msgstr "¿Enviar todos los mensajes en la cola?"
 
-#: src/folderview.c:2551 src/toolbar.c:3060
+#: src/folderview.c:2587 src/toolbar.c:3072
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 
-#: src/folderview.c:2554 src/main.c:2792 src/toolbar.c:3063
+#: src/folderview.c:2590 src/main.c:2786 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3871,64 +3890,64 @@ msgstr ""
 "Hubo algún error enviando los mensajes en la cola:\n"
 "%s"
 
-#: src/folderview.c:2629
+#: src/folderview.c:2665
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "¿Quiere realmente copiar la carpeta «%s» a «%s»?"
 
-#: src/folderview.c:2630
+#: src/folderview.c:2666
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "¿Quiere realmente hacer de la carpeta «%s» una subcarpeta de «%s»?"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2668
 msgid "Copy folder"
 msgstr "Copiar carpeta"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2668
 msgid "Move folder"
 msgstr "Mover carpeta"
 
-#: src/folderview.c:2643
+#: src/folderview.c:2679
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s a %s..."
 
-#: src/folderview.c:2643
+#: src/folderview.c:2679
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 
-#: src/folderview.c:2677
+#: src/folderview.c:2713
 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 
-#: src/folderview.c:2680
+#: src/folderview.c:2716
 msgid "Can't copy a folder to one of its children."
 msgstr "No se puede copiar una carpeta a una de sus subcarpetas."
 
-#: src/folderview.c:2681
+#: src/folderview.c:2717
 msgid "Can't move a folder to one of its children."
 msgstr "No se puede mover la carpeta a una de sus subcarpetas."
 
-#: src/folderview.c:2684
+#: src/folderview.c:2720
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 
-#: src/folderview.c:2687
+#: src/folderview.c:2723
 msgid "Copy failed!"
 msgstr "¡Copiar falló!"
 
-#: src/folderview.c:2687
+#: src/folderview.c:2723
 msgid "Move failed!"
 msgstr "¡Mover falló!"
 
-#: src/folderview.c:2737
+#: src/folderview.c:2773
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuración de procesamiento para la carpeta «%s»"
 
-#: src/folderview.c:3176 src/summaryview.c:4690 src/summaryview.c:4796
+#: src/folderview.c:3212 src/summaryview.c:4737 src/summaryview.c:4843
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La carpeta destino sólo puede usarse para almacenar subcarpetas."
 
@@ -3960,49 +3979,49 @@ msgstr "Mensajes"
 msgid "Type"
 msgstr "Tipo"
 
-#: src/grouplistdialog.c:347
+#: src/grouplistdialog.c:346
 msgid "moderated"
 msgstr "moderado"
 
-#: src/grouplistdialog.c:349
+#: src/grouplistdialog.c:348
 msgid "readonly"
 msgstr "solo lectura"
 
-#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:114
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: src/plugins/vcalendar/vcal_manager.c:115
+#: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/grouplistdialog.c:422
+#: src/grouplistdialog.c:421
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1863 src/summaryview.c:1626
+#: src/grouplistdialog.c:458 src/gtk/gtkutils.c:1857 src/summaryview.c:1669
 msgid "Done."
 msgstr "Hecho."
 
-#: src/grouplistdialog.c:492
+#: src/grouplistdialog.c:491
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de noticias recibidos (%s leídos)"
 
-#: src/gtk/about.c:132
+#: src/gtk/about.c:133
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr ""
 "Claws Mail es un cliente de correo ligero, rápido y altamente configurable."
 
-#: src/gtk/about.c:135
+#: src/gtk/about.c:136
 msgid "For further information visit the Claws Mail website:"
 msgstr "Para más información visite el sitio web de Claws Mail:"
 
-#: src/gtk/about.c:140
+#: src/gtk/about.c:141
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
 "Para soporte y discusión suscríbase a la lista de usuarios de Claws Mail:"
 
-#: src/gtk/about.c:146
+#: src/gtk/about.c:147
 msgid ""
 "Claws Mail is free software released under the GPL. If you wish to donate to "
 "the Claws Mail project you can do so at:"
@@ -4010,7 +4029,7 @@ msgstr ""
 "Claws Mail es software libre distribuido bajo licencia GPL. Si desea "
 "realizar alguna donación al proyecto Claws Mail puede hacerlo en:"
 
-#: src/gtk/about.c:162 src/gtk/about.c:850
+#: src/gtk/about.c:163 src/gtk/about.c:851
 msgid ""
 "Copyright (C) 1999-2018\n"
 "The Claws Mail Team\n"
@@ -4020,11 +4039,11 @@ msgstr ""
 "El equipo de Claws Mail\n"
 "e Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:167
+#: src/gtk/about.c:168
 msgid "System Information\n"
 msgstr "Información del sistema\n"
 
-#: src/gtk/about.c:173
+#: src/gtk/about.c:174
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4033,7 +4052,7 @@ msgstr ""
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: %s %s (%s)"
 
-#: src/gtk/about.c:182
+#: src/gtk/about.c:183
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4042,7 +4061,7 @@ msgstr ""
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: %s"
 
-#: src/gtk/about.c:191
+#: src/gtk/about.c:192
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4051,96 +4070,96 @@ msgstr ""
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: desconocido"
 
-#: src/gtk/about.c:247 src/prefs_themes.c:842 src/wizard.c:528
+#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
 msgid "The Claws Mail Team"
 msgstr "El equipo de Claws Mail"
 
-#: src/gtk/about.c:266
+#: src/gtk/about.c:267
 msgid "Previous team members"
 msgstr "Miembros anteriores del equipo"
 
-#: src/gtk/about.c:285
+#: src/gtk/about.c:286
 msgid "The translation team"
 msgstr "El equipo de traducción"
 
-#: src/gtk/about.c:304
+#: src/gtk/about.c:305
 msgid "Documentation team"
 msgstr "El equipo de documentación"
 
-#: src/gtk/about.c:322
+#: src/gtk/about.c:323
 msgid "Logo"
 msgstr "Logotipo"
 
-#: src/gtk/about.c:341
+#: src/gtk/about.c:342
 msgid "Icons"
 msgstr "Iconos"
 
-#: src/gtk/about.c:360
+#: src/gtk/about.c:361
 msgid "Contributors"
 msgstr "Contribuciones"
 
-#: src/gtk/about.c:408
+#: src/gtk/about.c:409
 msgid "Compiled-in Features"
 msgstr "Características incluidas al compilar"
 
-#: src/gtk/about.c:425
+#: src/gtk/about.c:426
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "Añade soporte para la cabecera X-Face\n"
 
-#: src/gtk/about.c:435
+#: src/gtk/about.c:436
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "Añade soporte para la comprobación ortográfica\n"
 
-#: src/gtk/about.c:445
+#: src/gtk/about.c:446
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "Añade soporte para conexiones cifradas con los servidores\n"
 
-#: src/gtk/about.c:455
+#: src/gtk/about.c:456
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr ""
 "Añade soporte para direcciones IPv6, el nuevo protocolo de direcciones de "
 "Internet\n"
 
-#: src/gtk/about.c:466
+#: src/gtk/about.c:467
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "Permite conversiones entre diferentes conjuntos de caracteres\n"
 
-#: src/gtk/about.c:476
+#: src/gtk/about.c:477
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "Añade soporte para agendas de direcciones de PalmOS\n"
 
-#: src/gtk/about.c:486
+#: src/gtk/about.c:487
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "Añade soporte para agendas de direcciones compartidas con LDAP\n"
 
-#: src/gtk/about.c:496
+#: src/gtk/about.c:497
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "Añade soporte para servidores IMAP y NNTP\n"
 
-#: src/gtk/about.c:506
+#: src/gtk/about.c:507
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "Añade soporte para el manejo de sesión\n"
 
-#: src/gtk/about.c:516
+#: src/gtk/about.c:517
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "Añade soporte para detectar los cambios de conexión de red\n"
 
-#: src/gtk/about.c:526
+#: src/gtk/about.c:527
 msgctxt "librSVG"
 msgid "adds support for SVG themes\n"
 msgstr "Añade soporte para temas en formato SVG\n"
 
-#: src/gtk/about.c:558
+#: src/gtk/about.c:559
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4151,7 +4170,7 @@ msgstr ""
 "Foundation; tanto en versión 3, como (opcionalmente) cualquier versión "
 "posterior."
 
-#: src/gtk/about.c:565
+#: src/gtk/about.c:566
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4163,7 +4182,7 @@ msgstr ""
 "ADECUACIÓN PARA ALGÚN PROPÓSITO PARTICULAR. Véase la GNU General Public "
 "License para más detalles."
 
-#: src/gtk/about.c:584
+#: src/gtk/about.c:585
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4171,147 +4190,147 @@ msgstr ""
 "Debería haber recibido una copia de la GNU General Public License junto con "
 "este programa; en caso contrario, vea "
 
-#: src/gtk/about.c:717 src/main.c:2616
+#: src/gtk/about.c:718 src/main.c:2610
 msgid "Session statistics\n"
 msgstr "Estadísticas de sesión\n"
 
-#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2626 src/main.c:2629
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2620 src/main.c:2623
 #, c-format
 msgid "Started: %s\n"
 msgstr "Iniciado: %s\n"
 
-#: src/gtk/about.c:737 src/main.c:2635
+#: src/gtk/about.c:738 src/main.c:2629
 msgid "Incoming traffic\n"
 msgstr "Tráfico entrante\n"
 
-#: src/gtk/about.c:740 src/main.c:2638
+#: src/gtk/about.c:741 src/main.c:2632
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mensajes recibidos: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2644
+#: src/gtk/about.c:748 src/main.c:2638
 msgid "Outgoing traffic\n"
 msgstr "Tráfico saliente\n"
 
-#: src/gtk/about.c:750 src/main.c:2647
+#: src/gtk/about.c:751 src/main.c:2641
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Mensajes nuevos/redirigidos: %d\n"
 
-#: src/gtk/about.c:755 src/main.c:2651
+#: src/gtk/about.c:756 src/main.c:2645
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Mensajes respondidos: %d\n"
 
-#: src/gtk/about.c:760 src/main.c:2655
+#: src/gtk/about.c:761 src/main.c:2649
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Mensajes reenviados: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2659
+#: src/gtk/about.c:766 src/main.c:2653
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total mensajes salientes: %d\n"
 
-#: src/gtk/about.c:792
+#: src/gtk/about.c:793
 msgid "About Claws Mail"
 msgstr "Acerca de Claws Mail"
 
-#: src/gtk/about.c:864
+#: src/gtk/about.c:865
 msgid "_Info"
 msgstr "_Información"
 
-#: src/gtk/about.c:870
+#: src/gtk/about.c:871
 msgid "_Authors"
 msgstr "_Autores"
 
-#: src/gtk/about.c:876
+#: src/gtk/about.c:877
 msgid "_Features"
 msgstr "_Características"
 
-#: src/gtk/about.c:882
+#: src/gtk/about.c:883
 msgid "_License"
 msgstr "_Licencia"
 
-#: src/gtk/about.c:890
+#: src/gtk/about.c:891
 msgid "_Release Notes"
 msgstr "_Notas de la versión"
 
-#: src/gtk/about.c:896
+#: src/gtk/about.c:897
 msgid "_Statistics"
 msgstr "E_stadísticas"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:363
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Naranja"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:367
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Rojo"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:371
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:375
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Azul cielo"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:379
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Azul"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:383
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Verde"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:387
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Marrón"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:391
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Gris"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:395
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Marrón claro"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:399
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Rojo oscuro"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:403
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Rosa oscuro"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:407
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Azul acero"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:411
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Dorado"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:415
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Verde brillante"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:419
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/foldersort.c:241
+#: src/gtk/foldersort.c:231
 msgid "Set mailbox order"
 msgstr "Establecer orden de los buzones"
 
-#: src/gtk/foldersort.c:275
+#: src/gtk/foldersort.c:265
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 "Mueva los buzones arriba o abajo para cambiar la posición en la lista de "
 "carpetas."
 
-#: src/gtk/foldersort.c:309
+#: src/gtk/foldersort.c:299
 msgid "Mailboxes"
 msgstr "Buzones"
 
@@ -4420,26 +4439,26 @@ msgstr ""
 "El corrector ortográfico no pudo cambiar el diccionario alternativo.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1868
+#: src/gtk/gtkutils.c:1862
 msgid "Failed: no service record found."
 msgstr "Falló: no hay registro del servicio."
 
-#: src/gtk/gtkutils.c:1871
+#: src/gtk/gtkutils.c:1865
 msgid "Failed: network error."
 msgstr "Falló: error de la red."
 
-#: src/gtk/gtkutils.c:1874
+#: src/gtk/gtkutils.c:1868
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Falló: error desconocido (%d)."
 
-#: src/gtk/gtkutils.c:1944
+#: src/gtk/gtkutils.c:1938
 msgid "Configuring..."
 msgstr "Configurando..."
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1242
-#: src/prefs_matcher.c:2164 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:448
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1224
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2213 src/prefs_summaries.c:613
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:468
 msgid "Date"
 msgstr "Fecha"
 
@@ -4447,13 +4466,13 @@ msgstr "Fecha"
 msgid "Date:"
 msgstr "Fecha:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1239
-#: src/prefs_matcher.c:2161 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:446
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1221
+#: src/prefs_matcher.c:2210 src/prefs_summaries.c:615
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:466
 msgid "From"
 msgstr "Desde"
 
-#: src/gtk/headers.h:10 src/summary_search.c:416
+#: src/gtk/headers.h:10 src/summary_search.c:414
 msgid "From:"
 msgstr "Desde:"
 
@@ -4469,14 +4488,14 @@ msgstr "Remitente:"
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1240
-#: src/prefs_matcher.c:2162 src/prefs_summaries.c:445
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:447
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1222
+#: src/prefs_matcher.c:2211 src/prefs_summaries.c:616
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:467
 msgid "To"
 msgstr "Para"
 
-#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1241
-#: src/prefs_matcher.c:2163 src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1223
+#: src/prefs_matcher.c:2212 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4484,8 +4503,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1243
-#: src/prefs_matcher.c:2165 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1225
+#: src/prefs_matcher.c:2214 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "ID-Mensaje"
 
@@ -4497,8 +4516,8 @@ msgstr "ID-Mensaje:"
 msgid "In-Reply-To"
 msgstr "En-Respuesta-A"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1245
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1227
+#: src/prefs_matcher.c:2216 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referencias"
 
@@ -4506,14 +4525,14 @@ msgstr "Referencias"
 msgid "References:"
 msgstr "Referencias:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1238
-#: src/prefs_matcher.c:2160 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:445
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1220
+#: src/prefs_matcher.c:2209 src/prefs_summaries.c:617
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:465
 msgid "Subject"
 msgstr "Asunto"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:704
-#: src/summary_search.c:430
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/summary_search.c:428
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -4529,7 +4548,7 @@ msgstr "Comentarios:"
 msgid "Keywords"
 msgstr "Palabras-Clave"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Keywords:"
 msgstr "Palabras-Clave:"
 
@@ -4605,8 +4624,8 @@ msgstr "Recibido"
 msgid "Received:"
 msgstr "Recibido:"
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1244
-#: src/prefs_matcher.c:2166 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1226
+#: src/prefs_matcher.c:2215 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Grupos"
 
@@ -4631,8 +4650,9 @@ msgid "Seen:"
 msgstr "Visto:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:450
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/summaryview.c:2853
+#: src/gtk/sslcertwindow.c:166 src/prefs_summaries.c:621
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/ssl_manager.c:124
+#: src/summaryview.c:2897
 msgid "Status"
 msgstr "Estado"
 
@@ -4676,7 +4696,7 @@ msgstr "Agente-Usuario:"
 msgid "Content-Type"
 msgstr "Tipo-Contenido"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:327
+#: src/gtk/headers.h:42 src/image_viewer.c:328
 msgid "Content-Type:"
 msgstr "Tipo-Contenido:"
 
@@ -4704,7 +4724,7 @@ msgstr "Precedencia"
 msgid "Precedence:"
 msgstr "Precedencia:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1170
+#: src/gtk/headers.h:46 src/prefs_account.c:1166
 msgid "Organization"
 msgstr "Organización"
 
@@ -4963,19 +4983,19 @@ msgstr "Recordar la contraseña para esta sesión"
 msgid "Remember this"
 msgstr "Recordar esto"
 
-#: src/gtk/logwindow.c:453
+#: src/gtk/logwindow.c:449
 msgid "_Go to last error"
 msgstr "_Ir al último error"
 
-#: src/gtk/logwindow.c:460
+#: src/gtk/logwindow.c:456
 msgid "Clear _Log"
 msgstr "_Limpiar traza"
 
-#: src/gtk/menu.c:137
+#: src/gtk/menu.c:135
 msgid "Warning:"
 msgstr "Aviso:"
 
-#: src/gtk/menu.c:138
+#: src/gtk/menu.c:136
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -5018,14 +5038,14 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:791
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
 #: src/plugins/address_keeper/address_keeper_prefs.c:273
 #: src/plugins/archive/archiver_prefs.c:106
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:114
+#: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
@@ -5054,7 +5074,7 @@ msgstr "_Cargar..."
 msgid "_Unload"
 msgstr "_Descargar"
 
-#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:230
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:235
 msgid "Description"
 msgstr "Descripción"
 
@@ -5084,207 +5104,215 @@ msgstr "Índice de páginas"
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:692
-#: src/prefs_account.c:3717 src/prefs_account.c:3735 src/prefs_account.c:3753
-#: src/prefs_account.c:3771 src/prefs_account.c:3789 src/prefs_account.c:3807
-#: src/prefs_account.c:3826 src/prefs_account.c:3919 src/prefs_account.c:3937
-#: src/prefs_filtering_action.c:1401 src/prefs_filtering.c:397
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:693
+#: src/prefs_account.c:3741 src/prefs_account.c:3759 src/prefs_account.c:3777
+#: src/prefs_account.c:3795 src/prefs_account.c:3813 src/prefs_account.c:3831
+#: src/prefs_account.c:3850 src/prefs_account.c:3943 src/prefs_account.c:3961
+#: src/prefs_filtering_action.c:1379 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1883
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:472
 msgid "all messages"
 msgstr "todos los mensajes"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:473
 msgid "messages whose age is greater than # days"
 msgstr "mensajes cuya edad es mayor que # días"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:474
 msgid "messages whose age is less than # days"
 msgstr "mensajes cuya edad es menor que # días"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:475
 msgid "messages whose age is greater than # hours"
 msgstr "mensajes cuya edad es mayor que # horas"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:476
 msgid "messages whose age is less than # hours"
 msgstr "mensajes cuya edad es menor que # horas"
 
-#: src/gtk/quicksearch.c:483
+#: src/gtk/quicksearch.c:477
 msgid "messages which contain S in the message body"
 msgstr "mensajes que contienen S en el cuerpo del mensaje"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:478
 msgid "messages which contain S in the whole message"
 msgstr "mensajes que contienen S en el mensaje completo"
 
-#: src/gtk/quicksearch.c:485
+#: src/gtk/quicksearch.c:479
 msgid "messages carbon-copied to S"
 msgstr "mensajes con copia-carbón a S"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:480
 msgid "message is either To: or Cc: to S"
 msgstr "mensaje con Para: o Cc: a S"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:481
 msgid "deleted messages"
 msgstr "mensajes borrados"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:482
+msgid "messages whose date is after requested date (time is optional)"
+msgstr "mensajes cuya fecha es posterior a la solicitada (la hora es opcional)"
+
+#: src/gtk/quicksearch.c:484
+msgid "messages whose date is before requested date (time is optional)"
+msgstr "mensajes cuya fecha es anterior a la solicitada (la hora es opcional)"
+
+#: src/gtk/quicksearch.c:486
 msgid "messages which contain S in the Sender field"
 msgstr "mensajes que contienen S en el campo remitente"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:487
 msgid "true if execute \"S\" succeeds"
 msgstr "cierto si ejecutar \"S\" tiene éxito"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:488
 msgid "messages originating from user S"
 msgstr "mensajes provenientes del usuario S"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:489
 msgid "forwarded messages"
 msgstr "mensajes reenviados"
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:490
 msgid "messages which have attachments"
 msgstr "mensajes que tienen adjuntos"
 
-#: src/gtk/quicksearch.c:493
+#: src/gtk/quicksearch.c:491
 msgid "messages which contain S in any header name or value"
 msgstr "mensajes que contienen S en el nombre o el valor de cualquier cabecera"
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:492
 msgid "messages which contain S in the value of any header"
 msgstr "mensajes que contienen S en el valor de cualquier cabecera"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:493
 msgid "messages which contain S in Message-ID header"
 msgstr "mensajes que contienen S en la cabecera Message-ID"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:494
 msgid "messages which contain S in In-Reply-To header"
 msgstr "mensajes que contienen S en la cabecera In-Reply-To"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:495
 msgid "messages which are marked with color #"
 msgstr "mensajes que están marcados con el color n.º"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:496
 msgid "locked messages"
 msgstr "mensajes bloqueados"
 
-#: src/gtk/quicksearch.c:499
+#: src/gtk/quicksearch.c:497
 msgid "messages which are in newsgroup S"
 msgstr "mensajes que están en el grupo de noticias S"
 
-#: src/gtk/quicksearch.c:500
+#: src/gtk/quicksearch.c:498
 msgid "new messages"
 msgstr "mensajes nuevos"
 
-#: src/gtk/quicksearch.c:501
+#: src/gtk/quicksearch.c:499
 msgid "old messages"
 msgstr "mensajes antiguos"
 
-#: src/gtk/quicksearch.c:502
+#: src/gtk/quicksearch.c:500
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "mensajes incompletos (no descargados por completo)"
 
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:501
 msgid "messages which you have replied to"
 msgstr "mensajes que usted ha respondido"
 
-#: src/gtk/quicksearch.c:504
+#: src/gtk/quicksearch.c:502
 msgid "read messages"
 msgstr "mensajes leídos"
 
-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:503
 msgid "messages which contain S in subject"
 msgstr "mensajes que contienen S en el asunto"
 
-#: src/gtk/quicksearch.c:506
+#: src/gtk/quicksearch.c:504
 msgid "messages whose score is equal to # points"
 msgstr "mensajes con puntuación igual a # puntos"
 
-#: src/gtk/quicksearch.c:507
+#: src/gtk/quicksearch.c:505
 msgid "messages whose score is greater than # points"
 msgstr "mensajes con puntuación mayor que # puntos"
 
-#: src/gtk/quicksearch.c:508
+#: src/gtk/quicksearch.c:506
 msgid "messages whose score is lower than # points"
 msgstr "mensajes con puntuación menor que # puntos"
 
-#: src/gtk/quicksearch.c:509
+#: src/gtk/quicksearch.c:507
 msgid "messages whose size is equal to # bytes"
 msgstr "mensajes con tamaño igual a # bytes"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:508
 msgid "messages whose size is greater than # bytes"
 msgstr "mensajes con tamaño mayor que # bytes"
 
-#: src/gtk/quicksearch.c:511
+#: src/gtk/quicksearch.c:509
 msgid "messages whose size is smaller than # bytes"
 msgstr "mensajes con tamaño menor que # bytes"
 
-#: src/gtk/quicksearch.c:512
+#: src/gtk/quicksearch.c:510
 msgid "messages which have been sent to S"
 msgstr "mensajes que han sido enviados a S"
 
-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:511
 msgid "messages which tags contain S"
 msgstr "mensajes cuyas etiquetas contienen S"
 
-#: src/gtk/quicksearch.c:514
+#: src/gtk/quicksearch.c:512
 msgid "messages which have tag(s)"
 msgstr "mensajes que tienen etiqueta(s)"
 
-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:513
 msgid "marked messages"
 msgstr "mensajes marcados"
 
-#: src/gtk/quicksearch.c:516
+#: src/gtk/quicksearch.c:514
 msgid "unread messages"
 msgstr "mensajes sin leer"
 
-#: src/gtk/quicksearch.c:517
+#: src/gtk/quicksearch.c:515
 msgid "messages which contain S in References header"
 msgstr "mensajes que contienen S en la cabecera References"
 
-#: src/gtk/quicksearch.c:518
+#: src/gtk/quicksearch.c:516
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "mensajes que devuelven 0 al pasarlos a una orden - %F es el fichero del "
 "mensaje"
 
-#: src/gtk/quicksearch.c:519
+#: src/gtk/quicksearch.c:517
 msgid "messages which contain S in X-Label header"
 msgstr "mensajes que contienen S en la cabecera X-Label"
 
-#: src/gtk/quicksearch.c:521
+#: src/gtk/quicksearch.c:519
 msgid "logical AND operator"
 msgstr "operador Y lógico"
 
-#: src/gtk/quicksearch.c:522
+#: src/gtk/quicksearch.c:520
 msgid "logical OR operator"
 msgstr "operador O lógico"
 
-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:521
 msgid "logical NOT operator"
 msgstr "operador NO lógico"
 
-#: src/gtk/quicksearch.c:524
+#: src/gtk/quicksearch.c:522
 msgid "case sensitive search"
 msgstr "sensible a mayús./minús."
 
-#: src/gtk/quicksearch.c:525
+#: src/gtk/quicksearch.c:523
 msgid "match using regular expressions instead of substring search"
 msgstr "buscar coincidencias con expresiones regulares en lugar de sub-cadenas"
 
-#: src/gtk/quicksearch.c:527
+#: src/gtk/quicksearch.c:525
 msgid ""
 "all filtering expressions are allowed, but cannot be mixed through logical "
 "operators with the expressions above"
@@ -5292,11 +5320,11 @@ msgstr ""
 "se permiten todas las expresiones de filtrado, pero no se pueden mezclar "
 "usando operadores lógicos con las expresiones anteriores"
 
-#: src/gtk/quicksearch.c:537 src/summary_search.c:463
+#: src/gtk/quicksearch.c:535 src/summary_search.c:461
 msgid "Extended Search"
 msgstr "Búsqueda extendida"
 
-#: src/gtk/quicksearch.c:538
+#: src/gtk/quicksearch.c:536
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5306,98 +5334,107 @@ msgstr ""
 "para los mensajes mostrados en la lista de mensajes.\n"
 "Se pueden utilizar los siguientes símbolos:"
 
-#: src/gtk/quicksearch.c:638
+#: src/gtk/quicksearch.c:640
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Algo falló durante la búsqueda. Por favor compruebe la traza."
 
-#: src/gtk/quicksearch.c:704
+#: src/gtk/quicksearch.c:702
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Desde/Para/Cc/Asunto/Etiqueta"
 
-#: src/gtk/quicksearch.c:715 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Recursivo"
 
-#: src/gtk/quicksearch.c:724
+#: src/gtk/quicksearch.c:722
 msgid "Sticky"
 msgstr "Pegajoso"
 
-#: src/gtk/quicksearch.c:734
+#: src/gtk/quicksearch.c:732
 msgid "Type-ahead"
 msgstr "Mientras teclea"
 
-#: src/gtk/quicksearch.c:746
+#: src/gtk/quicksearch.c:744
 msgid "Run on select"
 msgstr "Ejecutar sobre la selección"
 
-#: src/gtk/quicksearch.c:784
+#: src/gtk/quicksearch.c:780
 msgid "Clear the current search"
 msgstr "Limpiar la búsqueda actual"
 
-#: src/gtk/quicksearch.c:794 src/summary_search.c:414
+#: src/gtk/quicksearch.c:790 src/summary_search.c:412
 msgid "Edit search criteria"
 msgstr "Editar el criterio de búsqueda"
 
-#: src/gtk/quicksearch.c:803
+#: src/gtk/quicksearch.c:799
 msgid "Information about extended symbols"
 msgstr "Información sobre los símbolos extendidos"
 
-#: src/gtk/quicksearch.c:841 src/gtk/quicksearch.c:865
+#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
 msgid "_Information"
 msgstr "_Información"
 
-#: src/gtk/quicksearch.c:842 src/gtk/quicksearch.c:866
+#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
 msgid "E_dit"
 msgstr "E_ditar"
 
-#: src/gtk/quicksearch.c:843 src/gtk/quicksearch.c:867 src/prefs_actions.c:347
+#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:348
 #: src/prefs_filtering.c:495 src/prefs_template.c:329
 msgid "C_lear"
 msgstr "_Limpiar"
 
-#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348
-#: src/gtk/sslcertwindow.c:398 src/gtk/sslcertwindow.c:462
-msgid "Correct"
-msgstr "Correcto"
+#: src/gtk/sslcertwindow.c:157 src/ssl_manager.c:325
+#, c-format
+msgid "Correct%s"
+msgstr "Correcta%s"
 
-#: src/gtk/sslcertwindow.c:162
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:159
+#: src/ssl_manager.c:325 src/ssl_manager.c:329
+msgid " (expired)"
+msgstr " (expirada)"
+
+#: src/gtk/sslcertwindow.c:164
 msgid "Owner"
 msgstr "Propietario"
 
-#: src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:165
 msgid "Signer"
 msgstr "Firmante"
 
-#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
+#: src/gtk/sslcertwindow.c:172 src/gtk/sslcertwindow.c:196
 msgid "Name: "
 msgstr "Nombre: "
 
-#: src/gtk/sslcertwindow.c:178 src/gtk/sslcertwindow.c:202
+#: src/gtk/sslcertwindow.c:180 src/gtk/sslcertwindow.c:204
 msgid "Organization: "
 msgstr "Organización: "
 
-#: src/gtk/sslcertwindow.c:186 src/gtk/sslcertwindow.c:210
+#: src/gtk/sslcertwindow.c:188 src/gtk/sslcertwindow.c:212
 msgid "Location: "
 msgstr "Localización: "
 
-#: src/gtk/sslcertwindow.c:218
+#: src/gtk/sslcertwindow.c:220
 msgid "Fingerprint: \n"
 msgstr "Huella: \n"
 
-#: src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:230
 msgid "Signature status: "
 msgstr "Estado de la firma: "
 
-#: src/gtk/sslcertwindow.c:235
+#: src/gtk/sslcertwindow.c:237
+msgid "Expired on: "
+msgstr "Caducado en: "
+
+#: src/gtk/sslcertwindow.c:237
 msgid "Expires on: "
 msgstr "Caduca en: "
 
-#: src/gtk/sslcertwindow.c:302
+#: src/gtk/sslcertwindow.c:304
 #, c-format
 msgid "SSL/TLS certificate for %s"
 msgstr "Certificado SSL/TLS para %s"
 
-#: src/gtk/sslcertwindow.c:318
+#: src/gtk/sslcertwindow.c:320
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5407,7 +5444,7 @@ msgstr ""
 "El certificado es para %s, pero la conexión es con %s.\n"
 "Puede que esté conectando con un servidor fraudulento.\n"
 
-#: src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:340
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5418,32 +5455,37 @@ msgstr ""
 
 #: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
 #: src/gtk/sslcertwindow.c:464
+msgid "Correct"
+msgstr "Correcto"
+
+#: src/gtk/sslcertwindow.c:352 src/gtk/sslcertwindow.c:402
+#: src/gtk/sslcertwindow.c:466
 #, c-format
 msgid "Signature status: %s"
 msgstr "Estado de la firma: %s"
 
-#: src/gtk/sslcertwindow.c:358 src/gtk/sslcertwindow.c:408
+#: src/gtk/sslcertwindow.c:360 src/gtk/sslcertwindow.c:410
 msgid "_View certificate"
 msgstr "_Mostrar certificado"
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:366
 msgid "SSL/TLS certificate is invalid"
 msgstr "Certificado SSL/TLS inválido"
 
-#: src/gtk/sslcertwindow.c:366
+#: src/gtk/sslcertwindow.c:368
 msgid "SSL/TLS certificate is unknown"
 msgstr "Certificado SSL/TLS desconocido"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
-#: src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:371 src/gtk/sslcertwindow.c:421
+#: src/gtk/sslcertwindow.c:483
 msgid "_Cancel connection"
 msgstr "_Cancelar conexión"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:371 src/gtk/sslcertwindow.c:483
 msgid "_Accept and save"
 msgstr "_Aceptar y guardar"
 
-#: src/gtk/sslcertwindow.c:387
+#: src/gtk/sslcertwindow.c:389
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5452,27 +5494,27 @@ msgstr ""
 "El certificado de %s está caducado.\n"
 "%s¿Quiere continuar?"
 
-#: src/gtk/sslcertwindow.c:414
+#: src/gtk/sslcertwindow.c:416
 msgid "SSL/TLS certificate is invalid and expired"
 msgstr "Certificado SSL/TLS inválido y caducado"
 
-#: src/gtk/sslcertwindow.c:416
+#: src/gtk/sslcertwindow.c:418
 msgid "SSL/TLS certificate is expired"
 msgstr "Certificado SSL/TLS caducado"
 
-#: src/gtk/sslcertwindow.c:419
+#: src/gtk/sslcertwindow.c:421
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: src/gtk/sslcertwindow.c:439
+#: src/gtk/sslcertwindow.c:441
 msgid "New certificate:"
 msgstr "Certificado nuevo:"
 
-#: src/gtk/sslcertwindow.c:444
+#: src/gtk/sslcertwindow.c:446
 msgid "Known certificate:"
 msgstr "Certificado conocido:"
 
-#: src/gtk/sslcertwindow.c:451
+#: src/gtk/sslcertwindow.c:453
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5481,15 +5523,15 @@ msgstr ""
 "El certificado de %s ha cambiado.\n"
 "%s¿Quiere aceptarlo?"
 
-#: src/gtk/sslcertwindow.c:472
+#: src/gtk/sslcertwindow.c:474
 msgid "_View certificates"
 msgstr "_Mostrar certificados"
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:479
 msgid "SSL/TLS certificate changed and is invalid"
 msgstr "Certificado SSL/TLS cambiado e inválido"
 
-#: src/gtk/sslcertwindow.c:479
+#: src/gtk/sslcertwindow.c:481
 msgid "SSL/TLS certificate changed"
 msgstr "Certificado SSL/TLS cambiado"
 
@@ -5499,223 +5541,223 @@ msgstr "Etiquetas:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3453
-#: src/summaryview.c:3471 src/summaryview.c:3510
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3498
+#: src/summaryview.c:3516 src/summaryview.c:3555
 msgid "(No From)"
 msgstr "(Sin remite)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3522
-#: src/summaryview.c:3525
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3567
+#: src/summaryview.c:3570
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/image_viewer.c:100
+#: src/image_viewer.c:101
 msgid "Error:"
 msgstr "Error:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2613
+#: src/image_viewer.c:300 src/mimeview.c:2614
 #: src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:700
+#: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Nombre del fichero:"
 
-#: src/image_viewer.c:306
+#: src/image_viewer.c:307
 msgid "Filesize:"
 msgstr "Tamaño:"
 
-#: src/image_viewer.c:355
+#: src/image_viewer.c:356
 msgid "Load Image"
 msgstr "Cargar imagen"
 
-#: src/imap.c:576
+#: src/imap.c:577
 msgid "IMAP connection broken\n"
 msgstr "Conexión IMAP rota\n"
 
-#: src/imap.c:615 src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627
-#: src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:644
-#: src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:656 src/imap.c:659
-#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
-#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
-#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
-#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
-#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
-#: src/imap.c:738 src/imap.c:742
+#: src/imap.c:616 src/imap.c:619 src/imap.c:622 src/imap.c:625 src/imap.c:628
+#: src/imap.c:632 src/imap.c:635 src/imap.c:638 src/imap.c:641 src/imap.c:645
+#: src/imap.c:648 src/imap.c:651 src/imap.c:654 src/imap.c:657 src/imap.c:660
+#: src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672 src/imap.c:675
+#: src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687 src/imap.c:690
+#: src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702 src/imap.c:705
+#: src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717 src/imap.c:720
+#: src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732 src/imap.c:735
+#: src/imap.c:739 src/imap.c:743
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Error IMAP en %s:"
 
-#: src/imap.c:615
+#: src/imap.c:616
 msgid "authenticated"
 msgstr "autenticado"
 
-#: src/imap.c:618
+#: src/imap.c:619
 msgid "not authenticated"
 msgstr "sin autenticación"
 
-#: src/imap.c:621
+#: src/imap.c:622
 msgid "bad state"
 msgstr "estado incorrecto"
 
-#: src/imap.c:624
+#: src/imap.c:625
 msgid "stream error"
 msgstr "error del canal"
 
-#: src/imap.c:627
+#: src/imap.c:628
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "error interpretando (seguramente el servidor no cumple los RFC)"
 
-#: src/imap.c:631
+#: src/imap.c:632
 msgid "connection refused"
 msgstr "conexión rehusada"
 
-#: src/imap.c:634
+#: src/imap.c:635
 msgid "memory error"
 msgstr "error de memoria"
 
-#: src/imap.c:637
+#: src/imap.c:638
 msgid "fatal error"
 msgstr "error fatal"
 
-#: src/imap.c:640
+#: src/imap.c:641
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "error de protocolo (seguramente el servidor no cumple los RFC)"
 
-#: src/imap.c:644
+#: src/imap.c:645
 msgid "connection not accepted"
 msgstr "la conexión no fue aceptada"
 
-#: src/imap.c:647
+#: src/imap.c:648
 msgid "APPEND error"
 msgstr "error de APPEND"
 
-#: src/imap.c:650
+#: src/imap.c:651
 msgid "NOOP error"
 msgstr "error de NOOP"
 
-#: src/imap.c:653
+#: src/imap.c:654
 msgid "LOGOUT error"
 msgstr "error de LOGOUT"
 
-#: src/imap.c:656
+#: src/imap.c:657
 msgid "CAPABILITY error"
 msgstr "error de CAPABILITY"
 
-#: src/imap.c:659
+#: src/imap.c:660
 msgid "CHECK error"
 msgstr "error de CHECK"
 
-#: src/imap.c:662
+#: src/imap.c:663
 msgid "CLOSE error"
 msgstr "error de CLOSE"
 
-#: src/imap.c:665
+#: src/imap.c:666
 msgid "EXPUNGE error"
 msgstr "error de EXPUNGE"
 
-#: src/imap.c:668
+#: src/imap.c:669
 msgid "COPY error"
 msgstr "error de COPY"
 
-#: src/imap.c:671
+#: src/imap.c:672
 msgid "UID COPY error"
 msgstr "error de UID COPY"
 
-#: src/imap.c:674
+#: src/imap.c:675
 msgid "CREATE error"
 msgstr "error de CREATE"
 
-#: src/imap.c:677
+#: src/imap.c:678
 msgid "DELETE error"
 msgstr "error de DELETE"
 
-#: src/imap.c:680
+#: src/imap.c:681
 msgid "EXAMINE error"
 msgstr "error de EXAMINE"
 
-#: src/imap.c:683
+#: src/imap.c:684
 msgid "FETCH error"
 msgstr "error de FETCH"
 
-#: src/imap.c:686
+#: src/imap.c:687
 msgid "UID FETCH error"
 msgstr "error de UID FETCH"
 
-#: src/imap.c:689
+#: src/imap.c:690
 msgid "LIST error"
 msgstr "error de LIST"
 
-#: src/imap.c:692
+#: src/imap.c:693
 msgid "LOGIN error"
 msgstr "error de LOGIN"
 
-#: src/imap.c:695
+#: src/imap.c:696
 msgid "LSUB error"
 msgstr "error de LSUB"
 
-#: src/imap.c:698
+#: src/imap.c:699
 msgid "RENAME error"
 msgstr "error de RENAME"
 
-#: src/imap.c:701
+#: src/imap.c:702
 msgid "SEARCH error"
 msgstr "error de SEARCH"
 
-#: src/imap.c:704
+#: src/imap.c:705
 msgid "UID SEARCH error"
 msgstr "error de UID SEARCH"
 
-#: src/imap.c:707
+#: src/imap.c:708
 msgid "SELECT error"
 msgstr "error de SELECT"
 
-#: src/imap.c:710
+#: src/imap.c:711
 msgid "STATUS error"
 msgstr "error de STATUS"
 
-#: src/imap.c:713
+#: src/imap.c:714
 msgid "STORE error"
 msgstr "error de STORE"
 
-#: src/imap.c:716
+#: src/imap.c:717
 msgid "UID STORE error"
 msgstr "error de UID STORE"
 
-#: src/imap.c:719
+#: src/imap.c:720
 msgid "SUBSCRIBE error"
 msgstr "error de SUBSCRIBE"
 
-#: src/imap.c:722
+#: src/imap.c:723
 msgid "UNSUBSCRIBE error"
 msgstr "error de UNSUBSCRIBE"
 
-#: src/imap.c:725
+#: src/imap.c:726
 msgid "STARTTLS error"
 msgstr "error de STARTTLS"
 
-#: src/imap.c:728
+#: src/imap.c:729
 msgid "INVAL error"
 msgstr "error de INVAL"
 
-#: src/imap.c:731
+#: src/imap.c:732
 msgid "EXTENSION error"
 msgstr "error de EXTENSION"
 
-#: src/imap.c:734
+#: src/imap.c:735
 msgid "SASL error"
 msgstr "error de SASL"
 
-#: src/imap.c:738
+#: src/imap.c:739
 msgid "SSL/TLS error"
 msgstr "error de SSL/TLS"
 
-#: src/imap.c:742
+#: src/imap.c:743
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Error desconocido [%d]"
 
-#: src/imap.c:946
+#: src/imap.c:947
 msgid ""
 "\n"
 "\n"
@@ -5727,7 +5769,7 @@ msgstr ""
 "Las autenticaciones con CRAM-MD5 sólo funcionarán si libetpan ha sido "
 "compilada con soporte SASL y el módulo CRAM-MD5 de SASL está instalado."
 
-#: src/imap.c:952
+#: src/imap.c:953
 msgid ""
 "\n"
 "\n"
@@ -5739,7 +5781,7 @@ msgstr ""
 "Las autenticaciones con DIGEST-MD5 sólo funcionarán si libetpan ha sido "
 "compilada con soporte SASL y el módulo DIGEST-MD5 de SASL está instalado."
 
-#: src/imap.c:958
+#: src/imap.c:959
 msgid ""
 "\n"
 "\n"
@@ -5751,7 +5793,7 @@ msgstr ""
 "Las autenticaciones con SCRAM-SHA-1 sólo funcionarán si libetpan ha sido "
 "compilada con soporte SASL y el módulo SCRAM de SASL está instalado."
 
-#: src/imap.c:964
+#: src/imap.c:965
 msgid ""
 "\n"
 "\n"
@@ -5763,7 +5805,7 @@ msgstr ""
 "Las autenticaciones PLAIN sólo funcionarán si libetpan ha sido compilada con "
 "soporte SASL y el módulo PLAIN de SASL está instalado."
 
-#: src/imap.c:970
+#: src/imap.c:971
 msgid ""
 "\n"
 "\n"
@@ -5775,37 +5817,37 @@ msgstr ""
 "Las autenticaciones con LOGIN sólo funcionarán si libetpan ha sido compilada "
 "con soporte SASL y el módulo LOGIN de SASL está instalado."
 
-#: src/imap.c:977
+#: src/imap.c:978
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Falló la conexión con %s: autenticación rechazada.%s"
 
-#: src/imap.c:981
+#: src/imap.c:982
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Falló la conexión con %s: autenticación rechazada.%s\n"
 
-#: src/imap.c:999
+#: src/imap.c:1000
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Falló la conexión con %s"
 
-#: src/imap.c:1006 src/imap.c:1009
+#: src/imap.c:1007 src/imap.c:1010
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP con %s se ha desconectado. Reconectando...\n"
 
-#: src/imap.c:1039 src/imap.c:3681 src/imap.c:4340 src/imap.c:4434
-#: src/imap.c:4612 src/imap.c:5423
+#: src/imap.c:1040 src/imap.c:3678 src/imap.c:4337 src/imap.c:4431
+#: src/imap.c:4609 src/imap.c:5420
 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:1149 src/inc.c:869 src/news.c:400 src/send_message.c:284
+#: src/imap.c:1150 src/inc.c:873 src/news.c:401 src/send_message.c:285
 msgid "Insecure connection"
 msgstr "Conexión insegura"
 
-#: src/imap.c:1150 src/inc.c:870 src/news.c:401 src/send_message.c:285
+#: src/imap.c:1151 src/inc.c:874 src/news.c:402 src/send_message.c:286
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5818,108 +5860,108 @@ msgstr ""
 "\n"
 "¿Quiere seguir conectando con este servidor? La comunicación no sería segura."
 
-#: src/imap.c:1156 src/inc.c:876 src/news.c:407 src/send_message.c:291
+#: src/imap.c:1157 src/inc.c:880 src/news.c:408 src/send_message.c:292
 msgid "Con_tinue connecting"
 msgstr "Seguir conec_tando"
 
-#: src/imap.c:1166
+#: src/imap.c:1167
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor IMAP: %s:%d..."
 
-#: src/imap.c:1231
+#: src/imap.c:1232
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "No se puede conectar al servidor IMAP: %s:%d"
 
-#: src/imap.c:1234
+#: src/imap.c:1235
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP: %s:%d\n"
 
-#: src/imap.c:1266 src/imap.c:4102
+#: src/imap.c:1267 src/imap.c:4099
 msgid "Can't start STARTTLS session.\n"
 msgstr "No se puede iniciar la sesión STARTTLS.\n"
 
-#: src/imap.c:1333
+#: src/imap.c:1334
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No se puede entrar al servidor IMAP %s.\n"
 
-#: src/imap.c:1336
+#: src/imap.c:1337
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No se puede entrar al servidor IMAP %s."
 
-#: src/imap.c:1764
+#: src/imap.c:1765
 msgid "Adding messages..."
 msgstr "Añadiendo mensajes..."
 
-#: src/imap.c:1969 src/mh.c:529
+#: src/imap.c:1970 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
-#: src/imap.c:2491
+#: src/imap.c:2492
 msgid "Search failed due to server error."
 msgstr "La búsqueda falló debido a un error en el servidor."
 
-#: src/imap.c:2570
+#: src/imap.c:2571
 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags «borrado»\n"
 
-#: src/imap.c:2577 src/imap.c:5053
+#: src/imap.c:2578 src/imap.c:5050
 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 
-#: src/imap.c:2928
+#: src/imap.c:2929
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 
-#: src/imap.c:2931
+#: src/imap.c:2932
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 
-#: src/imap.c:3221
+#: src/imap.c:3220
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: src/imap.c:3236
+#: src/imap.c:3233
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: src/imap.c:3367
+#: src/imap.c:3364
 #, 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:3480
+#: src/imap.c:3477
 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buzón\n"
 
-#: src/imap.c:3759
+#: src/imap.c:3756
 msgid "LIST failed\n"
 msgstr "LIST falló\n"
 
-#: src/imap.c:3844
+#: src/imap.c:3841
 msgid "Flagging messages..."
 msgstr "Etiquetando mensajes..."
 
-#: src/imap.c:3947
+#: src/imap.c:3944
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4099
+#: src/imap.c:4096
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "El servidor necesita STARTTLS para acceder a él.\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4106
 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
-#: src/imap.c:4114
+#: src/imap.c:4111
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5928,20 +5970,20 @@ msgstr ""
 "La conexión con %s falló: el servidor necesita STARTTLS, pero Claws Mail ha "
 "sido compilado sin soporte para STARTTLS.\n"
 
-#: src/imap.c:4122
+#: src/imap.c:4119
 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor están deshabilitados.\n"
 
-#: src/imap.c:4345
+#: src/imap.c:4342
 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 
-#: src/imap.c:5046
+#: src/imap.c:5043
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no se pueden establecer los flags 'borrado': %d\n"
 
-#: src/imap.c:6081
+#: src/imap.c:6078
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -5992,7 +6034,7 @@ msgstr "S_uscripciones"
 msgid "_Subscribe..."
 msgstr "_Suscribir..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:170
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Unsubscribe..."
 msgstr "Des_uscribir..."
 
@@ -6024,25 +6066,25 @@ msgstr ""
 "sólo y no correo, añada «/» al final del nombre)"
 
 #: src/imap_gtk.c:198 src/mh_gtk.c:147
-msgid "Inherit properties from parent folder"
-msgstr "Heredar las propiedades de la carpeta padre"
+msgid "Inherit properties and processing rules from parent folder"
+msgstr "Heredar las propiedades y reglas de procesamiento de la carpeta padre"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2056
+#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
+#: src/plugins/vcalendar/vcal_folder.c:2057
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Introduzca el nuevo nombre para «%s»:"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
-#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2057
+#: src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2058
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2077
+#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:220
+#: src/plugins/vcalendar/vcal_folder.c:2078
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6060,7 +6102,7 @@ msgstr "Seleccionar la carpeta a la que mover la carpeta «%s»"
 msgid "Select folder to copy folder '%s' to"
 msgstr "Seleccionar la carpeta a la que copiar la carpeta «%s»"
 
-#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:153
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6074,8 +6116,8 @@ msgstr ""
 "¿Está seguro de que quiere borrarlos?"
 
 #: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
-#: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2010
+#: src/plugins/rssyl/rssyl_cb_menu.c:172
+#: src/plugins/vcalendar/vcal_folder.c:2011
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
@@ -6135,8 +6177,8 @@ msgstr "suscribir"
 msgid "unsubscribe"
 msgstr "desuscribir"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1446 src/prefs_folder_item.c:1474
-#: src/prefs_folder_item.c:1502
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1537 src/prefs_folder_item.c:1565
+#: src/prefs_folder_item.c:1593
 msgid "Apply to subfolders"
 msgstr "Aplicar a subcarpetas"
 
@@ -6236,7 +6278,7 @@ msgstr "Seleccione el fichero LDIF a importar."
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:710 src/summaryview.c:443
+#: src/importldif.c:710 src/summaryview.c:463
 msgid "S"
 msgstr "S"
 
@@ -6334,142 +6376,142 @@ msgstr "Seleccionar fichero Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importar fichero Pine a la agenda"
 
-#: src/inc.c:190 src/inc.c:298 src/inc.c:324
+#: src/inc.c:191 src/inc.c:299 src/inc.c:325
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail necesita acceso a la red para poder obtener el correo."
 
-#: src/inc.c:343
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s falló\n"
 
-#: src/inc.c:472
+#: src/inc.c:476
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:530
+#: src/inc.c:534
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:671 src/inc.c:725
+#: src/inc.c:675 src/inc.c:729
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:682
+#: src/inc.c:686
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:691
+#: src/inc.c:695
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Hecho (%d mensaje (%s) recibido)"
 msgstr[1] "Hecho (%d mensajes (%s) recibidos)"
 
-#: src/inc.c:697
+#: src/inc.c:701
 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 
-#: src/inc.c:702
+#: src/inc.c:706
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:705 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:709 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:712 src/prefs_matcher.c:397 src/prefs_summaries.c:453
-#: src/prefs_summary_column.c:87 src/summaryview.c:2849 src/summaryview.c:6497
+#: src/inc.c:716 src/prefs_matcher.c:407 src/prefs_summaries.c:624
+#: src/prefs_summary_column.c:87 src/summaryview.c:2893 src/summaryview.c:6544
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:722 src/plugins/spamassassin/spamassassin_gtk.c:394
+#: src/inc.c:726 src/plugins/spamassassin/spamassassin_gtk.c:394
 msgid "Timeout"
 msgstr "Tiempo límite"
 
-#: src/inc.c:808
+#: src/inc.c:812
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Finalizado (%d mensaje nuevo)"
 msgstr[1] "Finalizado (%d mensajes nuevos)"
 
-#: src/inc.c:812
+#: src/inc.c:816
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:853
+#: src/inc.c:857
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:883
+#: src/inc.c:887
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor POP3: %s:%d..."
 
-#: src/inc.c:917
+#: src/inc.c:921
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "No se puede conectar al servidor POP3: %s:%d"
 
-#: src/inc.c:921
+#: src/inc.c:925
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/inc.c:1001 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:514
+#: src/inc.c:1005 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:515
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:1003
+#: src/inc.c:1007
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Obteniendo mensajes de %s (%s)..."
 
-#: src/inc.c:1009
+#: src/inc.c:1013
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:1013
+#: src/inc.c:1017
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:1017
+#: src/inc.c:1021
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:1021
+#: src/inc.c:1025
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de los mensajes (LIST)..."
 
-#: src/inc.c:1028 src/send_message.c:532
+#: src/inc.c:1032 src/send_message.c:533
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:1053
+#: src/inc.c:1057
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1066
+#: src/inc.c:1070
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Recuperando (%d mensaje (%s) recibido)"
 msgstr[1] "Recuperando (%d mensajes (%s) recibidos)"
 
-#: src/inc.c:1225
+#: src/inc.c:1229
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Ha fallado la conexión con %s:%d."
 
-#: src/inc.c:1230
+#: src/inc.c:1234
 msgid "Error occurred while processing mail."
 msgstr "Ocurrió un error mientras se procesaba el correo."
 
-#: src/inc.c:1236
+#: src/inc.c:1240
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6478,37 +6520,37 @@ msgstr ""
 "Ocurrió un error mientras se procesaba el correo:\n"
 "%s"
 
-#: src/inc.c:1242
+#: src/inc.c:1246
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1247
+#: src/inc.c:1251
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1252
+#: src/inc.c:1256
 msgid "Socket error."
 msgstr "Error de conector."
 
-#: src/inc.c:1255
+#: src/inc.c:1259
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Error de conector conectando con %s:%d."
 
-#: src/inc.c:1260 src/send_message.c:443 src/send_message.c:706
+#: src/inc.c:1264 src/send_message.c:444 src/send_message.c:707
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1263
+#: src/inc.c:1267
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Conexión con %s:%d cerrada por la máquina remota."
 
-#: src/inc.c:1268
+#: src/inc.c:1272
 msgid "Mailbox is locked."
 msgstr "El buzón está bloqueado."
 
-#: src/inc.c:1272
+#: src/inc.c:1276
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6517,11 +6559,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1278 src/send_message.c:691
+#: src/inc.c:1282 src/send_message.c:692
 msgid "Authentication failed."
 msgstr "La autenticación falló."
 
-#: src/inc.c:1284 src/send_message.c:694
+#: src/inc.c:1288 src/send_message.c:695
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6530,7 +6572,7 @@ msgstr ""
 "La autenticación falló:\n"
 "%s"
 
-#: src/inc.c:1289 src/send_message.c:710
+#: src/inc.c:1293 src/send_message.c:711
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6538,26 +6580,46 @@ msgstr ""
 "La sesión ha expirado. Puede ser capaz de recuperarla incrementando el "
 "tiempo límite de la sesión en «Preferencias/Otras/Miscelánea»."
 
-#: src/inc.c:1294
+#: src/inc.c:1298
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "La conexión con %s:%d excedió el límite de tiempo."
 
-#: src/inc.c:1332
+#: src/inc.c:1336
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1625
+#: src/inc.c:1628 src/plugins/notification/notification_prefs.c:1072
+#: src/plugins/notification/notification_prefs.c:1367
+#: src/plugins/notification/notification_prefs.c:1673
+#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1786
+#: src/prefs_other.c:572 src/prefs_receive.c:203 src/prefs_summaries.c:530
+msgid "seconds"
+msgstr "segundos"
+
+#: src/inc.c:1638 src/inc.c:1648
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuto"
+msgstr[1] "minutos"
+
+#: src/inc.c:1641
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "horas"
+
+#: src/inc.c:1653
 #, c-format
-msgid "%s%sYou're working offline. Override for %d minutes?"
-msgstr "%s%sEstá trabajando sin conexión. ¿Ignorarlo durante %d minutos?"
+msgid "%s%sYou're working offline. Override for %d %s?"
+msgstr "%s%sEstá trabajando sin conexión. ¿Ignorarlo durante %d %s?"
 
-#: src/inc.c:1631
+#: src/inc.c:1659
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sEstá trabajando sin conexión ¿Ignorar?"
 
-#: src/inc.c:1638
+#: src/inc.c:1666
 msgid "On_ly once"
 msgstr "Só_lo una vez"
 
@@ -6582,19 +6644,19 @@ msgid "LDAP error (rename): from '%s' to '%s': %d (%s)\n"
 msgstr "Error LDAP (renombrar): de «%s» a «%s»: %d (%s)\n"
 
 #: src/ldaputil.c:81 src/ldaputil.c:156
-msgid "LDAP (search): succesful\n"
-msgstr "LDAP (buscar): con éxito\n"
+msgid "LDAP (search): successful\n"
+msgstr "LDAP (buscar): correcto\n"
 
 #: src/ldaputil.c:112 src/ldaputil.c:200
 #, c-format
 msgid "LDAP error (search): %d (%s)\n"
 msgstr "Error LDAP (buscar): %d (%s)\n"
 
-#: src/ldif.c:758
+#: src/ldif.c:759
 msgid "Nick Name"
 msgstr "Apodo"
 
-#: src/main.c:247
+#: src/main.c:248
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6603,7 +6665,7 @@ msgstr ""
 "El fichero «%s» ya existe.\n"
 "No se puede crear la carpeta."
 
-#: src/main.c:368
+#: src/main.c:373
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6612,7 +6674,7 @@ msgstr ""
 "Encontrada configuración para %s.\n"
 "¿Desea migrar esta configuración?"
 
-#: src/main.c:370
+#: src/main.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6625,11 +6687,11 @@ msgstr ""
 "Sus reglas de filtrado de Sylpheed se pueden convertir\n"
 "con un script que encontrará en %s."
 
-#: src/main.c:382
+#: src/main.c:387
 msgid "Keep old configuration"
 msgstr "Conservar la configuración antigua"
 
-#: src/main.c:385
+#: src/main.c:390
 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 "
@@ -6639,31 +6701,31 @@ msgstr ""
 "pero puede tardar cierto tiempo si tiene datos de Noticias o IMAP cacheados "
 "y ocupará espacio adicional en el disco."
 
-#: src/main.c:393
+#: src/main.c:398
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:404
+#: src/main.c:409
 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando configuración... Esto puede tardar un rato..."
 
-#: src/main.c:413
+#: src/main.c:418
 msgid "Migration failed!"
 msgstr "¡La migración falló!"
 
-#: src/main.c:422
+#: src/main.c:427
 msgid "Migrating configuration..."
 msgstr "Migrando la configuración..."
 
-#: src/main.c:1130
+#: src/main.c:1129
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no está soportado por glib.\n"
 
-#: src/main.c:1150 src/main.c:1154 src/main.c:1158
+#: src/main.c:1149 src/main.c:1153 src/main.c:1157
 msgid "(or older)"
 msgstr "(o anterior)"
 
-#: src/main.c:1494
+#: src/main.c:1496
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6682,7 +6744,7 @@ msgstr[1] ""
 "de los módulos para más información:\n"
 "%s"
 
-#: src/main.c:1536
+#: src/main.c:1538
 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 "
@@ -6692,7 +6754,7 @@ msgstr ""
 "ser debido a una cuenta IMAP que esté fallando. Utilice «Reconstruir árbol "
 "de carpetas» en la carpeta padre del buzón para intentar arreglarlo."
 
-#: src/main.c:1542
+#: src/main.c:1544
 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 "
@@ -6702,36 +6764,36 @@ msgstr ""
 "probable que esté soportado por un módulo externo desactualizado. Por favor "
 "reinstale el módulo e inténtelo de nuevo."
 
-#: src/main.c:1789
+#: src/main.c:1784
 msgid "Missing filename\n"
 msgstr "Falta el nombre de fichero\n"
 
-#: src/main.c:1796
+#: src/main.c:1791
 msgid "Cannot open filename for reading\n"
 msgstr "No se puede abrir el fichero para lectura\n"
 
-#: src/main.c:1807
+#: src/main.c:1802
 msgid "Malformed header\n"
 msgstr "Cabecera mal formada\n"
 
-#: src/main.c:1814
+#: src/main.c:1809
 msgid "Duplicated 'To:' header\n"
 msgstr "Cabecera «To:» duplicada\n"
 
-#: src/main.c:1825
+#: src/main.c:1820
 msgid "Missing required 'To:' header\n"
 msgstr "Falta la cabecera «To:» obligatoria\n"
 
-#: src/main.c:1971
+#: src/main.c:1965
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:1973
+#: src/main.c:1967
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de edición"
 
-#: src/main.c:1974
+#: src/main.c:1968
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6749,11 +6811,11 @@ msgstr ""
 "vacía,\n"
 "                         después el cuerpo hasta fin de fichero."
 
-#: src/main.c:1979
+#: src/main.c:1973
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      suscribirse a la URI dada si es posible"
 
-#: src/main.c:1980
+#: src/main.c:1974
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6763,7 +6825,7 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:1983
+#: src/main.c:1977
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6773,23 +6835,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados insertados"
 
-#: src/main.c:1986
+#: src/main.c:1980
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe los mensajes nuevos"
 
-#: src/main.c:1987
+#: src/main.c:1981
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe mensajes nuevos de todas las cuentas"
 
-#: src/main.c:1988
+#: src/main.c:1982
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     cancela la recepción de mensajes en curso"
 
-#: src/main.c:1989
+#: src/main.c:1983
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       cancela el envío de mensajes en curso"
 
-#: src/main.c:1990
+#: src/main.c:1984
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6809,15 +6871,15 @@ msgstr ""
 "                         recursivo: falso si parám. empieza por: 0, n, N, f "
 "o F"
 
-#: src/main.c:1997
+#: src/main.c:1991
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:1998
+#: src/main.c:1992
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:1999
+#: src/main.c:1993
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6825,15 +6887,15 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:2001
+#: src/main.c:1995
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           muestra las estadísticas de la sesión"
 
-#: src/main.c:2002
+#: src/main.c:1996
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     reinicializa las estadísticas de la sesión"
 
-#: src/main.c:2003
+#: src/main.c:1997
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6841,35 +6903,35 @@ msgstr ""
 "  --select carpt[/mnsj]  va a la carpeta/mensaje especificados\n"
 "                         carpt es un identificador como «carpeta/subcarpeta»"
 
-#: src/main.c:2005
+#: src/main.c:1999
 msgid "  --online               switch to online mode"
 msgstr "  --online               cambiar a modo de trabajo con conexión"
 
-#: src/main.c:2006
+#: src/main.c:2000
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              cambiar a modo de trabajo sin conexión"
 
-#: src/main.c:2007
+#: src/main.c:2001
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       salir de Claws Mail"
 
-#: src/main.c:2008
+#: src/main.c:2002
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:2009
+#: src/main.c:2003
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         activa o desactiva el modo de depuración"
 
-#: src/main.c:2010
+#: src/main.c:2004
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              presenta esta ayuda y finaliza"
 
-#: src/main.c:2011
+#: src/main.c:2005
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           informa de la versión y finaliza"
 
-#: src/main.c:2012
+#: src/main.c:2006
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6877,11 +6939,11 @@ msgstr ""
 "  --version-full -V      informa de la versión y características incluidas y "
 "finaliza"
 
-#: src/main.c:2013
+#: src/main.c:2007
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           muestra el directorio del configuración"
 
-#: src/main.c:2014
+#: src/main.c:2008
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6889,7 +6951,7 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         usa el directorio del configuración especificado"
 
-#: src/main.c:2016
+#: src/main.c:2010
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6897,40 +6959,40 @@ msgstr ""
 "  --geometry -geometry ANxAL+X+Y\n"
 "                         establece la geometría de la ventana principal"
 
-#: src/main.c:2069
+#: src/main.c:2063
 msgid "Unknown option\n"
 msgstr "Error desconocido\n"
 
-#: src/main.c:2087
+#: src/main.c:2081
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Procesando (%s)..."
 
-#: src/main.c:2090
+#: src/main.c:2084
 msgid "top level folder"
 msgstr "carpeta superior"
 
-#: src/main.c:2172
+#: src/main.c:2166
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:2173
+#: src/main.c:2167
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:2920
+#: src/main.c:2914
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: la red está conectada.\n"
 
-#: src/main.c:2926
+#: src/main.c:2920
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la red está desconectada.\n"
 
-#: src/mainwindow.c:514 src/messageview.c:209
+#: src/mainwindow.c:514 src/messageview.c:211
 msgid "_File"
 msgstr "_Fichero"
 
-#: src/mainwindow.c:516 src/messageview.c:211 src/summaryview.c:438
+#: src/mainwindow.c:516 src/messageview.c:213 src/summaryview.c:444
 msgid "_View"
 msgstr "_Ver"
 
@@ -6966,19 +7028,19 @@ msgstr "_Exportar la selección a un fichero mbox..."
 msgid "Empty all _Trash folders"
 msgstr "Vaciar _todas las papeleras"
 
-#: src/mainwindow.c:537 src/messageview.c:218
+#: src/mainwindow.c:537 src/messageview.c:220
 msgid "_Save email as..."
 msgstr "_Guardar mensaje como..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save part as..."
 msgstr "_Guardar parte como..."
 
-#: src/mainwindow.c:541 src/messageview.c:220
+#: src/mainwindow.c:541 src/messageview.c:222
 msgid "Page setup..."
 msgstr "Configurar página..."
 
-#: src/mainwindow.c:542 src/messageview.c:221
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "_Print..."
 msgstr "_Imprimir..."
 
@@ -7042,99 +7104,99 @@ msgstr "E_xpandir todos los hilos"
 msgid "Co_llapse all threads"
 msgstr "Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:577 src/messageview.c:232
+#: src/mainwindow.c:577 src/messageview.c:234
 msgid "_Go to"
 msgstr "_Ir a"
 
-#: src/mainwindow.c:578 src/messageview.c:233
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Previous message"
 msgstr "Mensaje _anterior"
 
-#: src/mainwindow.c:579 src/messageview.c:234
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Next message"
 msgstr "Mensaje _siguiente"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:581 src/messageview.c:238
 msgid "P_revious unread message"
 msgstr "Mensaje a_nterior no leído"
 
-#: src/mainwindow.c:582 src/messageview.c:237
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "N_ext unread message"
 msgstr "Mensaje s_iguiente no leído"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:584 src/messageview.c:241
 msgid "Previous ne_w message"
 msgstr "Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:585 src/messageview.c:240
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Ne_xt new message"
 msgstr "Mensaje nuev_o siguiente"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:587 src/messageview.c:244
 msgid "Previous _marked message"
 msgstr "Mensaje _marcado anterior"
 
-#: src/mainwindow.c:588 src/messageview.c:243
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Next m_arked message"
 msgstr "Mensaje m_arcado siguiente"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:590 src/messageview.c:247
 msgid "Previous _labeled message"
 msgstr "Mensaje _etiquetado anterior"
 
-#: src/mainwindow.c:591 src/messageview.c:246
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Next la_beled message"
 msgstr "Mensaje e_tiquetado siguiente"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:593 src/messageview.c:250
 msgid "Previous opened message"
 msgstr "Mensaje abierto anterior"
 
-#: src/mainwindow.c:594 src/messageview.c:249
+#: src/mainwindow.c:594 src/messageview.c:251
 msgid "Next opened message"
 msgstr "Mensaje abierto siguiente"
 
-#: src/mainwindow.c:596 src/messageview.c:251
+#: src/mainwindow.c:596 src/messageview.c:253
 msgid "Parent message"
 msgstr "Mensaje padre"
 
-#: src/mainwindow.c:598 src/messageview.c:253
+#: src/mainwindow.c:598 src/messageview.c:255
 msgid "Next unread _folder"
 msgstr "Siguiente _carpeta sin leer"
 
-#: src/mainwindow.c:599 src/messageview.c:254
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "F_older..."
 msgstr "_Carpeta..."
 
-#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:200
+#: src/mainwindow.c:601 src/messageview.c:258 src/mimeview.c:201
 msgid "Next part"
 msgstr "Parte siguiente"
 
-#: src/mainwindow.c:602 src/messageview.c:257 src/mimeview.c:201
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:202
 msgid "Previous part"
 msgstr "Parte anterior"
 
-#: src/mainwindow.c:605 src/messageview.c:258
+#: src/mainwindow.c:605 src/messageview.c:260
 msgid "Message scroll"
 msgstr "Desplazamiento del mensaje"
 
-#: src/mainwindow.c:606 src/messageview.c:259
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Previous line"
 msgstr "Línea anterior"
 
-#: src/mainwindow.c:607 src/messageview.c:260
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Next line"
 msgstr "Línea siguiente"
 
-#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:479
+#: src/mainwindow.c:608 src/messageview.c:263 src/printing.c:475
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: src/mainwindow.c:609 src/messageview.c:262 src/printing.c:485
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Next page"
 msgstr "Página siguiente"
 
-#: src/mainwindow.c:627 src/messageview.c:280
+#: src/mainwindow.c:627 src/messageview.c:282
 msgid "Decode"
 msgstr "Decodificar"
 
@@ -7142,27 +7204,27 @@ msgstr "Decodificar"
 msgid "Open in new _window"
 msgstr "Abrir en ventana _nueva"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:635 src/messageview.c:289
 msgid "Mess_age source"
 msgstr "Fuente del mens_aje"
 
-#: src/mainwindow.c:637 src/messageview.c:288
+#: src/mainwindow.c:637 src/messageview.c:290
 msgid "Message part"
 msgstr "Parte del mensaje"
 
-#: src/mainwindow.c:638 src/messageview.c:289
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "View as text"
 msgstr "Mostrar como texto"
 
-#: src/mainwindow.c:639 src/messageview.c:290 src/toolbar.c:494
+#: src/mainwindow.c:639 src/messageview.c:292 src/toolbar.c:494
 msgid "Open"
 msgstr "Abrir"
 
-#: src/mainwindow.c:641 src/messageview.c:292
+#: src/mainwindow.c:641 src/messageview.c:294
 msgid "Open with..."
 msgstr "Abrir con..."
 
-#: src/mainwindow.c:645 src/messageview.c:295
+#: src/mainwindow.c:645 src/messageview.c:297
 msgid "Quotes"
 msgstr "Citas"
 
@@ -7198,16 +7260,16 @@ msgstr "Compo_ner un mensaje de correo"
 msgid "Compose a news message"
 msgstr "Componer un mensaje de noticias"
 
-#: src/mainwindow.c:664 src/messageview.c:301
-#: src/plugins/notification/notification_banner.c:95
+#: src/mainwindow.c:664 src/messageview.c:303
+#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:428
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/mainwindow.c:665 src/messageview.c:302 src/summaryview.c:430
+#: src/mainwindow.c:665 src/messageview.c:304 src/summaryview.c:429
 msgid "Repl_y to"
 msgstr "Respon_der a"
 
-#: src/mainwindow.c:668 src/messageview.c:305
+#: src/mainwindow.c:668 src/messageview.c:307 src/summaryview.c:432
 msgid "Mailing _list"
 msgstr "_Lista-Correo"
 
@@ -7215,15 +7277,18 @@ msgstr "_Lista-Correo"
 msgid "Follow-up and reply to"
 msgstr "Seguir y responder a"
 
-#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2449
+#: src/mainwindow.c:672 src/messageview.c:310 src/summaryview.c:434
+#: src/toolbar.c:2449
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2450
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:435
+#: src/toolbar.c:2450
 msgid "For_ward as attachment"
 msgstr "Reen_viar como adjunto"
 
-#: src/mainwindow.c:674 src/messageview.c:310 src/toolbar.c:2451
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:436
+#: src/toolbar.c:2451
 msgid "Redirec_t"
 msgstr "Redirigi_r"
 
@@ -7279,7 +7344,7 @@ msgstr "Borrar _hilo"
 msgid "Cancel a news message"
 msgstr "Cancelar una noticia"
 
-#: src/mainwindow.c:700 src/mainwindow.c:701 src/summaryview.c:431
+#: src/mainwindow.c:700 src/mainwindow.c:701 src/summaryview.c:437
 msgid "_Mark"
 msgstr "_Marcar"
 
@@ -7303,7 +7368,7 @@ msgstr "Marcar todos como leídos"
 msgid "Mark all unread"
 msgstr "Marcar todos como no leídos"
 
-#: src/mainwindow.c:711 src/prefs_filtering_action.c:199 src/toolbar.c:242
+#: src/mainwindow.c:711 src/prefs_filtering_action.c:193 src/toolbar.c:242
 #: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr "Ignorar hilo"
@@ -7312,7 +7377,7 @@ msgstr "Ignorar hilo"
 msgid "Unignore thread"
 msgstr "Dejar de ignorar hilo"
 
-#: src/mainwindow.c:713 src/prefs_filtering_action.c:200 src/toolbar.c:243
+#: src/mainwindow.c:713 src/prefs_filtering_action.c:194 src/toolbar.c:243
 #: src/toolbar.c:504
 msgid "Watch thread"
 msgstr "Observar hilo"
@@ -7329,19 +7394,19 @@ msgstr "Marcar como ba_sura"
 msgid "Mark as _ham"
 msgstr "Marcar como _bueno"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:181 src/toolbar.c:507
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:177 src/toolbar.c:507
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/mainwindow.c:722 src/prefs_filtering_action.c:182 src/toolbar.c:508
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:178 src/toolbar.c:508
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: src/mainwindow.c:724 src/summaryview.c:432
+#: src/mainwindow.c:724 src/summaryview.c:438
 msgid "Color la_bel"
 msgstr "Etiqueta de co_lor"
 
-#: src/mainwindow.c:725 src/summaryview.c:433
+#: src/mainwindow.c:725 src/summaryview.c:439
 msgid "Ta_gs"
 msgstr "Eti_quetas"
 
@@ -7349,11 +7414,11 @@ msgstr "Eti_quetas"
 msgid "Re-_edit"
 msgstr "Re_editar"
 
-#: src/mainwindow.c:731 src/messageview.c:311 src/mimeview.c:1015
+#: src/mainwindow.c:731 src/messageview.c:313 src/mimeview.c:1016
 msgid "Check signature"
 msgstr "Verificar firma"
 
-#: src/mainwindow.c:736 src/messageview.c:315
+#: src/mainwindow.c:736 src/messageview.c:317
 msgid "Add sender to address boo_k"
 msgstr "Añadir _remitente a la agenda"
 
@@ -7381,35 +7446,35 @@ msgstr "_Filtrar los mensajes seleccionados"
 msgid "Run folder pr_ocessing rules"
 msgstr "Ejecutar reglas de procesamiento de la carpeta"
 
-#: src/mainwindow.c:747 src/messageview.c:318
+#: src/mainwindow.c:747 src/messageview.c:320
 msgid "_Create filter rule"
 msgstr "Crear regla de f_iltrado"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:319
-#: src/messageview.c:325
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
+#: src/messageview.c:327
 msgid "_Automatically"
 msgstr "_Automático"
 
 #: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/messageview.c:322 src/messageview.c:328
 msgid "By _From"
 msgstr "Por el _Desde"
 
 #: src/mainwindow.c:750 src/mainwindow.c:756 src/mainwindow.c:860
-#: src/messageview.c:321 src/messageview.c:327
+#: src/messageview.c:323 src/messageview.c:329
 msgid "By _To"
 msgstr "Por el _Para"
 
-#: src/mainwindow.c:751 src/mainwindow.c:757 src/messageview.c:322
-#: src/messageview.c:328
+#: src/mainwindow.c:751 src/mainwindow.c:757 src/messageview.c:324
+#: src/messageview.c:330
 msgid "By _Subject"
 msgstr "Por el A_sunto"
 
-#: src/mainwindow.c:753 src/messageview.c:324 src/summaryview.c:436
+#: src/mainwindow.c:753 src/messageview.c:326 src/summaryview.c:442
 msgid "Create processing rule"
 msgstr "Crear regla de procesamiento"
 
-#: src/mainwindow.c:760 src/messageview.c:331
+#: src/mainwindow.c:760 src/messageview.c:333
 msgid "List _URLs..."
 msgstr "Listar _URLs..."
 
@@ -7545,7 +7610,7 @@ msgstr "Cabeceras de columna"
 msgid "Th_read view"
 msgstr "_Vista jerárquica"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:826 src/prefs_summaries.c:646
 msgid "Hide read threads"
 msgstr "Ocultar los hilos leídos"
 
@@ -7553,7 +7618,7 @@ msgstr "Ocultar los hilos leídos"
 msgid "_Hide read messages"
 msgstr "_Ocultar los mensajes leídos"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:828 src/prefs_summaries.c:652
 msgid "Hide deleted messages"
 msgstr "Ocultar los mensajes borrados"
 
@@ -7561,19 +7626,19 @@ msgstr "Ocultar los mensajes borrados"
 msgid "_Fullscreen"
 msgstr "Pantalla _completa"
 
-#: src/mainwindow.c:830 src/messageview.c:343
+#: src/mainwindow.c:830 src/messageview.c:345
 msgid "Show all _headers"
 msgstr "Mostrar todas las ca_beceras"
 
-#: src/mainwindow.c:831 src/messageview.c:344
+#: src/mainwindow.c:831 src/messageview.c:346
 msgid "_Collapse all"
 msgstr "Co_lapsar todos"
 
-#: src/mainwindow.c:832 src/messageview.c:345
+#: src/mainwindow.c:832 src/messageview.c:347
 msgid "Collapse from level _2"
 msgstr "Colapsar desde el nivel _2"
 
-#: src/mainwindow.c:833 src/messageview.c:346
+#: src/mainwindow.c:833 src/messageview.c:348
 msgid "Collapse from level _3"
 msgstr "Colapsar desde el nivel _3"
 
@@ -7665,99 +7730,103 @@ msgstr "Por bloqueado"
 msgid "D_on't sort"
 msgstr "N_o ordenar"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:462
+#: src/mainwindow.c:873 src/prefs_summaries.c:633
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: src/mainwindow.c:874 src/prefs_summaries.c:463
+#: src/mainwindow.c:874 src/prefs_summaries.c:634
 msgid "Descending"
 msgstr "Descendente"
 
-#: src/mainwindow.c:916 src/messageview.c:388
+#: src/mainwindow.c:916 src/messageview.c:390
 msgid "_Auto detect"
 msgstr "_Auto detectar"
 
-#: src/mainwindow.c:1294 src/summaryview.c:6423
+#: src/mainwindow.c:1294 src/summaryview.c:6470
 msgid "Apply tags..."
 msgstr "Aplicar etiquetas..."
 
-#: src/mainwindow.c:1943
+#: src/mainwindow.c:1947
 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:1958
+#: src/mainwindow.c:1962
 msgid "You are online. Click the icon to go offline"
 msgstr "Esta conectado. Pulse en el icono para desconectarse"
 
-#: src/mainwindow.c:1961
+#: src/mainwindow.c:1965
 msgid "You are offline. Click the icon to go online"
 msgstr "Esta desconectado. Pulse en el icono para conectarse"
 
-#: src/mainwindow.c:1975
+#: src/mainwindow.c:1979
 msgid "Select account"
 msgstr "Seleccionar cuenta"
 
-#: src/mainwindow.c:2002 src/prefs_logging.c:136
+#: src/mainwindow.c:2006 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Traza del protocolo"
 
-#: src/mainwindow.c:2006
+#: src/mainwindow.c:2010
 msgid "Filtering/Processing debug log"
 msgstr "Traza de depuración de filtrado/procesamiento"
 
-#: src/mainwindow.c:2025 src/prefs_logging.c:378
+#: src/mainwindow.c:2029 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "traza de filtrado activada\n"
 
-#: src/mainwindow.c:2027 src/prefs_logging.c:380
+#: src/mainwindow.c:2031 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "traza de filtrado desactivada\n"
 
-#: src/mainwindow.c:2463 src/mainwindow.c:2470 src/mainwindow.c:2513
-#: src/mainwindow.c:2546 src/mainwindow.c:2578 src/mainwindow.c:2623
+#: src/mainwindow.c:2465 src/mainwindow.c:2472 src/mainwindow.c:2515
+#: src/mainwindow.c:2548 src/mainwindow.c:2580 src/mainwindow.c:2625
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1076
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1087
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:2624 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2626 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:2881 src/mainwindow.c:2886
+#: src/mainwindow.c:2883 src/mainwindow.c:2888
 msgid "Delete all messages in trash folders?"
 msgstr "¿Borrar todos los mensajes de las papeleras?"
 
-#: src/mainwindow.c:2882
+#: src/mainwindow.c:2884
 msgid "Don't quit"
 msgstr "No salir"
 
-#: src/mainwindow.c:2913 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:2914
+#: src/mainwindow.c:2916
 msgid ""
-"Input the location of mailbox.\n"
-"If an existing mailbox is specified, it will be\n"
+"Input the location of the mailbox.\n"
+"The location can be either the full path or relative to the \n"
+"home directory.\n"
+"If the location of an existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
 "Introduzca la ubicación del buzón.\n"
-"Si especifica un buzón existente será\n"
+"La ubicación puede ser la ruta absoluta o relativa al directorio de "
+"inicio del usuario.\n"
+"Si especifica la ubicación de un buzón ya existente será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:742
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:2930 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7767,54 +7836,54 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:3411
+#: src/mainwindow.c:3415
 msgid "No posting allowed"
 msgstr "No esta permitido enviar"
 
-#: src/mainwindow.c:3993
+#: src/mainwindow.c:3997
 msgid "Mbox import has failed."
 msgstr "La importación de mbox ha fallado."
 
-#: src/mainwindow.c:4002 src/mainwindow.c:4011
+#: src/mainwindow.c:4006 src/mainwindow.c:4015
 msgid "Export to mbox has failed."
 msgstr "La exportación a mbox ha fallado."
 
-#: src/mainwindow.c:4052 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:4052 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "¿Salir de Claws Mail?"
 
-#: src/mainwindow.c:4245
+#: src/mainwindow.c:4257
 msgid "Folder synchronisation"
 msgstr "Sincronización de carpeta"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4258
 msgid "Do you want to synchronise your folders now?"
 msgstr "¿Quiere sincronizar sus carpetas ahora?"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4259
 msgid "_Synchronise"
 msgstr "_Sincronizar"
 
-#: src/mainwindow.c:4692
+#: src/mainwindow.c:4704
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/mainwindow.c:4702
+#: src/mainwindow.c:4714
 msgid "No duplicate message found in selected folder.\n"
 msgstr "No se encontró ningún mensaje duplicado en la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4708
+#: src/mainwindow.c:4720
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "Borrado %d mensaje repetido en la carpeta seleccionada.\n"
 msgstr[1] "Borrados %d mensajes repetidos en la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4712
+#: src/mainwindow.c:4724
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
@@ -7823,117 +7892,117 @@ msgstr[0] ""
 msgstr[1] ""
 "Marcados para borrar %d mensajes duplicados en la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4750
+#: src/mainwindow.c:4762
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Borrando los mensajes duplicados en todas las carpetas..."
 
-#: src/mainwindow.c:4756
+#: src/mainwindow.c:4768
 #, 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:4761
+#: src/mainwindow.c:4773
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "No se encontró ningún mensaje duplicado en %d carpetas.\n"
 
-#: src/mainwindow.c:4923 src/messageview.c:2658
+#: src/mainwindow.c:4935 src/messageview.c:2662
 msgid "Select folder to go to"
 msgstr "Seleccionar la carpeta a la que ir"
 
-#: src/mainwindow.c:5024 src/summaryview.c:5866
+#: src/mainwindow.c:5036 src/summaryview.c:5913
 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 
-#: src/mainwindow.c:5032
+#: src/mainwindow.c:5044
 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
 
-#: src/mainwindow.c:5040 src/summaryview.c:5877
+#: src/mainwindow.c:5052 src/summaryview.c:5924
 msgid "Filtering configuration"
 msgstr "Configuración de filtrado"
 
-#: src/mainwindow.c:5155
+#: src/mainwindow.c:5167
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "No se puede registrar como cliente predeterminado: imposible obtener la ruta "
 "al ejecutable."
 
-#: src/mainwindow.c:5214
+#: src/mainwindow.c:5226
 msgid "Claws Mail has been registered as default client."
 msgstr "Se ha registrado Claws Mail como cliente predeterminado."
 
-#: src/mainwindow.c:5216
+#: src/mainwindow.c:5228
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "No se puede registrar como cliente predeterminado: imposible escribir en el "
 "registro."
 
-#: src/mainwindow.c:5230 src/setup.c:91
+#: src/mainwindow.c:5242 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Revisando carpeta %s%c%s..."
 
-#: src/mainwindow.c:5374
+#: src/mainwindow.c:5386
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "Olvidada %d contraseña en %d cuentas.\n"
 msgstr[1] "Olvidadas %d contraseñas en %d cuentas.\n"
 
-#: src/matcher.c:214 src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
-#: src/matcher.c:218 src/matcher.c:219 src/matcher.c:220 src/matcher.c:221
+#: src/matcher.c:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
+#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
 #, c-format
 msgid "%s header"
 msgstr "cabecera %s"
 
-#: src/matcher.c:222
+#: src/matcher.c:225
 msgid "header"
 msgstr "cabecera"
 
-#: src/matcher.c:223
+#: src/matcher.c:226
 msgid "header line"
 msgstr "línea de cabecera"
 
-#: src/matcher.c:224
+#: src/matcher.c:227
 msgid "body line"
 msgstr "línea de cuerpo"
 
-#: src/matcher.c:225
+#: src/matcher.c:228
 msgid "tag"
 msgstr "etiqueta"
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
-#: src/message_search.c:203 src/prefs_matcher.c:738 src/summary_search.c:456
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/message_search.c:214 src/prefs_matcher.c:748 src/summary_search.c:454
 msgid "Case sensitive"
 msgstr "Sensible a mayús./minús."
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
 msgid "Case insensitive"
 msgstr "Ignorar mayús./minús."
 
-#: src/matcher.c:1863
+#: src/matcher.c:1903
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "comprobando si el mensaje coincide [ %s ]\n"
 
-#: src/matcher.c:1934 src/matcher.c:1953 src/matcher.c:1966
+#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
 msgid "message matches\n"
 msgstr "el mensaje coincide\n"
 
-#: src/matcher.c:1941 src/matcher.c:1959 src/matcher.c:1968
+#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
 msgid "message does not match\n"
 msgstr "el mensaje no coincide\n"
 
-#: src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233 src/matcher.c:2234
-#: src/matcher.c:2235 src/matcher.c:2236 src/matcher.c:2237 src/matcher.c:2238
+#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
+#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
 msgid "(none)"
 msgstr "(ninguna)"
 
-#: src/mbox.c:107
+#: src/mbox.c:97
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
@@ -7942,27 +8011,27 @@ msgstr ""
 "No se puede abrir el fichero mbox:\n"
 "%s\n"
 
-#: src/mbox.c:144
+#: src/mbox.c:134
 #, c-format
 msgid "Importing from mbox... (%d mail imported)"
 msgid_plural "Importing from mbox... (%d mails imported)"
 msgstr[0] "Importando desde mbox... (%d correo importado)"
 msgstr[1] "Importando desde mbox... (%d correos importados)"
 
-#: src/mbox.c:549
+#: src/mbox.c:539
 msgid "Overwrite mbox file"
 msgstr "Sobreescribir fichero mbox"
 
-#: src/mbox.c:550
+#: src/mbox.c:540
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Este fichero ya existe. ¿Desea sobreescribir su contenido?"
 
-#: src/mbox.c:551 src/messageview.c:1842 src/mimeview.c:1844
-#: src/prefs_themes.c:598 src/textview.c:3128
+#: src/mbox.c:541 src/messageview.c:1846 src/mimeview.c:1845
+#: src/prefs_themes.c:596 src/textview.c:3129
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: src/mbox.c:560
+#: src/mbox.c:550
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -7971,51 +8040,51 @@ msgstr ""
 "No se puede crear el fichero mbox:\n"
 "%s\n"
 
-#: src/mbox.c:568
+#: src/mbox.c:554
 msgid "Exporting to mbox..."
 msgstr "Exportar a mbox..."
 
-#: src/message_search.c:162
+#: src/message_search.c:173
 msgid "Find in current message"
 msgstr "Buscar en el mensaje actual"
 
-#: src/message_search.c:180
+#: src/message_search.c:191
 msgid "Find text:"
 msgstr "Buscar texto:"
 
-#: src/message_search.c:306 src/summary_search.c:780
+#: src/message_search.c:317 src/summary_search.c:778
 msgid "Search failed"
 msgstr "Búsqueda fallida"
 
-#: src/message_search.c:307 src/summary_search.c:781
+#: src/message_search.c:318 src/summary_search.c:779
 msgid "Search string not found."
 msgstr "Cadena no encontrada."
 
-#: src/message_search.c:316
+#: src/message_search.c:327
 msgid "Beginning of message reached; continue from end?"
 msgstr "Se llegó al principio del mensaje. ¿Seguir desde el final?"
 
-#: src/message_search.c:319
+#: src/message_search.c:330
 msgid "End of message reached; continue from beginning?"
 msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
 
-#: src/message_search.c:322 src/summary_search.c:792
+#: src/message_search.c:333 src/summary_search.c:790
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:298 src/textview.c:252
+#: src/messageview.c:300 src/textview.c:253
 msgid "Compose _new message"
 msgstr "Componer un mensaje _nuevo"
 
-#: src/messageview.c:713 src/messageview.c:1434 src/messageview.c:1585
+#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista de mensaje"
 
-#: src/messageview.c:843
+#: src/messageview.c:845
 msgid "<No Return-Path found>"
 msgstr "<No se encontró Return-Path>"
 
-#: src/messageview.c:850
+#: src/messageview.c:852
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8030,51 +8099,51 @@ msgstr ""
 "Dirección de retorno: %s\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:857
+#: src/messageview.c:859
 msgid "_Don't Send"
 msgstr "_No enviar"
 
-#: src/messageview.c:1364
+#: src/messageview.c:1366
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Recuperando mensaje (%s)..."
 
-#: src/messageview.c:1400 src/procmime.c:1016
+#: src/messageview.c:1402 src/procmime.c:956
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No se puede descifrar: %s"
 
-#: src/messageview.c:1481 src/messageview.c:1489
+#: src/messageview.c:1483 src/messageview.c:1491
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "El mensaje no cumple el estándar MIME. Puede mostrarse incorrectamente."
 
-#: src/messageview.c:1834 src/messageview.c:1837 src/mimeview.c:2049
-#: src/plugins/fancy/fancy_viewer.c:707 src/summaryview.c:4969
-#: src/summaryview.c:4972 src/textview.c:3116
+#: src/messageview.c:1838 src/messageview.c:1841 src/mimeview.c:2050
+#: src/plugins/fancy/fancy_viewer.c:692 src/summaryview.c:5016
+#: src/summaryview.c:5019 src/textview.c:3117
 msgid "Save as"
 msgstr "Guardar como"
 
-#: src/messageview.c:1843
+#: src/messageview.c:1847
 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir el fichero existente?"
 
-#: src/messageview.c:1851 src/summaryview.c:4989 src/summaryview.c:4992
-#: src/summaryview.c:5007
+#: src/messageview.c:1855 src/summaryview.c:5036 src/summaryview.c:5039
+#: src/summaryview.c:5054
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No se pudo guardar el fichero «%s»."
 
-#: src/messageview.c:1904
+#: src/messageview.c:1908
 #, c-format
 msgid "Show all %s."
 msgstr "Mostrar todo %s."
 
-#: src/messageview.c:1906
+#: src/messageview.c:1910
 msgid "Only the first megabyte of text is shown."
 msgstr "Mostrar sólo el primer megabyte de texto."
 
-#: src/messageview.c:1937
+#: src/messageview.c:1941
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8082,19 +8151,19 @@ msgstr ""
 "Recibió un acuse de recibo en este mensaje: éste ha sido visualizado por el "
 "destinatario."
 
-#: src/messageview.c:1940
+#: src/messageview.c:1944
 msgid "You asked for a return receipt in this message."
 msgstr "Usted solicitó acuse de recibo en este mensaje."
 
-#: src/messageview.c:1946
+#: src/messageview.c:1950
 msgid "This message asks for a return receipt."
 msgstr "Este mensaje solicita acuse de recibo."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1951
 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 
-#: src/messageview.c:1990
+#: src/messageview.c:1994
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8102,7 +8171,7 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente,\n"
 "y ha sido eliminado del servidor."
 
-#: src/messageview.c:1996
+#: src/messageview.c:2000
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8111,15 +8180,15 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s."
 
-#: src/messageview.c:2000 src/messageview.c:2022
+#: src/messageview.c:2004 src/messageview.c:2026
 msgid "Mark for download"
 msgstr "Marcar para descargar"
 
-#: src/messageview.c:2001 src/messageview.c:2013
+#: src/messageview.c:2005 src/messageview.c:2017
 msgid "Mark for deletion"
 msgstr "Marcar para eliminar"
 
-#: src/messageview.c:2006
+#: src/messageview.c:2010
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8128,12 +8197,12 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será descargado."
 
-#: src/messageview.c:2011 src/messageview.c:2024
-#: src/prefs_filtering_action.c:180 src/toolbar.c:506
+#: src/messageview.c:2015 src/messageview.c:2028
+#: src/prefs_filtering_action.c:176 src/toolbar.c:506
 msgid "Unmark"
 msgstr "Desmarca"
 
-#: src/messageview.c:2017
+#: src/messageview.c:2021
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8142,7 +8211,7 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será eliminado."
 
-#: src/messageview.c:2094
+#: src/messageview.c:2098
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -8156,20 +8225,20 @@ msgstr ""
 "oficialmente dirigido a usted.\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:2102 src/messageview.c:2110
+#: src/messageview.c:2106 src/messageview.c:2114
 msgid "Return Receipt Notification"
 msgstr "Notificación de acuse de recibo"
 
-#: src/messageview.c:2104 src/messageview.c:2115
+#: src/messageview.c:2108 src/messageview.c:2119
 #: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/messageview.c:2104 src/messageview.c:2115
+#: src/messageview.c:2108 src/messageview.c:2119
 msgid "_Send Notification"
 msgstr "_Enviar notificación"
 
-#: src/messageview.c:2111
+#: src/messageview.c:2115
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8181,11 +8250,11 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 
-#: src/messageview.c:2207
+#: src/messageview.c:2211
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No se puede imprimir: el mensaje no contiene texto."
 
-#: src/messageview.c:2968
+#: src/messageview.c:2972
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8193,7 +8262,7 @@ msgstr ""
 "\n"
 "  No hay mensajes en esta carpeta"
 
-#: src/messageview.c:2976
+#: src/messageview.c:2980
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8201,7 +8270,7 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado"
 
-#: src/messageview.c:2977
+#: src/messageview.c:2981
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8209,16 +8278,16 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado o movido a otra carpeta"
 
-#: src/messageview.c:3010 src/messageview.c:3016 src/summaryview.c:4367
-#: src/summaryview.c:7190
+#: src/messageview.c:3014 src/messageview.c:3020 src/summaryview.c:4414
+#: src/summaryview.c:7275
 msgid "An error happened while learning.\n"
 msgstr "Ocurrió un error mientras se aprendía.\n"
 
-#: src/mh.c:527
+#: src/mh.c:528
 msgid "Moving messages..."
 msgstr "Moviendo mensajes..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:838
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Borrando mensajes..."
 
@@ -8250,59 +8319,59 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Eliminar buzón"
 
-#: src/mimeview.c:192
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/mimeview.c:194
+#: src/mimeview.c:195
 msgid "Open _with..."
 msgstr "Abrir _con..."
 
-#: src/mimeview.c:196
+#: src/mimeview.c:197
 msgid "Send to..."
 msgstr "Enviar a..."
 
-#: src/mimeview.c:197
+#: src/mimeview.c:198
 msgid "_Display as text"
 msgstr "_Mostrar como texto"
 
-#: src/mimeview.c:198
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "_Guardar como..."
 
-#: src/mimeview.c:199
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr "Gu_ardar todo..."
 
-#: src/mimeview.c:272
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:1020 src/mimeview.c:1025 src/mimeview.c:1030
-#: src/mimeview.c:1035
+#: src/mimeview.c:1021 src/mimeview.c:1026 src/mimeview.c:1031
+#: src/mimeview.c:1036
 msgid "View full information"
 msgstr "Ver la información completa"
 
-#: src/mimeview.c:1041
+#: src/mimeview.c:1042
 msgid "Check again"
 msgstr "Verificar de nuevo"
 
-#: src/mimeview.c:1053
+#: src/mimeview.c:1054
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Pulse en el icono para comprobarla."
 
-#: src/mimeview.c:1055
+#: src/mimeview.c:1056
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Pulse en el icono o la tecla «%s» para comprobarla."
 
-#: src/mimeview.c:1065
+#: src/mimeview.c:1066
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Expiró el tiempo comprobando la firma. Pulse en el icono para reintentarlo."
 
-#: src/mimeview.c:1067
+#: src/mimeview.c:1068
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8310,26 +8379,26 @@ msgstr ""
 "Expiró el tiempo comprobando la firma. Pulse en el icono o la tecla «%s» "
 "para reintentarlo."
 
-#: src/mimeview.c:1307
+#: src/mimeview.c:1308
 msgid "Checking signature..."
 msgstr "Verificando firma..."
 
-#: src/mimeview.c:1348
+#: src/mimeview.c:1349
 msgid "Go back to email"
 msgstr "Volver al correo"
 
-#: src/mimeview.c:1762 src/mimeview.c:1854 src/mimeview.c:2096
-#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:447
+#: src/mimeview.c:1763 src/mimeview.c:1855 src/mimeview.c:2097
+#: src/mimeview.c:2133 src/mimeview.c:2245 src/plugins/fancy/fancy_viewer.c:440
 #, 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:1841 src/textview.c:3126
+#: src/mimeview.c:1842 src/textview.c:3127
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "¿Sobreescribir el fichero existente «%s»?"
 
-#: src/mimeview.c:1865
+#: src/mimeview.c:1866
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8338,54 +8407,54 @@ msgstr ""
 "Ha ocurrido un error al guardar la parte del mensaje n.º %d. ¿Desea cancelar "
 "la operación o ignorar el error y continuar?"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1869
 msgid "Error saving all message parts"
 msgstr "Error guardando todas las partes del mensaje"
 
-#: src/mimeview.c:1869
+#: src/mimeview.c:1870
 msgid "Skip"
 msgstr "Ignorar"
 
-#: src/mimeview.c:1869
+#: src/mimeview.c:1870
 msgid "Skip all"
 msgstr "Ignorar todos"
 
-#: src/mimeview.c:1879
+#: src/mimeview.c:1880
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d fichero guardado con éxito."
 msgstr[1] "%d ficheros guardados con éxito."
 
-#: src/mimeview.c:1887
+#: src/mimeview.c:1888
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d fichero guardado con éxito"
 msgstr[1] "%d ficheros guardados con éxito"
 
-#: src/mimeview.c:1892
+#: src/mimeview.c:1893
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d fichero falló."
 msgstr[1] "%s, %d ficheros fallaron."
 
-#: src/mimeview.c:1925 src/plugins/archive/archiver_prefs.c:142
-#: src/prefs_filtering_action.c:1280
+#: src/mimeview.c:1926 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1262
 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destino"
 
-#: src/mimeview.c:1932 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1933 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "«%s» no es un directorio."
 
-#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3043
+#: src/mimeview.c:2180 src/mimeview.c:2187 src/textview.c:3044
 msgid "Open with"
 msgstr "Abrir con"
 
-#: src/mimeview.c:2180 src/mimeview.c:2187 src/textview.c:3044
+#: src/mimeview.c:2181 src/mimeview.c:2188 src/textview.c:3045
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8394,7 +8463,7 @@ msgstr ""
 "Teclee la orden para abrir el fichero:\n"
 "(«%s» será sustituido por el fichero)"
 
-#: src/mimeview.c:2282
+#: src/mimeview.c:2283
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8405,115 +8474,115 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2290
+#: src/mimeview.c:2291
 msgid "Execute untrusted binary?"
 msgstr "¿Ejecutar binario no fiable?"
 
-#: src/mimeview.c:2291
+#: src/mimeview.c:2292
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
-"dangerous and could probably lead to compromission of your computer.\n"
+"dangerous and could compromise your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
 "Este adjunto es un fichero ejecutable. Ejecutar binarios no fiables es "
-"peligroso y probablemente podría comprometer la seguridad de su ordenador.\n"
+"peligroso y podría causar daños en su sistema.\n"
 "\n"
 "¿Desea ejecutar este fichero?"
 
-#: src/mimeview.c:2295
+#: src/mimeview.c:2296
 msgid "Run binary"
 msgstr "Ejecutar binario"
 
-#: src/mimeview.c:2598 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2599 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/mimeview.c:2599 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:701 src/summaryview.c:2743
+#: src/mimeview.c:2600 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2787
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: src/mimeview.c:2613 src/plugins/vcalendar/vcalendar.c:1253
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1698
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
+#: src/mimeview.c:2614 src/plugins/vcalendar/vcalendar.c:1254
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 msgid "Description:"
 msgstr "Descripción:"
 
-#: src/news.c:299
+#: src/news.c:300
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "La conexión NNTP con %s:%d se ha desconectado.\n"
 
-#: src/news.c:334
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Cuenta «%s»: Conectando al servidor NNTP: %s:%d...\n"
 
-#: src/news.c:370
+#: src/news.c:371
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Error entrando en %s:%d...\n"
 
-#: src/news.c:450
+#: src/news.c:451
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan no soporta el código de retorno 480 por ahora, escogemos continuar\n"
 
-#: src/news.c:459
+#: src/news.c:460
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Falló el modo «reader», se continúa sin embargo\n"
 
-#: src/news.c:463
+#: src/news.c:464
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Error creando sesión con %s:%d\n"
 
-#: src/news.c:478
+#: src/news.c:479
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Error autenticándose en %s:%d...\n"
 
-#: src/news.c:503
+#: src/news.c:504
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder acceder al servidor de "
 "noticias."
 
-#: src/news.c:874
+#: src/news.c:875
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "no se pudo seleccionar el grupo: %s\n"
 
-#: src/news.c:1066 src/news.c:1244
+#: src/news.c:1067 src/news.c:1253
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "no se pudo establecer el grupo: %s\n"
 
-#: src/news.c:1075
+#: src/news.c:1076
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos inválido: %d - %d\n"
 
-#: src/news.c:1145 src/news.c:1172 src/news.c:1199
+#: src/news.c:1154 src/news.c:1181 src/news.c:1208
 msgid "couldn't get xhdr\n"
 msgstr "no se pudo obtener xhdr\n"
 
-#: src/news.c:1237
+#: src/news.c:1246
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: src/news.c:1252
+#: src/news.c:1261
 msgid "couldn't get xover\n"
 msgstr "no se pudo obtener xover\n"
 
-#: src/news.c:1269
+#: src/news.c:1278
 msgid "invalid xover line\n"
 msgstr "línea xover inválida\n"
 
-#: src/news.c:1471
+#: src/news.c:1480
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8588,11 +8657,11 @@ msgstr "Contraseña nueva:"
 msgid "Confirm passphrase:"
 msgstr "Confirmar contraseña:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:52
+#: src/plugins/acpi_notifier/acpi_notifier.c:53
 msgid "Acpi Notifier"
 msgstr "Notificador ACPI"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:68
+#: src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -8600,7 +8669,7 @@ msgstr ""
 "Asegúrese de que el módulo del núcleo «acerhk» está cargado.\n"
 "Puede obtenerlo de http://www.cakey.de/acerhk/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:70
+#: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -8608,19 +8677,19 @@ msgstr ""
 "Asegúrese de que el módulo del núcleo «acer_acpi» está cargado.\n"
 "Puede obtenerlo de http://code.google.com/p/aceracpi/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:72
+#: src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr "Asegúrese de que el módulo del núcleo «asus_laptop» está cargado."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr "Asegúrese de que el módulo del núcleo «asus_acpi» está cargado."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr "Asegúrese de que el módulo del núcleo «ibm_acpi» está cargado."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:75
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -8628,73 +8697,73 @@ msgstr ""
 "Asegúrese de que tiene apanelc instalado.\n"
 "Puede obtenerlo de http://apanel.sourceforge.net/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:208
-#: src/plugins/acpi_notifier/acpi_notifier.c:214
-#: src/plugins/acpi_notifier/acpi_notifier.c:426
+#: src/plugins/acpi_notifier/acpi_notifier.c:209
+#: src/plugins/acpi_notifier/acpi_notifier.c:215
+#: src/plugins/acpi_notifier/acpi_notifier.c:427
 msgid "Control file doesn't exist."
 msgstr "El fichero de control no existe."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
 msgid " : no new or unread mail"
 msgstr " : no hay correo nuevo o sin leer"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
 msgid " : unread mail"
 msgstr " : mensajes sin leer"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:308
+#: src/plugins/acpi_notifier/acpi_notifier.c:309
 msgid " : new mail"
 msgstr " : mensajes nuevos"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:310
-#: src/plugins/acpi_notifier/acpi_notifier.c:316
-#: src/plugins/acpi_notifier/acpi_notifier.c:322
+#: src/plugins/acpi_notifier/acpi_notifier.c:311
+#: src/plugins/acpi_notifier/acpi_notifier.c:317
+#: src/plugins/acpi_notifier/acpi_notifier.c:323
 msgid "off"
 msgstr "apagado"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:312
-#: src/plugins/acpi_notifier/acpi_notifier.c:318
-#: src/plugins/acpi_notifier/acpi_notifier.c:324
+#: src/plugins/acpi_notifier/acpi_notifier.c:313
+#: src/plugins/acpi_notifier/acpi_notifier.c:319
+#: src/plugins/acpi_notifier/acpi_notifier.c:325
 msgid "blinking"
 msgstr "parpadeante"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:314
-#: src/plugins/acpi_notifier/acpi_notifier.c:320
-#: src/plugins/acpi_notifier/acpi_notifier.c:326
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
+#: src/plugins/acpi_notifier/acpi_notifier.c:321
+#: src/plugins/acpi_notifier/acpi_notifier.c:327
 msgid "on"
 msgstr "encendido"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:348
-#: src/plugins/acpi_notifier/acpi_notifier.c:357
-#: src/plugins/acpi_notifier/acpi_notifier.c:372
+#: src/plugins/acpi_notifier/acpi_notifier.c:349
+#: src/plugins/acpi_notifier/acpi_notifier.c:358
+#: src/plugins/acpi_notifier/acpi_notifier.c:373
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:387
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI type: "
 msgstr "Tipo de ACPI: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:396
+#: src/plugins/acpi_notifier/acpi_notifier.c:397
 msgid "ACPI file: "
 msgstr "Fichero ACPI: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:407
+#: src/plugins/acpi_notifier/acpi_notifier.c:408
 msgid "values - On: "
 msgstr "valores - Encendido: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:412
+#: src/plugins/acpi_notifier/acpi_notifier.c:413
 msgid " - Off: "
 msgstr " - Apagado: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:434
+#: src/plugins/acpi_notifier/acpi_notifier.c:435
 msgid "Blink when user interaction is required"
 msgstr "Parpadear cuando sea necesaria la intervención del usuario"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:868
+#: src/plugins/acpi_notifier/acpi_notifier.c:869
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr "Este módulo controla algunos LEDs de notificación de correo ACPI."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:889
+#: src/plugins/acpi_notifier/acpi_notifier.c:890
 msgid "Laptop LED"
 msgstr "LED del portátil"
 
@@ -8730,8 +8799,8 @@ msgstr "Ruta en la agenda donde se guardarán las direcciones"
 #: src/plugins/bogofilter/bogofilter_gtk.c:262
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
 #: src/plugins/spamassassin/spamassassin_gtk.c:463
-#: src/prefs_filtering_action.c:557 src/prefs_filtering_action.c:564
-#: src/prefs_matcher.c:674
+#: src/prefs_filtering_action.c:545 src/prefs_filtering_action.c:552
+#: src/prefs_matcher.c:686
 msgid "Select..."
 msgstr "Seleccionar..."
 
@@ -8811,19 +8880,19 @@ msgstr ""
 msgid "Archiver"
 msgstr "Archivador"
 
-#: src/plugins/archive/archiver_gtk.c:107
+#: src/plugins/archive/archiver_gtk.c:108
 msgid "Archiving"
 msgstr "Archivando"
 
-#: src/plugins/archive/archiver_gtk.c:126
+#: src/plugins/archive/archiver_gtk.c:127
 msgid "Press Cancel button to stop archiving"
 msgstr "Pulse el botón Cancelar para detener el archivado"
 
-#: src/plugins/archive/archiver_gtk.c:142
+#: src/plugins/archive/archiver_gtk.c:143
 msgid "Archiving:"
 msgstr "Archivando:"
 
-#: src/plugins/archive/archiver_gtk.c:526
+#: src/plugins/archive/archiver_gtk.c:527
 #, c-format
 msgid ""
 "Some uninitialized data prevents from starting\n"
@@ -8834,7 +8903,7 @@ msgstr ""
 "debido a algunos datos no inicializados:\n"
 "%s%s"
 
-#: src/plugins/archive/archiver_gtk.c:529
+#: src/plugins/archive/archiver_gtk.c:530
 msgid ""
 "\n"
 "- the folder to archive is not set"
@@ -8842,7 +8911,7 @@ msgstr ""
 "\n"
 "• no se estableció la carpeta a archivar"
 
-#: src/plugins/archive/archiver_gtk.c:530
+#: src/plugins/archive/archiver_gtk.c:531
 msgid ""
 "\n"
 "- the name for archive is not set"
@@ -8850,37 +8919,37 @@ msgstr ""
 "\n"
 "• no se estableció el nombre del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:553
+#: src/plugins/archive/archiver_gtk.c:554
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s : ya existe. ¿Continuar de todas formas?"
 
-#: src/plugins/archive/archiver_gtk.c:556
+#: src/plugins/archive/archiver_gtk.c:557
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: es un enlace. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:559
+#: src/plugins/archive/archiver_gtk.c:560
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: es un directorio. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:562
+#: src/plugins/archive/archiver_gtk.c:563
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: no hay permisos. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:565
+#: src/plugins/archive/archiver_gtk.c:566
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: error desconocido. No se puede continuar"
 
-#: src/plugins/archive/archiver_gtk.c:573
-#: src/plugins/archive/archiver_gtk.c:620
+#: src/plugins/archive/archiver_gtk.c:574
+#: src/plugins/archive/archiver_gtk.c:621
 msgid "Creating archive"
 msgstr "Creando archivo"
 
-#: src/plugins/archive/archiver_gtk.c:586
+#: src/plugins/archive/archiver_gtk.c:587
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8889,7 +8958,7 @@ msgstr ""
 "Nombre de fichero inválido:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:591
+#: src/plugins/archive/archiver_gtk.c:592
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8898,7 +8967,7 @@ msgstr ""
 "Nombre de carpeta de Claws Mail inválida:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:615
+#: src/plugins/archive/archiver_gtk.c:616
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8913,7 +8982,7 @@ msgstr ""
 "\n"
 "¿Continuar de todas formas?"
 
-#: src/plugins/archive/archiver_gtk.c:632
+#: src/plugins/archive/archiver_gtk.c:633
 #, c-format
 msgid ""
 "Archive creation error:\n"
@@ -8922,176 +8991,178 @@ msgstr ""
 "Error creando el archivo:\n"
 "%s"
 
-#: src/plugins/archive/archiver_gtk.c:745
+#: src/plugins/archive/archiver_gtk.c:746
 msgid "Archive result"
 msgstr "Resultado del archivado"
 
-#: src/plugins/archive/archiver_gtk.c:775
+#: src/plugins/archive/archiver_gtk.c:776
 msgid "Values"
 msgstr "Valores"
 
-#: src/plugins/archive/archiver_gtk.c:785
+#: src/plugins/archive/archiver_gtk.c:786
 msgid "Archive"
 msgstr "Archivo"
 
-#: src/plugins/archive/archiver_gtk.c:791
+#: src/plugins/archive/archiver_gtk.c:792
 msgid "Archive format"
 msgstr "Formato de archivo"
 
-#: src/plugins/archive/archiver_gtk.c:798
+#: src/plugins/archive/archiver_gtk.c:799
 msgid "Compression method"
 msgstr "Método de compresión"
 
-#: src/plugins/archive/archiver_gtk.c:806
+#: src/plugins/archive/archiver_gtk.c:807
 msgid "Number of files"
 msgstr "Número de ficheros"
 
-#: src/plugins/archive/archiver_gtk.c:814
+#: src/plugins/archive/archiver_gtk.c:815
 msgid "Archive Size"
 msgstr "Tamaño del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:822
+#: src/plugins/archive/archiver_gtk.c:823
 msgid "Folder Size"
 msgstr "Tamaño de la carpeta"
 
-#: src/plugins/archive/archiver_gtk.c:831
+#: src/plugins/archive/archiver_gtk.c:832
 msgid "Compression level"
 msgstr "Nivel de compresión"
 
-#: src/plugins/archive/archiver_gtk.c:836
-#: src/plugins/archive/archiver_gtk.c:844
-#: src/plugins/archive/archiver_gtk.c:852
-#: src/plugins/pdf_viewer/poppler_viewer.c:720 src/prefs_folder_item.c:521
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:525
+#: src/prefs_folder_item.c:1200 src/prefs_folder_item.c:1232
 msgid "Yes"
 msgstr "Sí"
 
-#: src/plugins/archive/archiver_gtk.c:836
-#: src/plugins/archive/archiver_gtk.c:844
-#: src/plugins/archive/archiver_gtk.c:852
-#: src/plugins/pdf_viewer/poppler_viewer.c:723 src/prefs_folder_item.c:520
-#: src/prefs_summaries.c:380
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:724 src/prefs_folder_item.c:524
+#: src/prefs_folder_item.c:1199 src/prefs_folder_item.c:1231
+#: src/prefs_summaries.c:406
 msgid "No"
 msgstr "No"
 
-#: src/plugins/archive/archiver_gtk.c:839
+#: src/plugins/archive/archiver_gtk.c:840
 msgid "MD5 checksum"
 msgstr "Suma de control MD5"
 
-#: src/plugins/archive/archiver_gtk.c:847
+#: src/plugins/archive/archiver_gtk.c:848
 msgid "Descriptive names"
 msgstr "Nombres descriptivos"
 
-#: src/plugins/archive/archiver_gtk.c:855
+#: src/plugins/archive/archiver_gtk.c:856
 msgid "Delete selected files"
 msgstr "Borrar los ficheros seleccionados"
 
-#: src/plugins/archive/archiver_gtk.c:864
-#: src/plugins/archive/archiver_gtk.c:1329
+#: src/plugins/archive/archiver_gtk.c:865
+#: src/plugins/archive/archiver_gtk.c:1330
 msgid "Select mails before"
 msgstr "Seleccionar correos antes de"
 
-#: src/plugins/archive/archiver_gtk.c:920
+#: src/plugins/archive/archiver_gtk.c:921
 msgid "Select folder to archive"
 msgstr "Seleccionar carpeta a archivar"
 
-#: src/plugins/archive/archiver_gtk.c:941
+#: src/plugins/archive/archiver_gtk.c:942
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Seleccione un nombre para el archivo (el sufijo debería reflejar el tipo, p."
 "ej.: .tgz)"
 
-#: src/plugins/archive/archiver_gtk.c:989
+#: src/plugins/archive/archiver_gtk.c:990
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld de %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1042
+#: src/plugins/archive/archiver_gtk.c:1043
 msgid "Create Archive"
 msgstr "Crear un archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1057
+#: src/plugins/archive/archiver_gtk.c:1058
 msgid "Enter Archiver arguments"
 msgstr "Parámetros de archivado"
 
-#: src/plugins/archive/archiver_gtk.c:1071
+#: src/plugins/archive/archiver_gtk.c:1072
 msgid "Folder to archive"
 msgstr "Carpeta a archivar"
 
-#: src/plugins/archive/archiver_gtk.c:1078
+#: src/plugins/archive/archiver_gtk.c:1079
 msgid "Folder which is the root of the archive"
 msgstr "Carpeta raíz del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1083
+#: src/plugins/archive/archiver_gtk.c:1084
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Pulse este botón para seleccionar la carpeta que será la raíz del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1089
+#: src/plugins/archive/archiver_gtk.c:1090
 msgid "Name for archive"
 msgstr "Nombre del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1096
 msgid "Archive location and name"
 msgstr "Ubicación y nombre del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1097
+#: src/plugins/archive/archiver_gtk.c:1098
 #: src/plugins/archive/archiver_prefs.c:225
 #: src/plugins/pgpcore/select-keys.c:493
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: src/plugins/archive/archiver_gtk.c:1100
+#: src/plugins/archive/archiver_gtk.c:1101
 msgid "Click this button to select a name and location for the archive"
 msgstr "Pulse este botón para seleccionar el nombre y ubicación del archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1102
+#: src/plugins/archive/archiver_gtk.c:1103
 msgid "Choose compression"
 msgstr "Elija la compresión"
 
-#: src/plugins/archive/archiver_gtk.c:1114
-#: src/plugins/archive/archiver_gtk.c:1120
-#: src/plugins/archive/archiver_gtk.c:1126
-#: src/plugins/archive/archiver_gtk.c:1133
-#: src/plugins/archive/archiver_gtk.c:1139
-#: src/plugins/archive/archiver_gtk.c:1147
-#: src/plugins/archive/archiver_gtk.c:1155
-#: src/plugins/archive/archiver_gtk.c:1161
-#: src/plugins/archive/archiver_gtk.c:1167
-#: src/plugins/archive/archiver_gtk.c:1175
-#: src/plugins/archive/archiver_gtk.c:1182
+#: src/plugins/archive/archiver_gtk.c:1115
+#: src/plugins/archive/archiver_gtk.c:1121
+#: src/plugins/archive/archiver_gtk.c:1127
+#: src/plugins/archive/archiver_gtk.c:1134
+#: src/plugins/archive/archiver_gtk.c:1140
+#: src/plugins/archive/archiver_gtk.c:1148
+#: src/plugins/archive/archiver_gtk.c:1156
+#: src/plugins/archive/archiver_gtk.c:1162
+#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1176
+#: src/plugins/archive/archiver_gtk.c:1183
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Elija esta opción para usar la compresión %s en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1231
+#: src/plugins/archive/archiver_gtk.c:1232
 msgid "Choose format"
 msgstr "Elegir formato"
 
-#: src/plugins/archive/archiver_gtk.c:1243
-#: src/plugins/archive/archiver_gtk.c:1249
-#: src/plugins/archive/archiver_gtk.c:1255
-#: src/plugins/archive/archiver_gtk.c:1261
+#: src/plugins/archive/archiver_gtk.c:1244
+#: src/plugins/archive/archiver_gtk.c:1250
+#: src/plugins/archive/archiver_gtk.c:1256
+#: src/plugins/archive/archiver_gtk.c:1262
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Elija esto para usar el formato %s en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1281
+#: src/plugins/archive/archiver_gtk.c:1282
 msgid "Miscellaneous options"
 msgstr "Opciones adicionales"
 
-#: src/plugins/archive/archiver_gtk.c:1290
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "_Recursive"
 msgstr "_Recursivo"
 
-#: src/plugins/archive/archiver_gtk.c:1294
+#: src/plugins/archive/archiver_gtk.c:1295
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Incluir las subcarpetas en el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1296
+#: src/plugins/archive/archiver_gtk.c:1297
 msgid "_MD5sum"
 msgstr "Suma de control _MD5"
 
-#: src/plugins/archive/archiver_gtk.c:1300
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archive.\n"
 "Be aware though, that this dramatically increases the time it\n"
@@ -9101,11 +9172,11 @@ msgstr ""
 "Cuidado: esta opción incrementa dramáticamente el tiempo que se tardará\n"
 "en crear el archivo"
 
-#: src/plugins/archive/archiver_gtk.c:1304
+#: src/plugins/archive/archiver_gtk.c:1305
 msgid "R_ename"
 msgstr "R_enombrar"
 
-#: src/plugins/archive/archiver_gtk.c:1308
+#: src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/archive/archiver_prefs.c:427
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9116,7 +9187,7 @@ msgstr ""
 "El esquema de nombrado es: fecha_desde at para@asunto.\n"
 "Los nombres se truncarán a un máximo de 96 caracteres."
 
-#: src/plugins/archive/archiver_gtk.c:1316
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9124,11 +9195,11 @@ msgstr ""
 "Borrar los correos después del archivado.\n"
 "Actualmente sólo soporta IMAP4, mbox local y POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1320
+#: src/plugins/archive/archiver_gtk.c:1321
 msgid "Selection options"
 msgstr "Opciones de selección"
 
-#: src/plugins/archive/archiver_gtk.c:1336
+#: src/plugins/archive/archiver_gtk.c:1337
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9202,7 +9273,7 @@ msgstr ""
 "necesario para crear los archivos"
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:769
+#: src/plugins/managesieve/sieve_manager.c:770
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -9215,12 +9286,12 @@ msgid "Remove attachments"
 msgstr "Eliminar adjuntos"
 
 #: src/plugins/att_remover/att_remover.c:362
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1099
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
 msgid "Remove"
 msgstr "Eliminar"
 
-#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:451
-#: src/prefs_summary_column.c:79 src/summaryview.c:2837
+#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:622
+#: src/prefs_summary_column.c:79 src/summaryview.c:2881
 msgid "Attachment"
 msgstr "Adjunto"
 
@@ -9380,37 +9451,37 @@ msgstr "Excluyendo"
 msgid "Attach Warner"
 msgstr "Aviso de adjuntos"
 
-#: src/plugins/bogofilter/bogofilter.c:81
+#: src/plugins/bogofilter/bogofilter.c:82
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:107
+#: src/plugins/bogofilter/bogofilter.c:108
 #: src/plugins/bogofilter/bogofilter_gtk.c:258
 #: src/plugins/bogofilter/bogofilter_gtk.c:331
 #: src/plugins/bogofilter/bogofilter_gtk.c:408
 #: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
-#: src/plugins/spamassassin/spamassassin.c:117
+#: src/plugins/spamassassin/spamassassin.c:118
 #: src/plugins/spamassassin/spamassassin_gtk.c:459
 #: src/plugins/spamassassin/spamassassin_gtk.c:508
-#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:670
-#: src/prefs_matcher.c:705 src/prefs_matcher.c:1616 src/prefs_matcher.c:1623
-#: src/prefs_matcher.c:1631 src/prefs_matcher.c:1633 src/prefs_matcher.c:2518
-#: src/prefs_matcher.c:2522
+#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:682
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1657 src/prefs_matcher.c:1664
+#: src/prefs_matcher.c:1672 src/prefs_matcher.c:1674 src/prefs_matcher.c:2582
+#: src/prefs_matcher.c:2586
 msgid "Any"
 msgstr "Cualquiera"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:457
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: recuperando cuerpos..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:470
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrando mensajes..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:586
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9422,7 +9493,7 @@ msgstr ""
 "Utilice «/Marcar/Marcar como correo basura» y «/Marcar/Marcar como bueno» "
 "para entrenar a Bogofilter con unos pocos cientos de mensajes de ambos tipos."
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:593
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9431,21 +9502,21 @@ msgstr ""
 "El módulo Bogofilter no pudo filtrar un mensaje. La orden «%s %s %s» no se "
 "pudo ejecutar."
 
-#: src/plugins/bogofilter/bogofilter.c:739
+#: src/plugins/bogofilter/bogofilter.c:740
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: aprendiendo del mensaje..."
 
-#: src/plugins/bogofilter/bogofilter.c:752
-#: src/plugins/bogofilter/bogofilter.c:799 src/plugins/bsfilter/bsfilter.c:486
+#: src/plugins/bogofilter/bogofilter.c:753
+#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:486
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Aprendizaje fallido; «%s» devolvió el estado %d."
 
-#: src/plugins/bogofilter/bogofilter.c:767
+#: src/plugins/bogofilter/bogofilter.c:768
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: aprendiendo de los mensajes..."
 
-#: src/plugins/bogofilter/bogofilter.c:855
+#: src/plugins/bogofilter/bogofilter.c:856
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -9454,7 +9525,7 @@ msgstr ""
 "Aprendizaje fallido; «%s %s %s» devolvió el error:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:983
+#: src/plugins/bogofilter/bogofilter.c:984
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bogofilter. You will need Bogofilter installed "
@@ -9484,13 +9555,13 @@ msgstr ""
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/"
 "Bogofilter»"
 
-#: src/plugins/bogofilter/bogofilter.c:1016 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:642
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:643
 msgid "Spam detection"
 msgstr "Detección de correo basura"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:643
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
+#: src/plugins/spamassassin/spamassassin.c:644
 msgid "Spam learning"
 msgstr "Aprendizaje de correo basura"
 
@@ -9514,7 +9585,7 @@ msgstr "No se comprobarán los mensajes mayores de este tamaño"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1640
+#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1636
 msgid "KB"
 msgstr "kB"
 
@@ -9939,7 +10010,7 @@ msgstr ""
 "Clamd no responde al ping.\n"
 "¿Está ejecutándose clamd?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:121
+#: src/plugins/clamd/libclamd/clamd-plugin.c:122
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -9948,7 +10019,7 @@ msgstr ""
 "%s: No se puede abrir\n"
 "Se desactivará clamd"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:216
+#: src/plugins/clamd/libclamd/clamd-plugin.c:217
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -9957,30 +10028,30 @@ msgstr ""
 "%s: No se puede encontrar la información requerida\n"
 "Se desactivará clamd"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:250
+#: src/plugins/clamd/libclamd/clamd-plugin.c:251
 msgid "Could not create socket"
 msgstr "No se pudo crear el conector"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:441
+#: src/plugins/clamd/libclamd/clamd-plugin.c:442
 msgid ": File does not exist"
 msgstr ": El fichero no existe"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:454
+#: src/plugins/clamd/libclamd/clamd-plugin.c:455
 msgid ": Unable to open"
 msgstr ": No se puede abrir"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:473
-#: src/plugins/clamd/libclamd/clamd-plugin.c:478
-#: src/plugins/clamd/libclamd/clamd-plugin.c:492
+#: src/plugins/clamd/libclamd/clamd-plugin.c:474
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket write error"
 msgstr "Error de escritura en el conector"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:485
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Error leyendo"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:499
+#: src/plugins/clamd/libclamd/clamd-plugin.c:500
 msgid "Socket read error"
 msgstr "Error de lectura en el conector"
 
@@ -10005,64 +10076,64 @@ msgstr ""
 "\n"
 "No es realmente útil."
 
-#: src/plugins/fancy/fancy_prefs.c:146
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Display images"
 msgstr "Mostrar imágenes"
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Display embedded images"
 msgstr "Mostrar imágenes incrustadas"
 
-#: src/plugins/fancy/fancy_prefs.c:151
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute javascript"
 msgstr "Ejecutar JavaScript"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Execute embedded javascript"
 msgstr "Ejecutar JavaScript incrustado"
 
-#: src/plugins/fancy/fancy_prefs.c:156
+#: src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute Java applets"
 msgstr "Ejecutar applets de Java"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:158
 msgid "Execute embedded Java applets"
 msgstr "Ejecutar applets de Java incrustadas"
 
-#: src/plugins/fancy/fancy_prefs.c:161
+#: src/plugins/fancy/fancy_prefs.c:162
 msgid "Render objects using plugins"
 msgstr "Dibujar objetos que usan extensiones"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Render embedded objects using plugins"
 msgstr "Dibujar objetos incrustados que usan extensiones"
 
-#: src/plugins/fancy/fancy_prefs.c:169
+#: src/plugins/fancy/fancy_prefs.c:170
 msgid "Open in viewer (remote content is enabled)"
 msgstr "Abrir en el visor (contenidos remotos activados)"
 
-#: src/plugins/fancy/fancy_prefs.c:172
+#: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "No hacer nada (contenidos remotos desactivados)"
 
-#: src/plugins/fancy/fancy_prefs.c:209 src/prefs_account.c:3920
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3944
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/plugins/fancy/fancy_prefs.c:211
+#: src/plugins/fancy/fancy_prefs.c:212
 msgid "Use GNOME's proxy settings"
 msgstr "Utilizar la configuración del proxy de GNOME"
 
-#: src/plugins/fancy/fancy_prefs.c:219
+#: src/plugins/fancy/fancy_prefs.c:220
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: src/plugins/fancy/fancy_prefs.c:237
+#: src/plugins/fancy/fancy_prefs.c:238
 msgid "Remote resources"
 msgstr "Recursos remotos"
 
-#: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/fancy/fancy_prefs.c:239
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10076,121 +10147,121 @@ msgstr ""
 "objetos que requieren extensiones aún se puede activar para el contenido\n"
 "adjunto al correo."
 
-#: src/plugins/fancy/fancy_prefs.c:244
+#: src/plugins/fancy/fancy_prefs.c:245
 msgid "Enable loading of remote content"
 msgstr "Permitir la carga de contenidos remotos"
 
-#: src/plugins/fancy/fancy_prefs.c:276
+#: src/plugins/fancy/fancy_prefs.c:277
 msgid "When clicking on a link, by default"
 msgstr "Al pulsar en un enlace, de manera predeterminada"
 
-#: src/plugins/fancy/fancy_prefs.c:284
+#: src/plugins/fancy/fancy_prefs.c:285
 msgid "Open in external browser"
 msgstr "Abrir con el navegador externo"
 
-#: src/plugins/fancy/fancy_prefs.c:298
+#: src/plugins/fancy/fancy_prefs.c:299
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "Las CSS en este fichero se aplicarán a todas las partes HTML"
 
-#: src/plugins/fancy/fancy_prefs.c:308
+#: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
 #: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1574 src/prefs_account.c:1663 src/prefs_account.c:2205
-#: src/prefs_customheader.c:234
+#: src/prefs_account.c:1570 src/prefs_account.c:1659 src/prefs_account.c:2210
+#: src/prefs_customheader.c:235
 msgid "Bro_wse"
 msgstr "E_xplorar"
 
-#: src/plugins/fancy/fancy_prefs.c:350
+#: src/plugins/fancy/fancy_prefs.c:351
 msgid "Select stylesheet"
 msgstr "Seleccionar estilos"
 
-#: src/plugins/fancy/fancy_viewer.c:416
+#: src/plugins/fancy/fancy_viewer.c:409
 msgid "Remote content loading is disabled."
 msgstr "Carga de contenidos remotos desactivada."
 
-#: src/plugins/fancy/fancy_viewer.c:495
+#: src/plugins/fancy/fancy_viewer.c:488
 msgid "Load images"
 msgstr "Cargar imágenes"
 
-#: src/plugins/fancy/fancy_viewer.c:497
+#: src/plugins/fancy/fancy_viewer.c:490
 msgid "Enable remote content"
 msgstr "Activar contenidos remotos"
 
-#: src/plugins/fancy/fancy_viewer.c:499
+#: src/plugins/fancy/fancy_viewer.c:492
 msgid "Enable Javascript"
 msgstr "Activar Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:501
+#: src/plugins/fancy/fancy_viewer.c:494
 msgid "Enable Plugins"
 msgstr "Activar módulos"
 
-#: src/plugins/fancy/fancy_viewer.c:503
+#: src/plugins/fancy/fancy_viewer.c:496
 msgid "Enable Java"
 msgstr "Activar Java"
 
-#: src/plugins/fancy/fancy_viewer.c:505
+#: src/plugins/fancy/fancy_viewer.c:498
 msgid "Open links with external browser"
 msgstr "Abrir enlaces con el navegador externo"
 
-#: src/plugins/fancy/fancy_viewer.c:687
+#: src/plugins/fancy/fancy_viewer.c:672
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocurrió un error: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:728
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s es un canal mal formado o no soportado"
 
-#: src/plugins/fancy/fancy_viewer.c:754
+#: src/plugins/fancy/fancy_viewer.c:739
 msgid "Search the Web"
 msgstr "Buscar en la web"
 
-#: src/plugins/fancy/fancy_viewer.c:766
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open in Viewer"
 msgstr "Abrir en el visor"
 
-#: src/plugins/fancy/fancy_viewer.c:768
+#: src/plugins/fancy/fancy_viewer.c:753
 msgid "Open in Viewer (enable remote content)"
 msgstr "Abrir en el visor (activar contenidos remotos)"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:762
 msgid "Open in Browser"
 msgstr "Abrir con el navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Open Image"
 msgstr "Abrir imagen"
 
-#: src/plugins/fancy/fancy_viewer.c:796
+#: src/plugins/fancy/fancy_viewer.c:781
 msgid "Copy Link"
 msgstr "Copiar enlace"
 
-#: src/plugins/fancy/fancy_viewer.c:800
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Download Link"
 msgstr "Descargar enlace"
 
-#: src/plugins/fancy/fancy_viewer.c:811
+#: src/plugins/fancy/fancy_viewer.c:796
 msgid "Save Image As"
 msgstr "Guardar imagen como"
 
-#: src/plugins/fancy/fancy_viewer.c:821
+#: src/plugins/fancy/fancy_viewer.c:806
 msgid "Copy Image"
 msgstr "Copiar imagen"
 
-#: src/plugins/fancy/fancy_viewer.c:839
+#: src/plugins/fancy/fancy_viewer.c:846
 msgid "Import feed"
 msgstr "Importar canal"
 
-#: src/plugins/fancy/fancy_viewer.c:1118
+#: src/plugins/fancy/fancy_viewer.c:1128
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1146
+#: src/plugins/fancy/fancy_viewer.c:1156
 msgid "Fancy HTML Viewer"
 msgstr "Visor HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1151
+#: src/plugins/fancy/fancy_viewer.c:1161
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10393,8 +10464,8 @@ msgid ""
 "GData plugin: Interactive authorization still running, no additional session "
 "started\n"
 msgstr ""
-"Módulo GData: la autorización interactiva todavía se está ejecutando, "
-"no se inició una nueva sesión\n"
+"Módulo GData: la autorización interactiva todavía se está ejecutando, no se "
+"inició una nueva sesión\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:511
 #, c-format
@@ -10418,12 +10489,12 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Módulo GData: Tratando de renovar la autorización\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1936
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1941
 msgid "Authentication"
 msgstr "Autenticación"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
 msgid "Username:"
 msgstr "Usuario:"
 
@@ -10600,8 +10671,8 @@ msgid "Cache refresh interval"
 msgstr "Intervalo de refresco de la caché"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1619
-#: src/prefs_account.c:1776 src/prefs_matcher.c:335 src/prefs_receive.c:178
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1615
+#: src/prefs_account.c:1772 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "horas"
 
@@ -10805,7 +10876,7 @@ msgstr "Método de autenticación no disponible"
 msgid "sending error on Sieve session: %s\n"
 msgstr "enviando error en la sesión de Sieve: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5763
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5810
 msgid "_Filter"
 msgstr "_Filtrar"
 
@@ -10820,7 +10891,7 @@ msgstr "Re_vertir"
 
 #: src/plugins/managesieve/sieve_editor.c:296
 #: src/plugins/managesieve/sieve_editor.c:724
-#: src/plugins/managesieve/sieve_manager.c:182
+#: src/plugins/managesieve/sieve_manager.c:183
 msgid "Unable to get script contents"
 msgstr "No se puede obtener el contenido del script"
 
@@ -10862,57 +10933,57 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve Filtro%s"
 
 #: src/plugins/managesieve/sieve_editor.c:744
-#: src/plugins/pdf_viewer/poppler_viewer.c:1304
+#: src/plugins/pdf_viewer/poppler_viewer.c:1315
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: src/plugins/managesieve/sieve_manager.c:159
-#: src/plugins/managesieve/sieve_manager.c:245
+#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:246
 msgid "Add Sieve script"
 msgstr "Añadir script Sieve"
 
-#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:161
 msgid "Enter name for a new Sieve filter script."
 msgstr "Introduzca un nombre para el nuevo script Sieve."
 
-#: src/plugins/managesieve/sieve_manager.c:246
+#: src/plugins/managesieve/sieve_manager.c:247
 msgid "Enter new name for the script."
 msgstr "Introduzca un nombre para el script."
 
-#: src/plugins/managesieve/sieve_manager.c:327
+#: src/plugins/managesieve/sieve_manager.c:328
 #, c-format
 msgid "Do you really want to delete the filter '%s'?"
 msgstr "¿Realmente desea eliminar el filtro «%s»?"
 
-#: src/plugins/managesieve/sieve_manager.c:328
+#: src/plugins/managesieve/sieve_manager.c:329
 msgid "Delete filter"
 msgstr "Eliminar filtro"
 
-#: src/plugins/managesieve/sieve_manager.c:482
+#: src/plugins/managesieve/sieve_manager.c:483
 msgid "Active"
 msgstr "Activo"
 
-#: src/plugins/managesieve/sieve_manager.c:493
+#: src/plugins/managesieve/sieve_manager.c:494
 msgid "An account can only have one active script at a time."
 msgstr "Una cuenta sólo puede tener un script activo a la vez."
 
-#: src/plugins/managesieve/sieve_manager.c:580
+#: src/plugins/managesieve/sieve_manager.c:581
 msgid "Unable to connect"
 msgstr "No se ha podido conectar"
 
-#: src/plugins/managesieve/sieve_manager.c:627
+#: src/plugins/managesieve/sieve_manager.c:628
 msgid "Listing scripts..."
 msgstr "Listando scripts..."
 
-#: src/plugins/managesieve/sieve_manager.c:630
+#: src/plugins/managesieve/sieve_manager.c:631
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/plugins/managesieve/sieve_manager.c:662
+#: src/plugins/managesieve/sieve_manager.c:663
 msgid "Manage Sieve Filters"
 msgstr "Gestionar filtros Sieve"
 
-#: src/plugins/managesieve/sieve_manager.c:804
+#: src/plugins/managesieve/sieve_manager.c:805
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "Para usar el Sieve, habilitarlo en las preferencias de la cuenta."
 
@@ -10935,7 +11006,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Activar Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1194
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1190
 msgid "Server information"
 msgstr "Información del servidor"
 
@@ -10987,28 +11058,28 @@ msgstr "Especificar autenticación"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1389
-#: src/prefs_account.c:1982
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1385
+#: src/prefs_account.c:1987
 msgid "User ID"
 msgstr "Usuario"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1395
-#: src/prefs_account.c:2005 src/prefs_account.c:2733 src/prefs_account.c:2761
-#: src/prefs_account.c:2958 src/prefs_proxy.c:134 src/wizard.c:1215
-#: src/wizard.c:1635
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1391
+#: src/prefs_account.c:2010 src/prefs_account.c:2738 src/prefs_account.c:2766
+#: src/prefs_account.c:2963 src/prefs_proxy.c:134 src/wizard.c:1216
+#: src/wizard.c:1636
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1702
-#: src/prefs_account.c:1954
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1698
+#: src/prefs_account.c:1959
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1712
-#: src/prefs_account.c:1963 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1708
+#: src/prefs_account.c:1968 src/prefs_send.c:265 src/prefs_send.c:336
 #: src/prefs_themes.c:1114
 msgid "Automatic"
 msgstr "Automático"
@@ -11025,20 +11096,20 @@ msgstr "No se especificó el servidor Sieve."
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:106 src/plugins/newmail/newmail.c:149
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "Registro de correo nuevo"
 
-#: src/plugins/newmail/newmail.c:111
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Falló el registro de la función de registro de correo nuevo"
 
-#: src/plugins/newmail/newmail.c:128
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "No se puede abrir el fichero de registro %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:141
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11055,7 +11126,7 @@ msgstr ""
 "\n"
 "El registro actual esta en %s"
 
-#: src/plugins/newmail/newmail.c:175
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Fichero de registro"
 
@@ -11260,8 +11331,8 @@ msgstr "Panel"
 msgid "Popup"
 msgstr "Emergente"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:263
-#: src/prefs_receive.c:153
+#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:264
+#: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Orden"
 
@@ -11328,13 +11399,13 @@ msgid "Show banner"
 msgstr "Mostrar panel"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:229
+#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nunca"
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:227
-#: src/prefs_summaries.c:493 src/prefs_summaries.c:503
+#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
+#: src/prefs_summaries.c:502 src/prefs_summaries.c:555
 msgid "Always"
 msgstr "Siempre"
 
@@ -11429,14 +11500,6 @@ msgstr "Activar emergente"
 msgid "Popup timeout"
 msgstr "Tiempo límite del emergente"
 
-#: src/plugins/notification/notification_prefs.c:1072
-#: src/plugins/notification/notification_prefs.c:1367
-#: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_other.c:570
-#: src/prefs_receive.c:201 src/prefs_summaries.c:542
-msgid "seconds"
-msgstr "segundos"
-
 #: src/plugins/notification/notification_prefs.c:1101
 msgid "Make popup sticky"
 msgstr "Hacer el emergente persistente"
@@ -11470,7 +11533,7 @@ msgstr "Selecciona orden"
 msgid "Enable command"
 msgstr "Activar orden"
 
-#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:266
+#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "Orden a ejecutar"
 
@@ -11619,128 +11682,128 @@ msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "recibido %d artículo de canal RSS nuevo"
 msgstr[1] "recibidos %d artículos de canal RSS nuevos"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Title:"
 msgstr "Título:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Author:"
 msgstr "Autor:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:707
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Creator:"
 msgstr "Creador:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:708
+#: src/plugins/pdf_viewer/poppler_viewer.c:709
 msgid "Producer:"
 msgstr "Productor:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:711
+#: src/plugins/pdf_viewer/poppler_viewer.c:712
 msgid "Created:"
 msgstr "Creado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:715
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:718
+#: src/plugins/pdf_viewer/poppler_viewer.c:719
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:720
-#: src/plugins/pdf_viewer/poppler_viewer.c:723
+#: src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/plugins/pdf_viewer/poppler_viewer.c:724
 msgid "Optimized:"
 msgstr "Optimizado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1206
+#: src/plugins/pdf_viewer/poppler_viewer.c:1217
 msgid "PDF properties"
 msgstr "Propiedades del PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1355
+#: src/plugins/pdf_viewer/poppler_viewer.c:1366
 msgid "Enter password"
 msgstr "Introducir contraseña"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1356
+#: src/plugins/pdf_viewer/poppler_viewer.c:1367
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr "Este documento está bloqueado y necesita una contraseña para abrirlo."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1371
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 #, c-format
 msgid "%s Document"
 msgstr "%s documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1377
+#: src/plugins/pdf_viewer/poppler_viewer.c:1388
 #, c-format
 msgid "of %d"
 msgstr "de %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1393
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 msgid "PDF rendering failed for an unknown reason."
 msgstr "La presentación del PDF falló por razones desconocidas."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1758
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1776
+#: src/plugins/pdf_viewer/poppler_viewer.c:1993
 msgid "Document Index"
 msgstr "Índice del documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1940
+#: src/plugins/pdf_viewer/poppler_viewer.c:1958
 msgid "First Page"
 msgstr "Primera página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1943
+#: src/plugins/pdf_viewer/poppler_viewer.c:1961
 msgid "Previous Page"
 msgstr "Página anterior"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1946
+#: src/plugins/pdf_viewer/poppler_viewer.c:1964
 msgid "Next Page"
 msgstr "Página siguiente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1949
+#: src/plugins/pdf_viewer/poppler_viewer.c:1967
 msgid "Last Page"
 msgstr "Última página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1952
+#: src/plugins/pdf_viewer/poppler_viewer.c:1970
 msgid "Zoom In"
 msgstr "Aumentar"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1954
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Zoom Out"
 msgstr "Disminuir"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1957
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Fit Page"
 msgstr "Ajustar página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1960
+#: src/plugins/pdf_viewer/poppler_viewer.c:1978
 msgid "Fit Page Width"
 msgstr "Ajustar ancho"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1963
+#: src/plugins/pdf_viewer/poppler_viewer.c:1981
 msgid "Rotate Left"
 msgstr "Rotar izquierda"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1966
+#: src/plugins/pdf_viewer/poppler_viewer.c:1984
 msgid "Rotate Right"
 msgstr "Rotar derecha"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1969
+#: src/plugins/pdf_viewer/poppler_viewer.c:1987
 msgid "Print Document"
 msgstr "Imprimir documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1990
 msgid "Document Info"
 msgstr "Información del documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1977
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Page Number"
 msgstr "Número de página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1979
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Zoom Factor"
 msgstr "Factor de aumento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2089
+#: src/plugins/pdf_viewer/poppler_viewer.c:2108
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11753,13 +11816,13 @@ msgstr ""
 "\n"
 "Cualquier comentario será bienvenido: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2095
-#: src/plugins/pdf_viewer/poppler_viewer.c:2103
-#: src/plugins/pdf_viewer/poppler_viewer.c:2123
+#: src/plugins/pdf_viewer/poppler_viewer.c:2114
+#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2142
 msgid "PDF Viewer"
 msgstr "Visor PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2099
+#: src/plugins/pdf_viewer/poppler_viewer.c:2118
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11946,8 +12009,8 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Estableciéndolo a '0' guarda la contraseña durante toda la sesión"
 
 #: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:2071
-#: src/prefs_receive.c:188
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1779
+#: src/prefs_account.c:2076 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minutos"
 
@@ -12008,7 +12071,7 @@ msgid "GPG"
 msgstr "GPG"
 
 #: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:917
+#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:918
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -12022,17 +12085,17 @@ msgstr "No hay coincidencia exacta para «%s», por favor seleccione la clave."
 msgid "Collecting info for '%s' ... %c"
 msgstr "Recogiendo información para «%s» ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:146
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:149
-#: src/plugins/pgpcore/sgpgme.c:165
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/sgpgme.c:166
 msgid "Marginal"
 msgstr "Marginal"
 
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:153
-#: src/plugins/pgpcore/sgpgme.c:169
+#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
+#: src/plugins/pgpcore/sgpgme.c:170
 msgid "Ultimate"
 msgstr "Absoluta"
 
@@ -12088,181 +12151,181 @@ msgstr ""
 "\n"
 "¿Es suficientemente fiable como para usarla de todas maneras?"
 
-#: src/plugins/pgpcore/sgpgme.c:83 src/privacy.c:249 src/privacy.c:253
+#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
 #: src/privacy.c:270 src/privacy.c:274
 msgid "No signature found"
 msgstr "No se encontró firma"
 
-#: src/plugins/pgpcore/sgpgme.c:163
+#: src/plugins/pgpcore/sgpgme.c:164
 msgid "Untrusted"
 msgstr "No fiable"
 
-#: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
+#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "La firma no se puede comprobar - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:241 src/plugins/pgpcore/sgpgme.c:245
+#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
 msgid "The signature has not been checked."
 msgstr "La firma no ha sido comprobada."
 
-#: src/plugins/pgpcore/sgpgme.c:251
+#: src/plugins/pgpcore/sgpgme.c:252
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 "Núcleo PGP: no se puede obtener la clave - gpg-agent no está ejecutándose."
 
-#: src/plugins/pgpcore/sgpgme.c:269
+#: src/plugins/pgpcore/sgpgme.c:270
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Firma válida de \"%s\" [ultimate]"
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:273
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Firma válida de \"%s\" [full]"
 
-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:276
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Firma válida de \"%s\" [marginal]"
 
-#: src/plugins/pgpcore/sgpgme.c:282
+#: src/plugins/pgpcore/sgpgme.c:283
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma válida de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:284 src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr "La clave 0x%s no está disponible para verificar esta firma"
 
-#: src/plugins/pgpcore/sgpgme.c:290
+#: src/plugins/pgpcore/sgpgme.c:291
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:293
+#: src/plugins/pgpcore/sgpgme.c:294
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Firma válida de \"%s\", pero la clave ha expirado."
 
-#: src/plugins/pgpcore/sgpgme.c:296
+#: src/plugins/pgpcore/sgpgme.c:297
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Firma válida de \"%s\", pero la clave ha sido revocada."
 
-#: src/plugins/pgpcore/sgpgme.c:299
+#: src/plugins/pgpcore/sgpgme.c:300
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Firma inválida de \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:306
+#: src/plugins/pgpcore/sgpgme.c:307
 msgid "The signature has not been checked"
 msgstr "La firma no ha sido comprobada"
 
-#: src/plugins/pgpcore/sgpgme.c:325
+#: src/plugins/pgpcore/sgpgme.c:326
 msgid "Error checking signature: no status\n"
 msgstr "Error verificando la firma digital: no hay estado\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:344
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Error verificando la firma digital: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:361
+#: src/plugins/pgpcore/sgpgme.c:362
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Firma digital realizada el %s usando %s ID de clave %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:367
+#: src/plugins/pgpcore/sgpgme.c:368
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Firma válida del UID «%s» (Validez: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:372
+#: src/plugins/pgpcore/sgpgme.c:373
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "UID de clave caducado «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:377
+#: src/plugins/pgpcore/sgpgme.c:378
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Firma caducada del UID «%s» (Validez: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:382
+#: src/plugins/pgpcore/sgpgme.c:383
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "UID de clave revocado «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:387
+#: src/plugins/pgpcore/sgpgme.c:388
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Firma INVÁLIDA de «%s»\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:401
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "UID «%s» (Validez: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:402
+#: src/plugins/pgpcore/sgpgme.c:403
 msgid "Revoked"
 msgstr "Revocado"
 
-#: src/plugins/pgpcore/sgpgme.c:407
+#: src/plugins/pgpcore/sgpgme.c:408
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Confianza del propietario: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:408
+#: src/plugins/pgpcore/sgpgme.c:409
 msgid "No key!"
 msgstr "¡No hay clave!"
 
-#: src/plugins/pgpcore/sgpgme.c:410
+#: src/plugins/pgpcore/sgpgme.c:411
 msgid "Primary key fingerprint:"
 msgstr "Huella de clave primaria:"
 
-#: src/plugins/pgpcore/sgpgme.c:428
+#: src/plugins/pgpcore/sgpgme.c:429
 #, 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:434
+#: src/plugins/pgpcore/sgpgme.c:435
 #, 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:468
+#: src/plugins/pgpcore/sgpgme.c:469
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "No se puede obtener datos del mensaje, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:484
+#: src/plugins/pgpcore/sgpgme.c:485
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "No se puede inicializar datos, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:661
+#: src/plugins/pgpcore/sgpgme.c:662
 msgid "Secret key specification is ambiguous"
 msgstr "La especificación de clave secreta es ambigua"
 
-#: src/plugins/pgpcore/sgpgme.c:671
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Clave secreta no encontrada (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:684
+#: src/plugins/pgpcore/sgpgme.c:685
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Error estableciendo clave secreta: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:777
+#: src/plugins/pgpcore/sgpgme.c:778
 #, 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:783
+#: src/plugins/pgpcore/sgpgme.c:784
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12271,12 +12334,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:791
+#: src/plugins/pgpcore/sgpgme.c:792
 #, 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:807
+#: src/plugins/pgpcore/sgpgme.c:808
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12284,7 +12347,7 @@ msgstr ""
 "GnuPG no esta adecuadamente instalado o necesita actualizarse.\n"
 "Soporte de OpenPGP deshabilitado."
 
-#: src/plugins/pgpcore/sgpgme.c:884
+#: src/plugins/pgpcore/sgpgme.c:885
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12292,11 +12355,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:889
+#: src/plugins/pgpcore/sgpgme.c:890
 msgid "No PGP key found"
 msgstr "No se encontró ninguna clave PGP"
 
-#: src/plugins/pgpcore/sgpgme.c:890
+#: src/plugins/pgpcore/sgpgme.c:891
 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"
@@ -12306,12 +12369,12 @@ msgstr ""
 "capaz de firmar correos o recibir correos cifrados.\n"
 "¿Quiere crear un nuevo par de claves ahora?"
 
-#: src/plugins/pgpcore/sgpgme.c:979 src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:980 src/plugins/pgpcore/sgpgme.c:1002
 #, 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:989
+#: src/plugins/pgpcore/sgpgme.c:990
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12319,11 +12382,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:1007
+#: src/plugins/pgpcore/sgpgme.c:1008
 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:1011
+#: src/plugins/pgpcore/sgpgme.c:1012
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12336,62 +12399,62 @@ msgstr ""
 "\n"
 "¿Desea exportarla a un servidor de claves?"
 
-#: src/plugins/pgpcore/sgpgme.c:1015
+#: src/plugins/pgpcore/sgpgme.c:1016
 msgid "Key generated"
 msgstr "Clave generada"
 
-#: src/plugins/pgpcore/sgpgme.c:1091
+#: src/plugins/pgpcore/sgpgme.c:1092
 msgid "Key exported."
 msgstr "Clave exportada."
 
-#: src/plugins/pgpcore/sgpgme.c:1093
+#: src/plugins/pgpcore/sgpgme.c:1094
 msgid "Couldn't export key."
 msgstr "No se pudo exportar la clave."
 
-#: src/plugins/pgpinline/pgpinline.c:155
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "Parte incorrecta"
 
-#: src/plugins/pgpinline/pgpinline.c:159
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "No es una parte de texto"
 
-#: src/plugins/pgpinline/pgpinline.c:170 src/plugins/pgpinline/pgpinline.c:322
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "No se puede obtener el texto."
 
-#: src/plugins/pgpinline/pgpinline.c:188
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "No se puede convertir el texto a un conjunto de caracteres válido."
 
-#: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
-#: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
-#: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
-#: src/plugins/pgpmime/pgpmime.c:511 src/plugins/pgpmime/pgpmime.c:654
-#: src/plugins/smime/smime.c:417
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
+#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
+#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
+#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:655
+#: src/plugins/smime/smime.c:418
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "No se pudo inicializar el contexto GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:315
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "No se puede procesar la parte mime."
 
-#: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "No se puede abrir el fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:362 src/plugins/pgpinline/pgpinline.c:371
-#: src/plugins/pgpinline/pgpinline.c:380 src/plugins/pgpinline/pgpinline.c:388
-#: src/plugins/pgpinline/pgpinline.c:398 src/plugins/pgpinline/pgpinline.c:407
-#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "No se puede escribir al fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:376 src/plugins/pgpinline/pgpinline.c:377
-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12399,53 +12462,53 @@ msgstr ""
 "\n"
 "--- Inicio de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:394 src/plugins/pgpinline/pgpinline.c:395
-#: src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Fin de los datos cifrados PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "No se puede cerrar el fichero descifrado %s"
 
-#: src/plugins/pgpinline/pgpinline.c:427
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "No se puede escanear el fichero descifrado."
 
-#: src/plugins/pgpinline/pgpinline.c:435
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "No se pueden escanear las partes del fichero descifrado ."
 
-#: src/plugins/pgpinline/pgpinline.c:492 src/plugins/pgpinline/pgpinline.c:684
+#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
 msgid "Malformed message"
 msgstr "Mensaje mal formado"
 
-#: src/plugins/pgpinline/pgpinline.c:503 src/plugins/pgpinline/pgpinline.c:695
-#: src/plugins/pgpmime/pgpmime.c:694
+#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
+#: src/plugins/pgpmime/pgpmime.c:695
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "No se puede crear el fichero temporal, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:538
+#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Falló la firma de los datos, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:565
+#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "La firma de los datos falló debido a un firmante inválido: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:574
+#: src/plugins/pgpinline/pgpinline.c:570 src/plugins/pgpmime/pgpmime.c:575
 msgid "Data signing failed, no results."
 msgstr "Falló la firma de los datos, no hay resultados."
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:585
+#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
 msgid "Data signing failed, no contents."
 msgstr "Falló la firma de los datos, no hay contenido."
 
-#: src/plugins/pgpinline/pgpinline.c:623
+#: src/plugins/pgpinline/pgpinline.c:624
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -12453,17 +12516,17 @@ msgstr ""
 "Por favor, tenga en cuenta que los adjuntos no serán cifrados por el sistema "
 "PGP/Inline, ni tampoco las cabeceras de correo, como el Asunto."
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:664
+#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:665
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "No se pudo añadir la clave GPG %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:722
+#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:723
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falló el cifrado, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:795
+#: src/plugins/pgpinline/pgpinline.c:796
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -12497,28 +12560,28 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:203
+#: src/plugins/pgpmime/pgpmime.c:204
 msgid "Signature boundary not found."
 msgstr "No se encontró el delimitador de la firma."
 
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:498
+#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:499
 msgid "Couldn't parse decrypted file."
 msgstr "No se puede interpretar el fichero descifrado."
 
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:505
+#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:506
 msgid "Couldn't parse decrypted file parts."
 msgstr "No se pueden interpretar las partes del fichero."
 
-#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
+#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "No se puede crear el fichero temporal: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:598
+#: src/plugins/pgpmime/pgpmime.c:599
 msgid "OpenPGP digital signature"
 msgstr "Firma digital OpenPGP"
 
-#: src/plugins/pgpmime/pgpmime.c:620
+#: src/plugins/pgpmime/pgpmime.c:621
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -12526,7 +12589,7 @@ msgstr ""
 "Por favor, tenga en cuenta que las cabeceras de correo, como el Asunto, no "
 "serán cifradas por el sistema PGP/MIME."
 
-#: src/plugins/pgpmime/pgpmime.c:794
+#: src/plugins/pgpmime/pgpmime.c:795
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12558,36 +12621,36 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/python/python_plugin.c:358
-#: src/plugins/python/python_plugin.c:502
+#: src/plugins/python/python_plugin.c:359
+#: src/plugins/python/python_plugin.c:503
 msgid "Python scripts"
 msgstr "Scripts Python"
 
-#: src/plugins/python/python_plugin.c:497
+#: src/plugins/python/python_plugin.c:498
 msgid "Show Python console..."
 msgstr "Mostrar la consola de Python..."
 
-#: src/plugins/python/python_plugin.c:503
+#: src/plugins/python/python_plugin.c:504
 #: src/plugins/rssyl/rssyl_feed_props.c:471
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2722
-#: src/prefs_account.c:2750 src/prefs_account.c:3192 src/wizard.c:1205
-#: src/wizard.c:1625
+#: src/plugins/python/python_plugin.c:506 src/prefs_account.c:2727
+#: src/prefs_account.c:2755 src/prefs_account.c:3192 src/wizard.c:1206
+#: src/wizard.c:1626
 msgid "Browse"
 msgstr "Explorar"
 
-#: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:735
+#: src/plugins/python/python_plugin.c:652
+#: src/plugins/python/python_plugin.c:736
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:657
+#: src/plugins/python/python_plugin.c:658
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Error al registrar el «compose create hook» en el módulo Python"
 
-#: src/plugins/python/python_plugin.c:740
+#: src/plugins/python/python_plugin.c:741
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12676,7 +12739,7 @@ msgstr ""
 "\n"
 "Comentarios para <berndth at gmx.de> serán bienvenidos."
 
-#: src/plugins/python/python_plugin.c:791
+#: src/plugins/python/python_plugin.c:792
 msgid "Python integration"
 msgstr "Integración con Python"
 
@@ -12689,24 +12752,24 @@ msgstr ""
 "No se pudo leer el contenido del fichero antiguo «feeds.xml»:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:110
+#: src/plugins/rssyl/opml_export.c:111
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr "RSSyl: error escribiendo «%s» a la lista de exportación de canales.\n"
 
-#: src/plugins/rssyl/opml_export.c:131
+#: src/plugins/rssyl/opml_export.c:132
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: no se pudo borrar el antiguo fichero OPML: «%s»: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:141
+#: src/plugins/rssyl/opml_export.c:142
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 "RSSyl: no se pudo abrir el fichero «%s» para exportar la lista de canales: "
 "%s\n"
 
-#: src/plugins/rssyl/opml_export.c:182
+#: src/plugins/rssyl/opml_export.c:183
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: error escribiendo el fichero de exportación de canales.\n"
 
@@ -12741,7 +12804,7 @@ msgstr ""
 msgid "RSS feed"
 msgstr "Canal RSS"
 
-#: src/plugins/rssyl/rssyl_add_item.c:296
+#: src/plugins/rssyl/rssyl_add_item.c:297
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(vacío)"
@@ -12750,36 +12813,36 @@ msgstr "(vacío)"
 msgid "Refresh all feeds"
 msgstr "Refrescar todos los canales"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:65
+#: src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "Suscribir canal"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Introduzca la URL del canal de información al que suscribirse:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:98
+#: src/plugins/rssyl/rssyl_cb_menu.c:99
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "No se puede usar «%c» en el nombre de la carpeta."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:251 src/plugins/rssyl/rssyl_cb_menu.c:298
+#: src/plugins/rssyl/rssyl_cb_menu.c:248 src/plugins/rssyl/rssyl_cb_menu.c:295
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail necesita acceso a la red para actualizar el canal."
 msgstr[1] "Claws Mail necesita acceso a la red para actualizar los canales."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:324
+#: src/plugins/rssyl/rssyl_cb_menu.c:321
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "¿Quiere realmente eliminar el árbol de canales «%s»?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:325
+#: src/plugins/rssyl/rssyl_cb_menu.c:322
 msgid "Remove feed tree"
 msgstr "Eliminar árbol de canales"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
 msgid "Select an OPML file"
 msgstr "Seleccionar un fichero OPML"
 
@@ -12896,7 +12959,7 @@ msgstr "Recuperar los comentarios de elementos con una antiguedad inferior a"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1609 src/prefs_folder_item.c:567 src/prefs_matcher.c:336
+#: src/prefs_account.c:1605 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "días"
 
@@ -13046,17 +13109,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Actualizando comentarios para «%s»..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1621
 msgid "401 (Authorisation required)"
 msgstr "401 (Se requiere autorización)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:110
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "403 (Unauthorised)"
 msgstr "403 (No autorizado)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "404 (Not found)"
 msgstr "404 (No encontrado)"
 
@@ -13102,7 +13165,7 @@ msgstr "RSSyl: Posible canal inválido sin título en «%s»\n"
 msgid "Updating feed '%s'..."
 msgstr "Actualizando canal «%s»..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:268
+#: src/plugins/rssyl/rssyl_update_feed.c:270
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13115,11 +13178,11 @@ msgstr ""
 "\n"
 "Por favor contacte con los desarrolladores, esto no debería suceder."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:352
+#: src/plugins/rssyl/rssyl_update_feed.c:356
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail necesita acceso a la red para actualizar los canales."
 
-#: src/plugins/rssyl/rssyl_update_format.c:127
+#: src/plugins/rssyl/rssyl_update_format.c:128
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13164,24 +13227,24 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:425
+#: src/plugins/smime/smime.c:426
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "No se pudo establecer el protocolo GPG, %s"
 
-#: src/plugins/smime/smime.c:453
+#: src/plugins/smime/smime.c:454
 msgid "Couldn't open temporary file"
 msgstr "No se pudo abrir el fichero temporal"
 
-#: src/plugins/smime/smime.c:464 src/plugins/smime/smime.c:479
+#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
 msgid "Couldn't write to temporary file"
 msgstr "No se pudo escribir en el fichero temporal"
 
-#: src/plugins/smime/smime.c:490
+#: src/plugins/smime/smime.c:491
 msgid "Couldn't close temporary file"
 msgstr "No se pudo cerrar el fichero temporal"
 
-#: src/plugins/smime/smime.c:712
+#: src/plugins/smime/smime.c:713
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -13189,21 +13252,21 @@ msgstr ""
 "Por favor, tenga en cuenta que las cabeceras de correo, como el Asunto, no "
 "serán cifradas por el sistema S/MIME."
 
-#: src/plugins/spam_report/spam_report.c:301
+#: src/plugins/spam_report/spam_report.c:302
 msgid "Reporting spam..."
 msgstr "Informando de correo basura..."
 
-#: src/plugins/spam_report/spam_report.c:336
+#: src/plugins/spam_report/spam_report.c:337
 msgid "Report spam online..."
 msgstr "Informar de correo basura en línea..."
 
-#: src/plugins/spam_report/spam_report.c:347
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:348
+#: src/plugins/spam_report/spam_report.c:386
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "Informe de correo basura"
 
-#: src/plugins/spam_report/spam_report.c:390
+#: src/plugins/spam_report/spam_report.c:391
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13219,7 +13282,7 @@ msgstr ""
 " * spamcop.net\n"
 " * sistema de nominación de lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:415
+#: src/plugins/spam_report/spam_report.c:416
 msgid "Spam reporting"
 msgstr "Informe de correo basura"
 
@@ -13231,32 +13294,32 @@ msgstr "Habilitado"
 msgid "Forward to:"
 msgstr "Reenviar a:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1573
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/plugins/spamassassin/spamassassin.c:77
+#: src/plugins/spamassassin/spamassassin.c:78
 #: src/plugins/spamassassin/spamassassin_gtk.c:671
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:181
+#: src/plugins/spamassassin/spamassassin.c:182
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "El módulo SpamAssassin no pudo conectar con spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:197
+#: src/plugins/spamassassin/spamassassin.c:198
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Falló el filtrado con el módulo SpamAssassin.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:223
+#: src/plugins/spamassassin/spamassassin.c:224
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "El módulo SpamAssassin esta deshabilitado por sus preferencias.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:228
+#: src/plugins/spamassassin/spamassassin.c:229
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrando mensaje..."
 
-#: src/plugins/spamassassin/spamassassin.c:357
+#: src/plugins/spamassassin/spamassassin.c:358
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
@@ -13266,7 +13329,7 @@ msgstr ""
 "error es que el demonio spamd no está disponible. Por favor, asegúrese de "
 "que spamd está ejecutándose y accesible."
 
-#: src/plugins/spamassassin/spamassassin.c:415
+#: src/plugins/spamassassin/spamassassin.c:416
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13274,17 +13337,17 @@ msgstr ""
 "Claws Mail necesita acceso a la red para enviar este correo al programa de "
 "aprendizaje remoto."
 
-#: src/plugins/spamassassin/spamassassin.c:560
+#: src/plugins/spamassassin/spamassassin.c:561
 msgid "Failed to get username"
 msgstr "Fallo al obtener en nombre de usuario"
 
-#: src/plugins/spamassassin/spamassassin.c:577
+#: src/plugins/spamassassin/spamassassin.c:578
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "El módulo SpamAssassin esta cargado pero deshabilitado por sus "
 "preferencias.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:611
+#: src/plugins/spamassassin/spamassassin.c:612
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
@@ -13376,7 +13439,7 @@ msgstr ""
 "Tiempo máximo permitido para la comprobación. Si la comprobación lleva más "
 "tiempo será cancelada."
 
-#: src/plugins/tnef_parse/tnef_parse.c:73
+#: src/plugins/tnef_parse/tnef_parse.c:74
 #, c-format
 msgid ""
 "\n"
@@ -13389,29 +13452,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:130
-#: src/plugins/tnef_parse/tnef_parse.c:137
+#: src/plugins/tnef_parse/tnef_parse.c:131
+#: src/plugins/tnef_parse/tnef_parse.c:138
 msgid "Failed to write the part data."
 msgstr "Falló la escritura de la parte de datos."
 
-#: src/plugins/tnef_parse/tnef_parse.c:182
+#: src/plugins/tnef_parse/tnef_parse.c:183
 msgid "Failed to parse VCalendar data."
 msgstr "Falló la interpretación de los datos VCalendar."
 
-#: src/plugins/tnef_parse/tnef_parse.c:221
+#: src/plugins/tnef_parse/tnef_parse.c:222
 msgid "Failed to parse VTask data."
 msgstr "Falló la interpretación de los datos VTask."
 
-#: src/plugins/tnef_parse/tnef_parse.c:273
+#: src/plugins/tnef_parse/tnef_parse.c:274
 msgid "Failed to parse VCard data."
 msgstr "Falló la interpretación de los datos VCard."
 
-#: src/plugins/tnef_parse/tnef_parse.c:413
-#: src/plugins/tnef_parse/tnef_parse.c:437
+#: src/plugins/tnef_parse/tnef_parse.c:414
+#: src/plugins/tnef_parse/tnef_parse.c:438
 msgid "TNEF Parser"
 msgstr "Lector TNEF"
 
-#: src/plugins/tnef_parse/tnef_parse.c:442
+#: src/plugins/tnef_parse/tnef_parse.c:443
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13570,75 +13633,75 @@ msgstr ""
 msgid "Calendar"
 msgstr "Calendario"
 
-#: src/plugins/vcalendar/vcalendar.c:99
+#: src/plugins/vcalendar/vcalendar.c:100
 msgid "Create meeting from message..."
 msgstr "Crear reunión a partir del mensaje..."
 
-#: src/plugins/vcalendar/vcalendar.c:119
+#: src/plugins/vcalendar/vcalendar.c:120
 #, c-format
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "Está a punto de crear %d reuniones, una a una. ¿Desea continuar?"
 
-#: src/plugins/vcalendar/vcalendar.c:139
+#: src/plugins/vcalendar/vcalendar.c:140
 msgid "Creating meeting..."
 msgstr "Creando reunión..."
 
-#: src/plugins/vcalendar/vcalendar.c:158
+#: src/plugins/vcalendar/vcalendar.c:159
 msgid "no subject"
 msgstr "sin asunto"
 
-#: src/plugins/vcalendar/vcalendar.c:384
+#: src/plugins/vcalendar/vcalendar.c:385
 msgid "Accept"
 msgstr "Aceptar"
 
-#: src/plugins/vcalendar/vcalendar.c:385
+#: src/plugins/vcalendar/vcalendar.c:386
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: src/plugins/vcalendar/vcalendar.c:386
+#: src/plugins/vcalendar/vcalendar.c:387
 msgid "Decline"
 msgstr "Rehusar"
 
-#: src/plugins/vcalendar/vcalendar.c:473
+#: src/plugins/vcalendar/vcalendar.c:474
 msgid "You have a Todo item."
 msgstr "Tiene un elemento pendiente."
 
-#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
-#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
-#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:729
+#: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
+#: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
+#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:730
 msgid "Details follow:"
 msgstr "Los detalles son los siguientes:"
 
-#: src/plugins/vcalendar/vcalendar.c:480
+#: src/plugins/vcalendar/vcalendar.c:481
 msgid "You have created a meeting."
 msgstr "Ha creado una reunión."
 
-#: src/plugins/vcalendar/vcalendar.c:485
+#: src/plugins/vcalendar/vcalendar.c:486
 msgid "You have been invited to a meeting."
 msgstr "Ha sido invitado a una reunión."
 
-#: src/plugins/vcalendar/vcalendar.c:493
+#: src/plugins/vcalendar/vcalendar.c:494
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr "Se ha cancelado una reunión a la que había sido invitado."
 
-#: src/plugins/vcalendar/vcalendar.c:502
+#: src/plugins/vcalendar/vcalendar.c:503
 msgid "You have been forwarded an appointment."
 msgstr "Se le ha enviado una cita."
 
-#: src/plugins/vcalendar/vcalendar.c:556
+#: src/plugins/vcalendar/vcalendar.c:557
 msgid "(this event recurs)"
 msgstr "(este evento es recurrente)"
 
-#: src/plugins/vcalendar/vcalendar.c:563
+#: src/plugins/vcalendar/vcalendar.c:564
 msgid "(this event is part of a recurring event)"
 msgstr "(este evento es parte de un evento recurrente)"
 
-#: src/plugins/vcalendar/vcalendar.c:728
+#: src/plugins/vcalendar/vcalendar.c:729
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Se recibió una respuesta a una propuesta de reunión desconocida."
 
-#: src/plugins/vcalendar/vcalendar.c:732
+#: src/plugins/vcalendar/vcalendar.c:733
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13647,35 +13710,35 @@ msgstr ""
 "Se recibió una respuesta a una propuesta de reunión.\n"
 "%s ha %s la invitación cuyos detalles se indican:"
 
-#: src/plugins/vcalendar/vcalendar.c:811
+#: src/plugins/vcalendar/vcalendar.c:812
 msgid "Error - could not get the calendar MIME part."
 msgstr "Error - no se pudo obtener la parte MIME del calendario."
 
-#: src/plugins/vcalendar/vcalendar.c:818
+#: src/plugins/vcalendar/vcalendar.c:819
 msgid "Error - no calendar part found."
 msgstr "Error - no se encontró la parte del calendario."
 
-#: src/plugins/vcalendar/vcalendar.c:832
+#: src/plugins/vcalendar/vcalendar.c:833
 msgid "Error - Unknown calendar component type."
 msgstr "Error - Tipo de componente de calendario desconocido."
 
-#: src/plugins/vcalendar/vcalendar.c:964
+#: src/plugins/vcalendar/vcalendar.c:965
 msgid "Send a notification to the attendees"
 msgstr "Enviar una notificación a los asistentes"
 
-#: src/plugins/vcalendar/vcalendar.c:973
+#: src/plugins/vcalendar/vcalendar.c:974
 msgid "Cancel meeting"
 msgstr "Cancelar reunión"
 
-#: src/plugins/vcalendar/vcalendar.c:974
+#: src/plugins/vcalendar/vcalendar.c:975
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "¿Está seguro de que quiere cancelar esta reunión?"
 
-#: src/plugins/vcalendar/vcalendar.c:1069
+#: src/plugins/vcalendar/vcalendar.c:1070
 msgid "No account found"
 msgstr "No se encontró ninguna cuenta"
 
-#: src/plugins/vcalendar/vcalendar.c:1070
+#: src/plugins/vcalendar/vcalendar.c:1071
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13683,128 +13746,128 @@ msgstr ""
 "No tiene ninguna cuenta que coincida con algún convocado.\n"
 "¿Desea responder de todas maneras?"
 
-#: src/plugins/vcalendar/vcalendar.c:1072
+#: src/plugins/vcalendar/vcalendar.c:1073
 msgid "Reply anyway"
 msgstr "Responder igualmente"
 
-#: src/plugins/vcalendar/vcalendar.c:1201
+#: src/plugins/vcalendar/vcalendar.c:1202
 msgid "Answer"
 msgstr "Responder"
 
-#: src/plugins/vcalendar/vcalendar.c:1202
+#: src/plugins/vcalendar/vcalendar.c:1203
 msgid "Edit meeting..."
 msgstr "Editar reunión..."
 
-#: src/plugins/vcalendar/vcalendar.c:1203
+#: src/plugins/vcalendar/vcalendar.c:1204
 msgid "Cancel meeting..."
 msgstr "Cancelar reunión..."
 
-#: src/plugins/vcalendar/vcalendar.c:1204
+#: src/plugins/vcalendar/vcalendar.c:1205
 msgid "Launch website"
 msgstr "Abrir página web"
 
-#: src/plugins/vcalendar/vcalendar.c:1208
+#: src/plugins/vcalendar/vcalendar.c:1209
 msgid "You are already busy at this time."
 msgstr "Usted ya está ocupado a esa hora."
 
-#: src/plugins/vcalendar/vcalendar.c:1247
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
+#: src/plugins/vcalendar/vcalendar.c:1248
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Evento:"
 
-#: src/plugins/vcalendar/vcalendar.c:1248
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1694
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1705
+#: src/plugins/vcalendar/vcalendar.c:1249
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: src/plugins/vcalendar/vcalendar.c:1249
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1697
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
+#: src/plugins/vcalendar/vcalendar.c:1250
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: src/plugins/vcalendar/vcalendar.c:1250
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1695
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
+#: src/plugins/vcalendar/vcalendar.c:1251
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Resumen:"
 
-#: src/plugins/vcalendar/vcalendar.c:1251
+#: src/plugins/vcalendar/vcalendar.c:1252
 msgid "Starting:"
 msgstr "Comienza:"
 
-#: src/plugins/vcalendar/vcalendar.c:1252
+#: src/plugins/vcalendar/vcalendar.c:1253
 msgid "Ending:"
 msgstr "Finaliza:"
 
-#: src/plugins/vcalendar/vcalendar.c:1254
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1699
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
+#: src/plugins/vcalendar/vcalendar.c:1255
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Convocados:"
 
-#: src/plugins/vcalendar/vcalendar.c:1256
+#: src/plugins/vcalendar/vcalendar.c:1257
 msgid "Action:"
 msgstr "Acción:"
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_New meeting..."
 msgstr "_Nueva reunión..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Export calendar..."
 msgstr "_Exportar calendario..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Subscribe to Webcal..."
 msgstr "_Suscribirse a Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "U_pdate subscriptions"
 msgstr "A_ctualizar suscripciones"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_List view"
 msgstr "Vista en _lista"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:175
 msgid "_Week view"
 msgstr "Vista _semanal"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:176
 msgid "_Month view"
 msgstr "Vista _mensual"
 
-#: src/plugins/vcalendar/vcal_folder.c:1102
+#: src/plugins/vcalendar/vcal_folder.c:1103
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/plugins/vcalendar/vcal_folder.c:1501
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "in the past"
 msgstr "en el pasado"
 
-#: src/plugins/vcalendar/vcal_folder.c:1504
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "today"
 msgstr "hoy"
 
-#: src/plugins/vcalendar/vcal_folder.c:1507
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "tomorrow"
 msgstr "mañana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "this week"
 msgstr "esta semana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1513
+#: src/plugins/vcalendar/vcal_folder.c:1514
 msgid "later"
 msgstr "más tarde"
 
-#: src/plugins/vcalendar/vcal_folder.c:1517
+#: src/plugins/vcalendar/vcal_folder.c:1518
 #, c-format
 msgid ""
 "\n"
@@ -13813,17 +13876,17 @@ msgstr ""
 "\n"
 "Estos son los eventos planificados %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1611
+#: src/plugins/vcalendar/vcal_folder.c:1612
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Excedido el tiempo (%d segundos) conectando a %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1630
 #, c-format
 msgid "Error %ld"
 msgstr "Error %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1812
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13836,7 +13899,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1843
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -13847,133 +13910,133 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1873
-#: src/plugins/vcalendar/vcal_folder.c:1876
+#: src/plugins/vcalendar/vcal_folder.c:1874
+#: src/plugins/vcalendar/vcal_folder.c:1877
 #, c-format
 msgid "Could not create directory %s"
 msgstr "No se puede crear el directorio %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1917
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws Mail necesita acceso a la red para actualizar la subscripción del "
 "calendario web."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1928
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Recuperando calendario para %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1929
 msgid "new subscription"
 msgstr "nueva suscripción"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder actualizar la subscripción."
 
-#: src/plugins/vcalendar/vcal_folder.c:1951
+#: src/plugins/vcalendar/vcal_folder.c:1952
 msgid "Subscribe to Webcal"
 msgstr "Suscribirse a un calendario web"
 
-#: src/plugins/vcalendar/vcal_folder.c:1951
-msgid "Enter the WebCal URL:"
+#: src/plugins/vcalendar/vcal_folder.c:1952
+msgid "Enter the Webcal URL:"
 msgstr "Introduzca la URL del calendario web:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1963
+#: src/plugins/vcalendar/vcal_folder.c:1964
 msgid "Could not parse the URL."
 msgstr "No se pudo procesar la URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1991
+#: src/plugins/vcalendar/vcal_folder.c:1992
 msgid "Do you really want to unsubscribe?"
 msgstr "¿Desea realmente desuscribirse?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1992
+#: src/plugins/vcalendar/vcal_folder.c:1993
 msgid "Delete subscription"
 msgstr "Borrar suscripción"
 
-#: src/plugins/vcalendar/vcal_manager.c:110
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "accepted"
 msgstr "aceptada"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "tentatively accepted"
 msgstr "aceptada provisionalmente"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "declined"
 msgstr "rehusada"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:114
 msgid "did not answer"
 msgstr "no respondió"
 
-#: src/plugins/vcalendar/vcal_manager.c:144
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "individual"
 msgstr "individuo"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "group"
 msgstr "grupo"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "resource"
 msgstr "recurso"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "room"
 msgstr "lugar"
 
-#: src/plugins/vcalendar/vcal_manager.c:559
+#: src/plugins/vcalendar/vcal_manager.c:560
 msgid "Past"
 msgstr "Pasado"
 
-#: src/plugins/vcalendar/vcal_manager.c:562
+#: src/plugins/vcalendar/vcal_manager.c:563
 msgid "Today"
 msgstr "Hoy"
 
-#: src/plugins/vcalendar/vcal_manager.c:565
+#: src/plugins/vcalendar/vcal_manager.c:566
 msgid "Tomorrow"
 msgstr "Mañana"
 
-#: src/plugins/vcalendar/vcal_manager.c:568
+#: src/plugins/vcalendar/vcal_manager.c:569
 msgid "This week"
 msgstr "Esta semana"
 
-#: src/plugins/vcalendar/vcal_manager.c:571
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Later"
 msgstr "Más tarde"
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1248
 msgid "Accepted: "
 msgstr "Aceptada: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1249
+#: src/plugins/vcalendar/vcal_manager.c:1250
 msgid "Declined: "
 msgstr "Rehusada: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1251
+#: src/plugins/vcalendar/vcal_manager.c:1252
 msgid "Tentatively Accepted: "
 msgstr "Aceptada provisionalmente: "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:307
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Individual"
 msgstr "Individuo"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
 msgid "Resource"
 msgstr "Recurso"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:311
 msgid "Room"
 msgstr "Lugar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324
 msgid "Add..."
 msgstr "Añadir..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:779
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:728
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
@@ -13981,62 +14044,62 @@ msgstr ""
 "Las siguientes personas están ocupadas a la hora planeada para su reunión:\n"
 "- "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:869
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:818
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:904
 msgid "You"
 msgstr "Usted"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:781
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:730
 msgid "You are busy at the time of your planned meeting"
 msgstr "Usted está ocupado a la hora planeada de su reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:783
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:732
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr "%s está ocupado a la hora planeada para su reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:734
 #, c-format
 msgid "%d hour sooner"
 msgstr "%d hora más temprano"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:736
 #, c-format
 msgid "%d hours sooner"
 msgstr "%d horas más temprano"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:738
 #, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr "%d horas y %d minutos más temprano"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:791
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
 #, c-format
 msgid "%d minutes sooner"
 msgstr "%d minutos más temprano"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:796
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:745
 #, c-format
 msgid "%d hour later"
 msgstr "%d hora más tarde"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:798
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:747
 #, c-format
 msgid "%d hours later"
 msgstr "%d horas más tarde"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:800
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:749
 #, c-format
 msgid "%d hours and %d minutes later"
 msgstr "%d horas y %d minutos más tarde"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:802
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:751
 #, c-format
 msgid "%d minutes later"
 msgstr "%d minutos más tarde"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:808
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
 #, c-format
 msgid ""
 "\n"
@@ -14047,7 +14110,7 @@ msgstr ""
 "\n"
 "Todos estarían disponibles %s o %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:810
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
 #, c-format
 msgid ""
 "\n"
@@ -14058,7 +14121,7 @@ msgstr ""
 "\n"
 "Todos estarían disponibles %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:812
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
 msgid ""
 "\n"
 "\n"
@@ -14070,74 +14133,74 @@ msgstr ""
 "No es posible realizar esta reunión con todos entre las 6 horas anteriores o "
 "siguientes."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:817
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:766
 #, c-format
 msgid "would be available %s or %s"
 msgstr "estaría disponible %s o %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:819
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:768
 #, c-format
 msgid "would be available %s"
 msgstr "estaría disponible %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:821
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:882
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:952
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:770
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:831
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:901
 msgid "not available"
 msgstr "no está disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:824
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
 #, c-format
 msgid ", but would be available %s or %s."
 msgstr ", pero estaría disponible %s o %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:826
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:775
 #, c-format
 msgid ", but would be available %s."
 msgstr ", pero estaría disponible %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:828
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:777
 msgid ", and isn't available in the previous or next 6 hours."
 msgstr ", y no está disponible entre las 6 horas anteriores o siguientes."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:885
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:834
 msgid "available"
 msgstr "disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:887
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1138
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:836
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 msgid "Free/busy retrieval failed"
 msgstr "Falló la recuperación de libre/ocupado"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:969
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:918
 msgid "Not everyone is available"
 msgstr "No todos están disponibles"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:970
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:919
 msgid "Send anyway"
 msgstr "Enviar igualmente"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:981
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
 "No todos están disponibles. Vea las notas flotantes para más información..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1120
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1069
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Recuperando la planificación para %s..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1147
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
 msgid "Available"
 msgstr "Disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1167
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1175
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1109
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1124
 msgid "Everyone is available."
 msgstr "Todos están disponibles."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1176
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -14145,7 +14208,7 @@ msgstr ""
 "Todos parecen estar disponibles, pero no se pudo recuperar alguna "
 "información de libre/ocupado."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1346
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14153,61 +14216,61 @@ msgstr ""
 "No se pudo enviar la invitación de reunión.\n"
 "Compruebe los destinatarios."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1450
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
 msgid "Save & Send"
 msgstr "Guardar y enviar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1451
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
 msgid "Check availability"
 msgstr "Comprobar disponibilidad"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1574
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
 msgid "Starts at:"
 msgstr "Comienza a las:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1580
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:767
 msgid "on:"
 msgstr "en:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
 msgid "Ends at:"
 msgstr "Finaliza a las:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1639
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
 msgid "New meeting"
 msgstr "Nueva reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Editar reunión"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1696
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "Time:"
 msgstr "Hora:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1853
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1856
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Evento inminente: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1868
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14224,39 +14287,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1885
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "Recuérdamelo en %d minuto"
 msgstr[1] "Recuérdamelo en %d minutos"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2011
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1897
 msgid "Empty calendar"
 msgstr "Calendario vacío"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2012
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
 msgid "There is nothing to export."
 msgstr "No hay nada que exportar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2052
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
 msgid "Could not export the calendar."
 msgstr "No se puede exportar el calendario."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2069
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
 msgid "Export calendar to ICS"
 msgstr "Exportar calendario a ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2092
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "No se puede exportar el calendario a «%s»\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2208
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
 msgid "Could not export the freebusy info."
 msgstr "No se puede exportar la información de libre/ocupado."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "No se puede exportar la información de libre/ocupado a «%s»\n"
@@ -14350,107 +14413,107 @@ msgstr ""
 msgid "SSL/TLS options"
 msgstr "Opciones SSL/TLS"
 
-#: src/pop.c:152
+#: src/pop.c:153
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "No se encontró en el saludo la marca de tiempo APOP necesaria\n"
 
-#: src/pop.c:159
+#: src/pop.c:160
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxis en la marca de tiempo del saludo\n"
 
-#: src/pop.c:166
+#: src/pop.c:167
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Error de sintaxis en la marca de tiempo del saludo (no ASCII)\n"
 
-#: src/pop.c:190 src/pop.c:217
+#: src/pop.c:191 src/pop.c:218
 msgid "POP protocol error\n"
 msgstr "Error del protocolo POP\n"
 
-#: src/pop.c:263
+#: src/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "respuesta UIDL inválida: %s\n"
 
-#: src/pop.c:841
+#: src/pop.c:842
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Borrando mensaje expirado %d [%s]\n"
 
-#: src/pop.c:857
+#: src/pop.c:858
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Saltándose mensaje %d [%s] (%d bytes)\n"
 
-#: src/pop.c:889
+#: src/pop.c:890
 msgid "mailbox is locked\n"
 msgstr "el buzón está bloqueado\n"
 
-#: src/pop.c:892
+#: src/pop.c:893
 msgid "Session timeout\n"
 msgstr "Excedido el tiempo límite de la sesión\n"
 
-#: src/pop.c:911
+#: src/pop.c:912
 msgid "command not supported\n"
 msgstr "orden no soportada\n"
 
-#: src/pop.c:916
+#: src/pop.c:917
 msgid "error occurred on POP session\n"
 msgstr "hubo un error en la sesión POP\n"
 
-#: src/pop.c:1111
+#: src/pop.c:1112
 msgid "TOP command unsupported\n"
 msgstr "orden TOP no soportada\n"
 
-#: src/prefs_account.c:366 src/prefs_account.c:1583 src/prefs_account.c:2650
+#: src/prefs_account.c:364 src/prefs_account.c:1579 src/prefs_account.c:2655
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:367 src/prefs_account.c:1696 src/prefs_account.c:2665
-#: src/wizard.c:1500
+#: src/prefs_account.c:365 src/prefs_account.c:1692 src/prefs_account.c:2670
+#: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:366
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
-#: src/prefs_account.c:369 src/wizard.c:1501
+#: src/prefs_account.c:367 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Fichero mbox local"
 
-#: src/prefs_account.c:370
+#: src/prefs_account.c:368
 msgid "None (SMTP only)"
 msgstr "Ninguno (sólo SMTP)"
 
-#: src/prefs_account.c:1132
+#: src/prefs_account.c:1128
 msgid "Name of account"
 msgstr "Nombre de cuenta"
 
-#: src/prefs_account.c:1141
+#: src/prefs_account.c:1137
 msgid "Set as default"
 msgstr "Marcar como primaria"
 
-#: src/prefs_account.c:1149
+#: src/prefs_account.c:1145
 msgid "Personal information"
 msgstr "Información personal"
 
-#: src/prefs_account.c:1158
+#: src/prefs_account.c:1154
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: src/prefs_account.c:1164
+#: src/prefs_account.c:1160
 msgid "Mail address"
 msgstr "Dirección de correo"
 
-#: src/prefs_account.c:1227 src/wizard.c:1524
+#: src/prefs_account.c:1223 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Configuración automática"
 
-#: src/prefs_account.c:1229 src/wizard.c:1525
+#: src/prefs_account.c:1225 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/prefs_account.c:1246
+#: src/prefs_account.c:1242
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14458,77 +14521,77 @@ msgstr ""
 "Aviso: esta versión de Claws Mail\n"
 "se construyó sin soporte para IMAP y noticias."
 
-#: src/prefs_account.c:1277
+#: src/prefs_account.c:1273
 msgid "This server requires authentication"
 msgstr "Este servidor requiere autenticación"
 
-#: src/prefs_account.c:1284
+#: src/prefs_account.c:1280
 msgid "Authenticate on connect"
 msgstr "Autenticación al conectar"
 
-#: src/prefs_account.c:1346
+#: src/prefs_account.c:1342
 msgid "News server"
 msgstr "Servidor de news"
 
-#: src/prefs_account.c:1352
+#: src/prefs_account.c:1348
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account.c:1358
+#: src/prefs_account.c:1354
 msgid "Local mailbox"
 msgstr "Buzón local"
 
-#: src/prefs_account.c:1365
+#: src/prefs_account.c:1361
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1373
+#: src/prefs_account.c:1369
 msgid "Use mail command rather than SMTP server"
 msgstr "Usar mandato para correo en vez de servidor SMTP"
 
-#: src/prefs_account.c:1382
+#: src/prefs_account.c:1378
 msgid "command to send mails"
 msgstr "orden para enviar los correos"
 
-#: src/prefs_account.c:1457
+#: src/prefs_account.c:1453
 #, c-format
 msgid "Account%d"
 msgstr "Cuenta%d"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1553
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1563 src/prefs_account.c:1652
+#: src/prefs_account.c:1559 src/prefs_account.c:1648
 msgid "Default Inbox"
 msgstr "Entrada predeterminada"
 
-#: src/prefs_account.c:1570 src/prefs_account.c:1577 src/prefs_account.c:1659
-#: src/prefs_account.c:1666
+#: src/prefs_account.c:1566 src/prefs_account.c:1573 src/prefs_account.c:1655
+#: src/prefs_account.c:1662
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta"
 
-#: src/prefs_account.c:1585
+#: src/prefs_account.c:1581
 msgid "Use secure authentication (APOP)"
 msgstr "Utilizar autenticación segura (APOP)"
 
-#: src/prefs_account.c:1588
+#: src/prefs_account.c:1584
 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibirlos"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1595
 msgid "Remove after"
 msgstr "Eliminar después de"
 
-#: src/prefs_account.c:1606 src/prefs_account.c:1616
+#: src/prefs_account.c:1602 src/prefs_account.c:1612
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 días y 0 horas: borrar inmediatamente"
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1625
 msgid "Receive size limit"
 msgstr "Límite de tamaño al recibir"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1628
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14536,103 +14599,95 @@ msgstr ""
 "Los mensajes que sobrepasen este límite serán recuperados parcialmente. Al "
 "seleccionarlos podrá descargarlos por completo o borrarlos."
 
-#: src/prefs_account.c:1672 src/prefs_account.c:2680
+#: src/prefs_account.c:1668 src/prefs_account.c:2685
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1675
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 
-#: src/prefs_account.c:1689
+#: src/prefs_account.c:1685
 msgid "unlimited if 0 is specified"
 msgstr "sin límite si se especifica 0"
 
-#: src/prefs_account.c:1714
+#: src/prefs_account.c:1710
 msgid "Plain text"
 msgstr "Texto plano"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1723
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP"
 
-#: src/prefs_account.c:1731
+#: src/prefs_account.c:1727
 msgid "(usually empty)"
 msgstr "(vacío habitualmente)"
 
-#: src/prefs_account.c:1745
+#: src/prefs_account.c:1741
 msgid "Show subscribed folders only"
 msgstr "Mostrar sólo carpetas suscritas"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1748
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Modo de ancho de banda eficiente (evita recuperar las etiquetas remotas)"
 
-#: src/prefs_account.c:1754
+#: src/prefs_account.c:1750
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Este modo usa menos ancho de banda, pero puede ser más lento con algunos "
 "servidores."
 
-#: src/prefs_account.c:1761 src/prefs_receive.c:162
+#: src/prefs_account.c:1757 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Comprobación automática"
 
-#: src/prefs_account.c:1764
+#: src/prefs_account.c:1760
 msgid "Use global settings"
 msgstr "Utilizar la configuración global"
 
-#: src/prefs_account.c:1770 src/prefs_receive.c:169
+#: src/prefs_account.c:1766 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Comprobar si hay correo nuevo cada"
 
-#: src/prefs_account.c:1783
-msgid "mins"
-msgstr "mins"
-
-#: src/prefs_account.c:1790
-msgid "secs"
-msgstr "segs"
-
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1805
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
-#: src/prefs_account.c:1816
+#: src/prefs_account.c:1821
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permitir el filtrado usando módulos al recibir"
 
-#: src/prefs_account.c:1820
+#: src/prefs_account.c:1825
 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:1909 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:622 src/prefs_matcher.c:1965 src/prefs_matcher.c:1987
+#: src/prefs_account.c:1914 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:633 src/prefs_matcher.c:2010 src/prefs_matcher.c:2038
 msgid "Header"
 msgstr "Cabecera"
 
-#: src/prefs_account.c:1911
+#: src/prefs_account.c:1916
 msgid "Generate Message-ID"
 msgstr "Generar identificador de mensaje"
 
-#: src/prefs_account.c:1914
+#: src/prefs_account.c:1919
 msgid "Send account mail address in Message-ID"
 msgstr "Enviar la dirección de correo de la cuenta en el «Message-Id»"
 
-#: src/prefs_account.c:1917
+#: src/prefs_account.c:1922
 msgid "Add user agent header"
 msgstr "Añadir cabecera de agente de usuario"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:1929
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account.c:1939
+#: src/prefs_account.c:1944
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticación SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2037
+#: src/prefs_account.c:2042
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14640,173 +14695,173 @@ msgstr ""
 "Si deja estos campos vacíos, se utilizarán el mismo identificador de usuario "
 "y contraseña usados para la recepción."
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2053
 msgid "Authenticate with POP before sending"
 msgstr "Autenticación con POP antes de enviar"
 
-#: src/prefs_account.c:2063
+#: src/prefs_account.c:2068
 msgid "POP authentication timeout"
 msgstr "Tiempo límite para autenticación POP"
 
-#: src/prefs_account.c:2151 src/prefs_account.c:2197
+#: src/prefs_account.c:2156 src/prefs_account.c:2202
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account.c:2154
+#: src/prefs_account.c:2159
 msgid "Automatically insert signature"
 msgstr "Insertar la firma automáticamente"
 
-#: src/prefs_account.c:2159
+#: src/prefs_account.c:2164
 msgid "Signature separator"
 msgstr "Separador de la firma"
 
-#: src/prefs_account.c:2184
+#: src/prefs_account.c:2189
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account.c:2217
+#: src/prefs_account.c:2222
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/prefs_account.c:2269
+#: src/prefs_account.c:2274
 msgid "Spell check dictionaries"
 msgstr "Diccionarios de corrección ortográfica"
 
-#: src/prefs_account.c:2279 src/prefs_folder_item.c:1103
+#: src/prefs_account.c:2284 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Diccionario predeterminado"
 
-#: src/prefs_account.c:2292 src/prefs_folder_item.c:1137
+#: src/prefs_account.c:2297 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Diccionario alternativo predeterminado"
 
-#: src/prefs_account.c:2378 src/prefs_account.c:3772
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1448
-#: src/prefs_folder_item.c:1841 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_account.c:2383 src/prefs_account.c:3796
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
+#: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Componer"
 
-#: src/prefs_account.c:2393 src/prefs_folder_item.c:1476 src/prefs_quote.c:134
+#: src/prefs_account.c:2398 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2408 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1504 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_account.c:2413 src/prefs_filtering_action.c:185
+#: src/prefs_folder_item.c:1595 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/prefs_account.c:2455
+#: src/prefs_account.c:2460
 msgid "Default privacy system"
 msgstr "Sistema de privacidad predeterminado"
 
-#: src/prefs_account.c:2484
+#: src/prefs_account.c:2489 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Firmar siempre los mensajes"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2491 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Cifrar siempre los mensajes"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2493
 msgid "Always sign messages when replying to a signed message"
 msgstr "Firmar siempre los mensajes al responder a un mensaje firmado"
 
-#: src/prefs_account.c:2491
+#: src/prefs_account.c:2496
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Cifrar siempre los mensajes al responder a un mensaje cifrado"
 
-#: src/prefs_account.c:2494
+#: src/prefs_account.c:2499
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Cifrar los mensajes enviados con la clave propia además de la del "
 "destinatario"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2501
 msgid "Save sent encrypted messages as clear text"
 msgstr "Guardar en claro los mensajes enviados cifrados"
 
-#: src/prefs_account.c:2654 src/prefs_account.c:2669 src/prefs_account.c:2683
+#: src/prefs_account.c:2659 src/prefs_account.c:2674 src/prefs_account.c:2688
 msgid "Don't use SSL/TLS"
 msgstr "No usar SSL/TLS"
 
-#: src/prefs_account.c:2657 src/prefs_account.c:2672 src/prefs_account.c:2692
-#: src/prefs_account.c:2703
+#: src/prefs_account.c:2662 src/prefs_account.c:2677 src/prefs_account.c:2697
+#: src/prefs_account.c:2708
 msgid "Use SSL/TLS"
 msgstr "Usar SSL/TLS"
 
-#: src/prefs_account.c:2660 src/prefs_account.c:2675 src/prefs_account.c:2706
+#: src/prefs_account.c:2665 src/prefs_account.c:2680 src/prefs_account.c:2711
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Usar la orden STARTTLS para abrir la sesión cifrada"
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:2701
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2705
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL/TLS (pero usar STARTTLS si es necesario)"
 
-#: src/prefs_account.c:2711
+#: src/prefs_account.c:2716
 msgid "Client certificates"
 msgstr "Certificados de cliente"
 
-#: src/prefs_account.c:2719
+#: src/prefs_account.c:2724
 msgid "Certificate for receiving"
 msgstr "Certificado para recepción"
 
-#: src/prefs_account.c:2724 src/prefs_account.c:2726 src/prefs_account.c:2752
-#: src/prefs_account.c:2754
+#: src/prefs_account.c:2729 src/prefs_account.c:2731 src/prefs_account.c:2757
+#: src/prefs_account.c:2759
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado de cliente como fichero PKCS12 o PEM"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2752
 msgid "Certificate for sending"
 msgstr "Certificado para envío"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:2792
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Aceptar automáticamente los certificados SSL/TLS válidos"
 
-#: src/prefs_account.c:2790
+#: src/prefs_account.c:2795
 msgid "Use non-blocking SSL/TLS"
 msgstr "Usar SSL/TLS no-bloqueante"
 
-#: src/prefs_account.c:2802
+#: src/prefs_account.c:2807
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Desactive esto si tiene problemas de conexión con SSL/TLS"
 
-#: src/prefs_account.c:2894 src/prefs_proxy.c:73
+#: src/prefs_account.c:2899 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Usar un servidor proxy"
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2908
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Usar la configuración predeterminada"
 
-#: src/prefs_account.c:2905
+#: src/prefs_account.c:2910
 msgid "Use global proxy server settings"
 msgstr "Utilizar la configuración global del proxy"
 
-#: src/prefs_account.c:2942 src/prefs_proxy.c:115 src/wizard.c:1119
+#: src/prefs_account.c:2947 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Usar autenticación"
 
-#: src/prefs_account.c:2947 src/prefs_proxy.c:123
+#: src/prefs_account.c:2952 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Usuario"
 
-#: src/prefs_account.c:2981
+#: src/prefs_account.c:2986
 msgid "Use proxy server for sending"
 msgstr "Utilizar un servidor proxy para enviar"
 
-#: src/prefs_account.c:2983
+#: src/prefs_account.c:2988
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14814,27 +14869,27 @@ msgstr ""
 "Si se desactiva los mensajes se enviarán conectando directamente con el "
 "servidor de salida configurado, ignorando las configuraciones de proxy."
 
-#: src/prefs_account.c:3096
+#: src/prefs_account.c:3099
 msgid "SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account.c:3103
+#: src/prefs_account.c:3106
 msgid "POP port"
 msgstr "Puerto POP"
 
-#: src/prefs_account.c:3110
+#: src/prefs_account.c:3113
 msgid "IMAP port"
 msgstr "Puerto IMAP"
 
-#: src/prefs_account.c:3117
+#: src/prefs_account.c:3120
 msgid "NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3126
 msgid "Domain name"
 msgstr "Nombre de dominio"
 
-#: src/prefs_account.c:3126
+#: src/prefs_account.c:3129
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14842,11 +14897,11 @@ msgstr ""
 "El nombre de dominio se usará en la parte derecha de los identificadores de "
 "mensaje generados («Message-Id») y al conectar a servidores SMTP."
 
-#: src/prefs_account.c:3140
+#: src/prefs_account.c:3143
 msgid "Use command to communicate with server"
 msgstr "Usar orden para comunicarse con el servidor"
 
-#: src/prefs_account.c:3149
+#: src/prefs_account.c:3152
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar los mensajes cruzados como leídos y de color:"
 
@@ -14866,197 +14921,217 @@ msgstr "Poner borradores de mensajes en"
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3268
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de la cuenta."
 
-#: src/prefs_account.c:3274
+#: src/prefs_account.c:3272
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
-#: src/prefs_account.c:3282
+#: src/prefs_account.c:3280
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
-#: src/prefs_account.c:3287
+#: src/prefs_account.c:3285
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3290
 msgid "POP server is not entered."
 msgstr "No se especificó el servidor POP."
 
-#: src/prefs_account.c:3312
+#: src/prefs_account.c:3310
 msgid "The default Inbox folder doesn't exist."
 msgstr "La carpeta de entrada predeterminada no existe."
 
-#: src/prefs_account.c:3318
+#: src/prefs_account.c:3316
 msgid "IMAP server is not entered."
 msgstr "No se especificó el servidor IMAP."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3321
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
-#: src/prefs_account.c:3329
+#: src/prefs_account.c:3327
 msgid "local mailbox filename is not entered."
 msgstr "no se especificó el nombre de fichero del buzón local."
 
-#: src/prefs_account.c:3335
+#: src/prefs_account.c:3333
 msgid "mail command is not entered."
 msgstr "no se especificó el mandato de correo."
 
-#: src/prefs_account.c:3345
+#: src/prefs_account.c:3343
 msgid "User ID cannot contain a newline character."
 msgstr ""
 "El identificador de usuario no puede contener caracteres de salto de línea."
 
-#: src/prefs_account.c:3350
+#: src/prefs_account.c:3348
 msgid "Password cannot contain a newline character."
 msgstr "La contraseña no puede contener caracteres de salto de línea."
 
-#: src/prefs_account.c:3378
+#: src/prefs_account.c:3376
 msgid "SMTP user ID cannot contain a newline character."
 msgstr ""
 "El identificador de usuario SMTP no puede contener caracteres de salto de "
 "línea."
 
-#: src/prefs_account.c:3383
+#: src/prefs_account.c:3381
 msgid "SMTP password cannot contain a newline character."
 msgstr "La contraseña SMTP no puede contener caracteres de salto de línea."
 
-#: src/prefs_account.c:3736
+#: src/prefs_account.c:3457
+msgid "domain is not specified."
+msgstr "no se especificó el dominio."
+
+#: src/prefs_account.c:3462
+msgid "sent folder is not selected."
+msgstr "no se seleccionó la carpeta de enviados."
+
+#: src/prefs_account.c:3467
+msgid "queue folder is not selected."
+msgstr "no se seleccionó la carpeta de la cola."
+
+#: src/prefs_account.c:3472
+msgid "draft folder is not selected."
+msgstr "no se se seleccionó la carpeta de borradores."
+
+#: src/prefs_account.c:3477
+msgid "trash folder is not selected."
+msgstr "no se seleccionó la carpeta de la papelera."
+
+#: src/prefs_account.c:3760
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account.c:3790 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
+#: src/prefs_account.c:3814 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Plantillas"
 
-#: src/prefs_account.c:3808
+#: src/prefs_account.c:3832
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account.c:3938
+#: src/prefs_account.c:3962
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account.c:4287
+#: src/prefs_account.c:4311
 msgid "Preferences for new account"
 msgstr "Preferencias para una nueva cuenta"
 
-#: src/prefs_account.c:4289
+#: src/prefs_account.c:4313
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferencias de la cuenta"
 
-#: src/prefs_account.c:4410 src/wizard.c:1389
+#: src/prefs_account.c:4432 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Falló (dirección errónea)"
 
-#: src/prefs_account.c:4495
+#: src/prefs_account.c:4517
 msgid "Select signature file"
 msgstr "Seleccionar fichero de firma"
 
-#: src/prefs_account.c:4513 src/prefs_account.c:4530 src/wizard.c:1066
+#: src/prefs_account.c:4535 src/prefs_account.c:4552 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Seleccionar fichero del certificado"
 
-#: src/prefs_account.c:4626
+#: src/prefs_account.c:4648
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:4797
+#: src/prefs_account.c:4819
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (módulo no cargado)"
 
-#: src/prefs_actions.c:223
+#: src/prefs_actions.c:224
 msgid "Actions configuration"
 msgstr "Configuración de acciones"
 
-#: src/prefs_actions.c:250
+#: src/prefs_actions.c:251
 msgid "Menu name"
 msgstr "Nombre de menú"
 
-#: src/prefs_actions.c:283
+#: src/prefs_actions.c:284
 msgid "Shell command"
 msgstr "Orden del intérprete"
 
-#: src/prefs_actions.c:293
+#: src/prefs_actions.c:294
 msgid "Filter action"
 msgstr "Acción de filtrado"
 
-#: src/prefs_actions.c:299
+#: src/prefs_actions.c:300
 msgid "Edit filter action"
 msgstr "Editar acción de filtrado"
 
-#: src/prefs_actions.c:327
+#: src/prefs_actions.c:328
 msgid "Append the new action above to the list"
 msgstr "Añadir la nueva acción de arriba a la lista"
 
-#: src/prefs_actions.c:335
+#: src/prefs_actions.c:336
 msgid "Replace the selected action in list with the action above"
 msgstr "Sustituir la acción seleccionada en la lista con la acción de arriba"
 
-#: src/prefs_actions.c:337 src/prefs_filtering_action.c:600
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:775 src/prefs_template.c:319
+#: src/prefs_actions.c:338 src/prefs_filtering_action.c:588
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:800 src/prefs_template.c:319
 #: src/prefs_toolbar.c:1024
 msgid "D_elete"
 msgstr "B_orrar"
 
-#: src/prefs_actions.c:345
+#: src/prefs_actions.c:346
 msgid "Delete the selected action from the list"
 msgstr "Borrar la acción seleccionada de la lista"
 
-#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:337
+#: src/prefs_actions.c:356 src/prefs_filtering.c:503 src/prefs_template.c:337
 msgid "Clear all the input fields in the dialog"
 msgstr "Limpiar todos los campos de entrada en el diálogo"
 
-#: src/prefs_actions.c:363
+#: src/prefs_actions.c:364
 msgid "Show information on configuring actions"
 msgstr "Muestra información sobre la configuración de las acciones"
 
-#: src/prefs_actions.c:394
+#: src/prefs_actions.c:395
 msgid "Move the selected action up"
 msgstr "Mover arriba la acción seleccionada"
 
-#: src/prefs_actions.c:402
+#: src/prefs_actions.c:403
 msgid "Move selected action down"
 msgstr "Mover abajo la acción seleccionada"
 
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:691
+#: src/prefs_actions.c:536 src/prefs_filtering_action.c:677
 #: src/prefs_filtering.c:838 src/prefs_filtering.c:840
-#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:892
+#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:918
 #: src/prefs_template.c:471
 msgid "(New)"
 msgstr "(Nueva)"
 
-#: src/prefs_actions.c:600
+#: src/prefs_actions.c:601
 msgid "Menu name is not set."
 msgstr "No se estableció el nombre del menú."
 
-#: src/prefs_actions.c:605
+#: src/prefs_actions.c:606
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "No se permite «/» al inicio del nombre del menú."
 
-#: src/prefs_actions.c:610
+#: src/prefs_actions.c:611
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "No se permite «:» (dos puntos) en el nombre del menú."
 
-#: src/prefs_actions.c:629
+#: src/prefs_actions.c:630
 msgid "Menu name is too long."
 msgstr "El nombre del menú es demasiado largo."
 
-#: src/prefs_actions.c:638
+#: src/prefs_actions.c:639
 msgid "Command-line not set."
 msgstr "No se especificó la orden a ejecutar."
 
-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:644
 msgid "Menu name and command are too long."
 msgstr "El nombre del menú y la orden son demasiado largos."
 
-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:650
 #, c-format
 msgid ""
 "The command\n"
@@ -15067,139 +15142,139 @@ msgstr ""
 "%s\n"
 "tiene errores sintácticos."
 
-#: src/prefs_actions.c:707
+#: src/prefs_actions.c:708
 msgid "Delete action"
 msgstr "Borrar acción"
 
-#: src/prefs_actions.c:708
+#: src/prefs_actions.c:709
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 
-#: src/prefs_actions.c:728
+#: src/prefs_actions.c:729
 msgid "Delete all actions"
 msgstr "Borrar todas las acciones"
 
-#: src/prefs_actions.c:729
+#: src/prefs_actions.c:730
 msgid "Do you really want to delete all the actions?"
 msgstr "¿Realmente quiere borrar todas las acciones?"
 
-#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1503
-#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2112 src/prefs_template.c:571
+#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1503
+#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2161 src/prefs_template.c:571
 #: src/prefs_template.c:596
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 
-#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1504
+#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
 #: src/prefs_filtering.c:1526 src/prefs_template.c:572 src/prefs_template.c:597
 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:925
+#: src/prefs_actions.c:895 src/prefs_actions.c:900 src/prefs_actions.c:926
 #: src/prefs_filtering.c:1483 src/prefs_filtering.c:1505
-#: src/prefs_filtering.c:1527 src/prefs_matcher.c:2115 src/prefs_template.c:573
+#: src/prefs_filtering.c:1527 src/prefs_matcher.c:2164 src/prefs_template.c:573
 #: src/prefs_template.c:598 src/prefs_template.c:603
 msgid "_Continue editing"
 msgstr "_Seguir editando"
 
-#: src/prefs_actions.c:897
+#: src/prefs_actions.c:898
 msgid "Actions list not saved"
 msgstr "Lista de acciones no guardada"
 
-#: src/prefs_actions.c:898
+#: src/prefs_actions.c:899
 msgid "The actions list has been modified. Close anyway?"
 msgstr "La lista de acciones no fue guardada. ¿Cerrar igualmente?"
 
-#: src/prefs_actions.c:968
+#: src/prefs_actions.c:969
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Nombre de menú:</span>"
 
-#: src/prefs_actions.c:969
+#: src/prefs_actions.c:970
 msgid "Use / in menu name to make submenus."
 msgstr "Utilice / en el nombre de menú para crear sub-menús."
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:972
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Línea de orden:</span>"
 
-#: src/prefs_actions.c:972
+#: src/prefs_actions.c:973
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Comenzar con:</span>"
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:974
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "para enviar el mensaje o la selección a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:975
 msgid "to send user provided text to command's standard input"
 msgstr "para enviar el texto de usuario a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:976
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "para enviar el texto de usuario oculto a la entrada estándar de la orden"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Finalizar con:</span>"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:978
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "para reemplazar el mensaje o selección con la salida estándar de la orden"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:979
 msgid "to insert command's standard output without replacing old text"
 msgstr "para insertar la salida estándar de la orden sin reemplazar el texto"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:980
 msgid "to run command asynchronously"
 msgstr "para ejecutar la orden de manera asíncrona"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:981
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Usar:</span>"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:982
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "para el fichero del mensaje seleccionado en formato RFC822/2822 "
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:983
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "para la lista de nombres de los mensajes seleccionados en formato RFC822/2822"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:984
 msgid "for the file of the selected decoded message MIME part"
 msgstr "para el fichero de la parte MIME seleccionada del mensaje decodificada"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:985
 msgid "for a user provided argument"
 msgstr "para un parámetro introducido por el usuario"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:986
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 "para un parámetro introducido por el usuario y oculto (p.ej. contraseña)"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:987
 msgid "for the text selection"
 msgstr "para la parte seleccionada del texto"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:988
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplicar acciones de filtrado entre {} a los mensajes seleccionados"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:989
 msgid "for a literal %"
 msgstr "para un carácter %"
 
-#: src/prefs_actions.c:998 src/prefs_themes.c:1090
+#: src/prefs_actions.c:999 src/prefs_themes.c:1090
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/prefs_actions.c:999
+#: src/prefs_actions.c:1000
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -15207,29 +15282,29 @@ msgstr ""
 "Las acciones son una forma de que el usuario pueda lanzar órdenes externas "
 "que procesen un fichero de mensaje o alguna de sus partes."
 
-#: src/prefs_actions.c:1086 src/prefs_filtering.c:1701
+#: src/prefs_actions.c:1087 src/prefs_filtering.c:1701
 #: src/prefs_template.c:1113
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: src/prefs_actions.c:1206
+#: src/prefs_actions.c:1207
 msgid "Current actions"
 msgstr "Acciones actuales"
 
-#: src/prefs_actions.c:1305 src/prefs_filtering.c:1078
+#: src/prefs_actions.c:1306 src/prefs_filtering.c:1078
 #: src/prefs_filtering.c:1136
 msgid "Action string is not valid."
 msgstr "La cadena de la acción no es válida."
 
-#: src/prefs_common.c:237 src/prefs_quote.c:69
+#: src/prefs_common.c:239 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hola,\\n"
 
-#: src/prefs_common.c:315
+#: src/prefs_common.c:317
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "El %d\\n%f escribió:\\n%q\\n%X"
 
-#: src/prefs_common.c:321 src/prefs_quote.c:85
+#: src/prefs_common.c:323 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -15237,7 +15312,7 @@ msgstr ""
 "\\n\\nInicio del mensaje redirigido:\\n\\n?d{Fecha: %d\\n}?f{Desde: %f\\n}?"
 "t{Para: %t\\n}?c{Cc: %c\\n}?n{Grupos: %n\\n}?s{Asunto: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:449
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15305,7 +15380,7 @@ msgstr "El botón Responder invoca responder a la lista de correo"
 msgid "Forwarding"
 msgstr "Reenvíos"
 
-#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:186
 msgid "Forward as attachment"
 msgstr "Reenviar como adjunto"
 
@@ -15334,97 +15409,97 @@ msgstr "Adjuntar"
 msgid "Writing"
 msgstr "Redacción"
 
-#: src/prefs_customheader.c:183
+#: src/prefs_customheader.c:184
 msgid "Custom header configuration"
 msgstr "Configuración de cabeceras de usuario"
 
-#: src/prefs_customheader.c:502 src/prefs_display_header.c:589
-#: src/prefs_matcher.c:1592 src/prefs_matcher.c:1607
+#: src/prefs_customheader.c:503 src/prefs_display_header.c:590
+#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1648
 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera."
 
-#: src/prefs_customheader.c:512
+#: src/prefs_customheader.c:513
 msgid "This Header name is not allowed as a custom header."
 msgstr "Este nombre de cabecera no está permitido como cabecera de usuario."
 
-#: src/prefs_customheader.c:559
+#: src/prefs_customheader.c:560
 msgid "Choose a PNG file"
 msgstr "Elegir un fichero PNG"
 
-#: src/prefs_customheader.c:561
+#: src/prefs_customheader.c:562
 msgid "Choose an XBM file"
 msgstr "Elegir un fichero XBM"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:564
 msgid "Choose a text file"
 msgstr "Elegir un fichero de texto"
 
-#: src/prefs_customheader.c:576
+#: src/prefs_customheader.c:577
 msgid "This file isn't an image."
 msgstr "Este fichero no es un imagen."
 
-#: src/prefs_customheader.c:581
+#: src/prefs_customheader.c:582
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "La imagen elegida no tiene el tamaño correcto (48x48)."
 
-#: src/prefs_customheader.c:587
+#: src/prefs_customheader.c:588
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "La imagen es demasiado grande; como máximo deben ser 725 bytes."
 
-#: src/prefs_customheader.c:592
+#: src/prefs_customheader.c:593
 msgid "The image isn't in the correct format (PNG)."
 msgstr "La imagen no tiene el formato correcto (PNG)."
 
-#: src/prefs_customheader.c:601
+#: src/prefs_customheader.c:602
 msgid "The image isn't in the correct format (XBM)."
 msgstr "La imagen no tiene el formato correcto (XBM)."
 
-#: src/prefs_customheader.c:610
+#: src/prefs_customheader.c:611
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr "No se pudo llamar a «compface». Asegúrese que está en su $PATH"
 
-#: src/prefs_customheader.c:616
+#: src/prefs_customheader.c:617
 #, c-format
 msgid "Compface error: %s"
 msgstr "Error de compface: %s"
 
-#: src/prefs_customheader.c:669
+#: src/prefs_customheader.c:670
 msgid "This file contains newlines."
 msgstr "Este fichero contiene saltos de línea."
 
-#: src/prefs_customheader.c:699
+#: src/prefs_customheader.c:700
 msgid "Delete header"
 msgstr "Borrar cabecera"
 
-#: src/prefs_customheader.c:700
+#: src/prefs_customheader.c:701
 msgid "Do you really want to delete this header?"
 msgstr "¿Quiere borrar realmente esta cabecera?"
 
-#: src/prefs_customheader.c:873
+#: src/prefs_customheader.c:874
 msgid "Current custom headers"
 msgstr "Cabeceras de usuario actuales"
 
-#: src/prefs_display_header.c:252
+#: src/prefs_display_header.c:253
 msgid "Displayed header configuration"
 msgstr "Configuración de cabeceras mostradas"
 
-#: src/prefs_display_header.c:276
+#: src/prefs_display_header.c:277
 msgid "Header name"
 msgstr "Cabecera"
 
-#: src/prefs_display_header.c:311
+#: src/prefs_display_header.c:312
 msgid "Displayed Headers"
 msgstr "Cabeceras mostradas"
 
-#: src/prefs_display_header.c:373
+#: src/prefs_display_header.c:374
 msgid "Hidden headers"
 msgstr "Cabeceras ocultas"
 
-#: src/prefs_display_header.c:399
+#: src/prefs_display_header.c:400
 msgid "Show all unspecified headers"
 msgstr "Mostrar todas las cabeceras"
 
-#: src/prefs_display_header.c:599
+#: src/prefs_display_header.c:600
 msgid "This header is already in the list."
 msgstr "Esa cabecera ya existe en la lista."
 
@@ -15470,177 +15545,177 @@ msgstr "Vista de mensaje"
 msgid "External Programs"
 msgstr "Programas externos"
 
-#: src/prefs_filtering_action.c:175
+#: src/prefs_filtering_action.c:171
 msgid "Move"
 msgstr "Mover"
 
-#: src/prefs_filtering_action.c:176
+#: src/prefs_filtering_action.c:172
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/prefs_filtering_action.c:178
+#: src/prefs_filtering_action.c:174
 msgid "Hide"
 msgstr "Ocultar"
 
+#: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
+#: src/prefs_filtering_action.c:177 src/prefs_filtering_action.c:178
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
-#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
 msgid "Message flags"
 msgstr "Marcas de mensaje"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:449
-#: src/prefs_summary_column.c:77 src/summaryview.c:2843 src/toolbar.c:505
+#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:620
+#: src/prefs_summary_column.c:77 src/summaryview.c:2887 src/toolbar.c:505
 msgid "Mark"
 msgstr "Marca"
 
-#: src/prefs_filtering_action.c:183
+#: src/prefs_filtering_action.c:179
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
-#: src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:180
 msgid "Mark as unread"
 msgstr "Marcar como no leído"
 
-#: src/prefs_filtering_action.c:185
+#: src/prefs_filtering_action.c:181
 msgid "Mark as spam"
 msgstr "Marcar como basura"
 
-#: src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:182
 msgid "Mark as ham"
 msgstr "Marcar como bueno"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1418
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1394
 #: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:447
+#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:618
 msgid "Color label"
 msgstr "Color"
 
-#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:187
 msgid "Resend"
 msgstr "Reenviar"
 
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:187
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1422 src/prefs_matcher.c:628
-#: src/prefs_summaries.c:452 src/prefs_summary_column.c:86
-#: src/summaryview.c:451
+#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:1398 src/prefs_matcher.c:639
+#: src/prefs_summaries.c:623 src/prefs_summary_column.c:86
+#: src/summaryview.c:471
 msgid "Score"
 msgstr "Puntos"
 
-#: src/prefs_filtering_action.c:194
+#: src/prefs_filtering_action.c:188
 msgid "Change score"
 msgstr "Cambiar puntos"
 
-#: src/prefs_filtering_action.c:195
+#: src/prefs_filtering_action.c:189
 msgid "Set score"
 msgstr "Establecer puntos"
 
-#: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
-#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:632
-#: src/prefs_summary_column.c:88 src/summaryview.c:453
+#: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
+#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:643
+#: src/prefs_summary_column.c:88 src/summaryview.c:473
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/prefs_filtering_action.c:196
+#: src/prefs_filtering_action.c:190
 msgid "Apply tag"
 msgstr "Aplicar etiqueta"
 
-#: src/prefs_filtering_action.c:197
+#: src/prefs_filtering_action.c:191
 msgid "Unset tag"
 msgstr "Quitar etiqueta"
 
-#: src/prefs_filtering_action.c:198
+#: src/prefs_filtering_action.c:192
 msgid "Clear tags"
 msgstr "Limpiar etiquetas"
 
-#: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
+#: src/prefs_filtering_action.c:193 src/prefs_filtering_action.c:194
 msgid "Threads"
 msgstr "Hilos"
 
-#: src/prefs_filtering_action.c:202
+#: src/prefs_filtering_action.c:196
 msgid "Stop filter"
 msgstr "Detener filtro"
 
-#: src/prefs_filtering_action.c:410
+#: src/prefs_filtering_action.c:400
 msgid "Action configuration"
 msgstr "Configuración de la acción"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1894
-#: src/prefs_matcher.c:585
+#: src/prefs_filtering_action.c:417 src/prefs_filtering.c:1894
+#: src/prefs_matcher.c:596
 msgid "Rule"
 msgstr "Regla"
 
-#: src/prefs_filtering_action.c:440 src/prefs_filtering.c:433
+#: src/prefs_filtering_action.c:430 src/prefs_filtering.c:433
 msgid "Action"
 msgstr "Acción"
 
-#: src/prefs_filtering_action.c:922
+#: src/prefs_filtering_action.c:906
 msgid "Command-line not set"
 msgstr "Orden no establecida"
 
-#: src/prefs_filtering_action.c:923
+#: src/prefs_filtering_action.c:907
 msgid "Destination is not set."
 msgstr "Destino no establecido."
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:918
 msgid "Recipient is not set."
 msgstr "Destinatario no establecido."
 
-#: src/prefs_filtering_action.c:952
+#: src/prefs_filtering_action.c:934
 msgid "Score is not set"
 msgstr "Puntuación no establecida"
 
-#: src/prefs_filtering_action.c:960
+#: src/prefs_filtering_action.c:942
 msgid "Header is not set."
 msgstr "No se estableció la cabecera."
 
-#: src/prefs_filtering_action.c:967
+#: src/prefs_filtering_action.c:949
 msgid "Target addressbook/folder is not set."
 msgstr "No se especificó agenda/carpeta de destino."
 
-#: src/prefs_filtering_action.c:977
+#: src/prefs_filtering_action.c:959
 msgid "Tag name is empty."
 msgstr "El nombre de la etiqueta está vacío."
 
-#: src/prefs_filtering_action.c:1199
+#: src/prefs_filtering_action.c:1181
 msgid "No action was defined."
 msgstr "No se definió ninguna acción."
 
-#: src/prefs_filtering_action.c:1237 src/prefs_matcher.c:2159
+#: src/prefs_filtering_action.c:1219 src/prefs_matcher.c:2208
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "carácter %"
 
-#: src/prefs_filtering_action.c:1246 src/prefs_matcher.c:2168
+#: src/prefs_filtering_action.c:1228 src/prefs_matcher.c:2217
 msgid "filename (should not be modified)"
 msgstr "nombre de fichero (no debe modificarse)"
 
-#: src/prefs_filtering_action.c:1247 src/prefs_matcher.c:2169
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2218
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nueva línea"
 
-#: src/prefs_filtering_action.c:1248 src/prefs_matcher.c:2170
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2219
 msgid "escape character for quotes"
 msgstr "carácter de escape para citas"
 
-#: src/prefs_filtering_action.c:1249 src/prefs_matcher.c:2171
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2220
 msgid "quote character"
 msgstr "carácter de cita"
 
-#: src/prefs_filtering_action.c:1258
+#: src/prefs_filtering_action.c:1240
 msgid "Filtering Action: 'Execute'"
 msgstr "Acción de filtrado: «Ejecutar»"
 
-#: src/prefs_filtering_action.c:1259
+#: src/prefs_filtering_action.c:1241
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -15650,23 +15725,23 @@ msgstr ""
 "externo o script.\n"
 "Se pueden usar los siguientes símbolos:"
 
-#: src/prefs_filtering_action.c:1402
+#: src/prefs_filtering_action.c:1380
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: src/prefs_filtering_action.c:1406
+#: src/prefs_filtering_action.c:1384
 msgid "Book/Folder"
 msgstr "Agenda/carpeta"
 
-#: src/prefs_filtering_action.c:1410
+#: src/prefs_filtering_action.c:1388
 msgid "Destination"
 msgstr "Destino"
 
-#: src/prefs_filtering_action.c:1414
+#: src/prefs_filtering_action.c:1391
 msgid "Color"
 msgstr "Colorear"
 
-#: src/prefs_filtering_action.c:1500
+#: src/prefs_filtering_action.c:1476
 msgid "Current action list"
 msgstr "Lista actual de acciones"
 
@@ -15800,8 +15875,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Columnas ocultas"
 
-#: src/prefs_folder_column.c:299 src/prefs_summaries.c:416
-#: src/prefs_summaries.c:590 src/prefs_summary_column.c:313
+#: src/prefs_folder_column.c:299 src/prefs_summaries.c:383
+#: src/prefs_summaries.c:448 src/prefs_summary_column.c:313
 msgid "Displayed columns"
 msgstr "Columnas visibles"
 
@@ -15810,7 +15885,7 @@ msgstr "Columnas visibles"
 msgid " Use default "
 msgstr " Usar configuración inicial "
 
-#: src/prefs_folder_item.c:210
+#: src/prefs_folder_item.c:214
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
@@ -15820,7 +15895,7 @@ msgstr ""
 "Sin embargo puede establecerlas en todo el árbol de carpetas del buzón "
 "usando «Aplicar a subcarpetas»."
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:885
+#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:896
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15828,55 +15903,55 @@ msgstr ""
 "Aplicar a\n"
 "subcarpetas"
 
-#: src/prefs_folder_item.c:314
+#: src/prefs_folder_item.c:318
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:316
+#: src/prefs_folder_item.c:320
 msgid "Outbox"
 msgstr "Salida"
 
-#: src/prefs_folder_item.c:332
+#: src/prefs_folder_item.c:336
 msgid "Folder type"
 msgstr "Tipo de carpeta"
 
-#: src/prefs_folder_item.c:344
+#: src/prefs_folder_item.c:348
 msgid "Simplify Subject RegExp"
 msgstr "Expr. reg. para simplificar asunto"
 
-#: src/prefs_folder_item.c:370
+#: src/prefs_folder_item.c:374
 msgid "Test string"
 msgstr "Texto de prueba"
 
-#: src/prefs_folder_item.c:387
+#: src/prefs_folder_item.c:391
 msgid "Result"
 msgstr "Resultado"
 
-#: src/prefs_folder_item.c:402
+#: src/prefs_folder_item.c:406
 msgid "Folder chmod"
 msgstr "Permisos de la carpeta"
 
-#: src/prefs_folder_item.c:428
+#: src/prefs_folder_item.c:432
 msgid "Folder color"
 msgstr "Color de la carpeta"
 
-#: src/prefs_folder_item.c:440 src/prefs_folder_item.c:1677
+#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
 msgid "Pick color for folder"
 msgstr "Elegir color para la carpeta"
 
-#: src/prefs_folder_item.c:458
+#: src/prefs_folder_item.c:462
 msgid "Run Processing rules at start-up"
 msgstr "Ejecutar las reglas de procesamiento al iniciar"
 
-#: src/prefs_folder_item.c:473
+#: src/prefs_folder_item.c:477
 msgid "Run Processing rules when opening"
 msgstr "Ejecutar las reglas de procesamiento al abrir"
 
-#: src/prefs_folder_item.c:487
+#: src/prefs_folder_item.c:491
 msgid "Scan for new mail"
 msgstr "Examinar si hay correo nuevo"
 
-#: src/prefs_folder_item.c:489
+#: src/prefs_folder_item.c:493
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -15884,11 +15959,11 @@ msgstr ""
 "Active esta opción si el correo es servido directamente en esta carpeta por "
 "el filtrado del servidor en IMAP o por una aplicación externa"
 
-#: src/prefs_folder_item.c:509
+#: src/prefs_folder_item.c:513
 msgid "Select the HTML part of multipart messages"
 msgstr "Seleccionar la parte HTML en mensajes multiparte"
 
-#: src/prefs_folder_item.c:526
+#: src/prefs_folder_item.c:530
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -15896,64 +15971,68 @@ msgstr ""
 "«Por omisión» obedecerá las preferencias globales (que se encuentran en /"
 "Preferencias/Vista de mensaje/Opciones de texto)"
 
-#: src/prefs_folder_item.c:536
+#: src/prefs_folder_item.c:540
 msgid "Synchronise for offline use"
 msgstr "Sincronizar para uso sin conexión"
 
-#: src/prefs_folder_item.c:557
+#: src/prefs_folder_item.c:561
 msgid "Fetch message bodies from the last"
 msgstr "Recuperar cuerpos de mensaje desde el último"
 
-#: src/prefs_folder_item.c:564
+#: src/prefs_folder_item.c:568
 msgid "0: all bodies"
 msgstr "0: todos los cuerpos"
 
-#: src/prefs_folder_item.c:572
+#: src/prefs_folder_item.c:576
 msgid "Remove older messages bodies"
 msgstr "Eliminar cuerpos de mensaje antiguos"
 
-#: src/prefs_folder_item.c:589
+#: src/prefs_folder_item.c:593
 msgid "Discard folder cache"
 msgstr "Descartar la caché de la carpeta"
 
-#: src/prefs_folder_item.c:894
+#: src/prefs_folder_item.c:905
 msgid "Request Return Receipt"
 msgstr "Solicitar acuse de recibo"
 
-#: src/prefs_folder_item.c:909
+#: src/prefs_folder_item.c:920
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Guardar los mensajes salientes en esta carpeta en vez de en Enviado"
 
-#: src/prefs_folder_item.c:923 src/prefs_folder_item.c:975
-#: src/prefs_folder_item.c:1001 src/prefs_folder_item.c:1027
+#: src/prefs_folder_item.c:934 src/prefs_folder_item.c:986
+#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "Cabecera %s predeterminada"
 
-#: src/prefs_folder_item.c:949
+#: src/prefs_folder_item.c:960
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr "Cabecera %s para respuestas"
 
-#: src/prefs_folder_item.c:1052
+#: src/prefs_folder_item.c:1063
 msgid "Default account"
 msgstr "Cuenta primaria"
 
-#: src/prefs_folder_item.c:1690
+#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+msgid "\"Default\" will follow the applicable account preference"
+msgstr "«Por omisión» utilizará la preferencia de la cuenta que corresponda"
+
+#: src/prefs_folder_item.c:1781
 msgid "Discard cache"
 msgstr "Descartar caché"
 
-#: src/prefs_folder_item.c:1691
+#: src/prefs_folder_item.c:1782
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "¿Quiere borrar realmente los datos locales en caché para esta carpeta?"
 
-#: src/prefs_folder_item.c:1824
+#: src/prefs_folder_item.c:1907
 msgid "General"
 msgstr "Genéricas"
 
-#: src/prefs_folder_item.c:1903
+#: src/prefs_folder_item.c:1986
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propiedades de la carpeta %s"
@@ -15962,7 +16041,7 @@ msgstr "Propiedades de la carpeta %s"
 msgid "Folder and Message Lists"
 msgstr "Carpeta y listas de mensajes"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2033
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2082
 msgid "Message"
 msgstr "Mensaje"
 
@@ -15988,8 +16067,8 @@ msgstr "Usar una tipografía distinta para imprimir"
 msgid "Message Printing"
 msgstr "Impresión de mensajes"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:773
-#: src/prefs_themes.c:421
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:830
+#: src/prefs_themes.c:422
 msgid "Display"
 msgstr "Ver"
 
@@ -15997,7 +16076,7 @@ msgstr "Ver"
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: src/prefs_gtk.c:908 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -16142,7 +16221,7 @@ msgstr "Mensajes de error"
 msgid "Status messages for filtering/processing log"
 msgstr "Mensajes de estado de filtrado/traza de procesamiento"
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:772
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:784
 msgid "Other"
 msgstr "Otras"
 
@@ -16150,247 +16229,259 @@ msgstr "Otras"
 msgid "Logging"
 msgstr "Depuración"
 
-#: src/prefs_matcher.c:330
+#: src/prefs_matcher.c:335
 msgid "more than"
 msgstr "más que"
 
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:336
 msgid "less than"
 msgstr "menos que"
 
-#: src/prefs_matcher.c:337
+#: src/prefs_matcher.c:342
 msgid "weeks"
 msgstr "semanas"
 
-#: src/prefs_matcher.c:341
+#: src/prefs_matcher.c:346
+msgid "after"
+msgstr "después"
+
+#: src/prefs_matcher.c:347
+msgid "before"
+msgstr "antes"
+
+#: src/prefs_matcher.c:351
 msgid "higher than"
 msgstr "más alto que"
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:352
 msgid "lower than"
 msgstr "más bajo que"
 
-#: src/prefs_matcher.c:343 src/prefs_matcher.c:349
+#: src/prefs_matcher.c:353 src/prefs_matcher.c:359
 msgid "exactly"
 msgstr "exactamente"
 
-#: src/prefs_matcher.c:347
+#: src/prefs_matcher.c:357
 msgid "greater than"
 msgstr "mayor que"
 
-#: src/prefs_matcher.c:348
+#: src/prefs_matcher.c:358
 msgid "smaller than"
 msgstr "menor que"
 
-#: src/prefs_matcher.c:353
+#: src/prefs_matcher.c:363
 msgid "bytes"
 msgstr "bytes"
 
-#: src/prefs_matcher.c:354
+#: src/prefs_matcher.c:364
 msgid "kilobytes"
 msgstr "kilobytes"
 
-#: src/prefs_matcher.c:355
+#: src/prefs_matcher.c:365
 msgid "megabytes"
 msgstr "megabytes"
 
-#: src/prefs_matcher.c:359
+#: src/prefs_matcher.c:369
 msgid "contains"
 msgstr "contiene"
 
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:370
 msgid "doesn't contain"
 msgstr "no contiene"
 
-#: src/prefs_matcher.c:384
+#: src/prefs_matcher.c:394
 msgid "headers part"
 msgstr "sección cabeceras"
 
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:395
 msgid "headers values"
 msgstr "valores de cabeceras"
 
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:396
 msgid "body part"
 msgstr "sección cuerpo"
 
-#: src/prefs_matcher.c:387
+#: src/prefs_matcher.c:397
 msgid "whole message"
 msgstr "mensaje completo"
 
-#: src/prefs_matcher.c:393 src/summaryview.c:6487
+#: src/prefs_matcher.c:403 src/summaryview.c:6534
 msgid "Marked"
 msgstr "Marcado"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6485
+#: src/prefs_matcher.c:404 src/summaryview.c:6532
 msgid "Deleted"
 msgstr "Borrado"
 
-#: src/prefs_matcher.c:395
+#: src/prefs_matcher.c:405
 msgid "Replied"
 msgstr "Respondido"
 
-#: src/prefs_matcher.c:396 src/summaryview.c:6479
+#: src/prefs_matcher.c:406 src/summaryview.c:6526
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: src/prefs_matcher.c:398 src/summaryview.c:6469 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6516 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Basura"
 
-#: src/prefs_matcher.c:399
+#: src/prefs_matcher.c:409
 msgid "Has attachment"
 msgstr "Tiene adjunto"
 
-#: src/prefs_matcher.c:400 src/summaryview.c:6505
+#: src/prefs_matcher.c:410 src/summaryview.c:6552
 msgid "Signed"
 msgstr "Firmado"
 
-#: src/prefs_matcher.c:404
+#: src/prefs_matcher.c:414
 msgid "set"
 msgstr "establecido"
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:415
 msgid "not set"
 msgstr "no establecido"
 
-#: src/prefs_matcher.c:409
+#: src/prefs_matcher.c:419
 msgid "yes"
 msgstr "si"
 
-#: src/prefs_matcher.c:410
+#: src/prefs_matcher.c:420
 msgid "no"
 msgstr "no"
 
-#: src/prefs_matcher.c:414
+#: src/prefs_matcher.c:424
 msgid "Any tags"
 msgstr "Cualquier etiqueta"
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:425
 msgid "Specific tag"
 msgstr "Etiqueta específica"
 
-#: src/prefs_matcher.c:419
+#: src/prefs_matcher.c:429
 msgid "ignored"
 msgstr "ignorado"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:430
 msgid "not ignored"
 msgstr "no ignorado"
 
-#: src/prefs_matcher.c:421
+#: src/prefs_matcher.c:431
 msgid "watched"
 msgstr "observado"
 
-#: src/prefs_matcher.c:422
+#: src/prefs_matcher.c:432
 msgid "not watched"
 msgstr "no observado"
 
-#: src/prefs_matcher.c:426
+#: src/prefs_matcher.c:436
 msgid "found"
 msgstr "encontrado"
 
-#: src/prefs_matcher.c:427
+#: src/prefs_matcher.c:437
 msgid "not found"
 msgstr "no encontrado"
 
-#: src/prefs_matcher.c:431
+#: src/prefs_matcher.c:441
 msgid "0 (Passed)"
 msgstr "0 (Pasado)"
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:442
 msgid "non-0 (Failed)"
 msgstr "no-0 (Fallido)"
 
-#: src/prefs_matcher.c:568
+#: src/prefs_matcher.c:579
 msgid "Condition configuration"
 msgstr "Configuración de la condición"
 
-#: src/prefs_matcher.c:612
+#: src/prefs_matcher.c:623
 msgid "Match criteria"
 msgstr "Criterio de búsqueda"
 
-#: src/prefs_matcher.c:621
+#: src/prefs_matcher.c:632
 msgid "All messages"
 msgstr "Todos los mensajes"
 
-#: src/prefs_matcher.c:623
+#: src/prefs_matcher.c:634
 msgid "Age"
 msgstr "Edad"
 
-#: src/prefs_matcher.c:624
+#: src/prefs_matcher.c:635
 msgid "Phrase"
 msgstr "Frase"
 
-#: src/prefs_matcher.c:625
+#: src/prefs_matcher.c:636
 msgid "Flags"
 msgstr "Marcas"
 
-#: src/prefs_matcher.c:626 src/prefs_msg_colors.c:341
+#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:341
 msgid "Color labels"
 msgstr "Colores"
 
-#: src/prefs_matcher.c:627
+#: src/prefs_matcher.c:638
 msgid "Thread"
 msgstr "Hilo"
 
-#: src/prefs_matcher.c:630
+#: src/prefs_matcher.c:641
 msgid "Partially downloaded"
 msgstr "Parcialmente descargado"
 
-#: src/prefs_matcher.c:633
+#: src/prefs_matcher.c:644
 msgid "External program test"
 msgstr "Prueba con un programa externo"
 
-#: src/prefs_matcher.c:705 src/prefs_matcher.c:1613 src/prefs_matcher.c:1628
-#: src/prefs_matcher.c:2515
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1654 src/prefs_matcher.c:1669
+#: src/prefs_matcher.c:2579
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Todos"
 
-#: src/prefs_matcher.c:739
+#: src/prefs_matcher.c:749
 msgid "Use regexp"
 msgstr "Usar exp.reg."
 
-#: src/prefs_matcher.c:815
+#: src/prefs_matcher.c:840
 msgid "Message must match"
 msgstr "El mensaje debe cumplir"
 
-#: src/prefs_matcher.c:819
+#: src/prefs_matcher.c:844
 msgid "at least one"
 msgstr "al menos una de"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:845
 msgid "all"
 msgstr "todas"
 
-#: src/prefs_matcher.c:823
+#: src/prefs_matcher.c:848
 msgid "of above rules"
 msgstr "las reglas anteriores"
 
-#: src/prefs_matcher.c:1531 src/prefs_matcher.c:1597
+#: src/prefs_matcher.c:1560 src/prefs_matcher.c:1638
 msgid "Search pattern is not set."
 msgstr "No se estableció el patrón de búsqueda."
 
-#: src/prefs_matcher.c:1540
+#: src/prefs_matcher.c:1574
+msgid "Invalid hour."
+msgstr "Hora inválida."
+
+#: src/prefs_matcher.c:1583
 msgid "Test command is not set."
 msgstr "No se estableció la orden de prueba."
 
-#: src/prefs_matcher.c:1614
+#: src/prefs_matcher.c:1655
 msgid "all addresses in all headers"
 msgstr "todas las direcciones en todas las cabeceras"
 
-#: src/prefs_matcher.c:1617
+#: src/prefs_matcher.c:1658
 msgid "any address in any header"
 msgstr "cualquier dirección en cualquier cabecera"
 
-#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:1660
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "la(s) dirección(es) en la cabecera «%s»"
 
-#: src/prefs_matcher.c:1620
+#: src/prefs_matcher.c:1661
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16403,83 +16494,87 @@ 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:1839
+#: src/prefs_matcher.c:1880
 msgid "Headers part"
 msgstr "Sección cabeceras"
 
-#: src/prefs_matcher.c:1843
+#: src/prefs_matcher.c:1884
 msgid "Headers values"
 msgstr "Valores de cabeceras"
 
-#: src/prefs_matcher.c:1847
+#: src/prefs_matcher.c:1888
 msgid "Body part"
 msgstr "Sección cuerpo"
 
-#: src/prefs_matcher.c:1851
+#: src/prefs_matcher.c:1892
 msgid "Whole message"
 msgstr "Mensaje completo"
 
-#: src/prefs_matcher.c:1964 src/prefs_matcher.c:2006
+#: src/prefs_matcher.c:2009 src/prefs_matcher.c:2055
 msgid "in"
 msgstr "en"
 
-#: src/prefs_matcher.c:1966
+#: src/prefs_matcher.c:2011
 msgid "content is"
 msgstr "contenido es"
 
-#: src/prefs_matcher.c:1975
+#: src/prefs_matcher.c:2015
+msgid "Date is"
+msgstr "Fecha es"
+
+#: src/prefs_matcher.c:2026
 msgid "Age is"
 msgstr "Edad es"
 
-#: src/prefs_matcher.c:1980
+#: src/prefs_matcher.c:2031
 msgid "Flag"
 msgstr "Marca"
 
-#: src/prefs_matcher.c:1981 src/prefs_matcher.c:1996
+#: src/prefs_matcher.c:2032 src/prefs_matcher.c:2046
 msgid "is"
 msgstr "es"
 
-#: src/prefs_matcher.c:1986
+#: src/prefs_matcher.c:2037
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:2045
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/prefs_matcher.c:2001
+#: src/prefs_matcher.c:2050
 msgid "Value:"
 msgstr "Valor:"
 
-#: src/prefs_matcher.c:2016
+#: src/prefs_matcher.c:2065
 msgid "Score is"
 msgstr "Puntuación es"
 
-#: src/prefs_matcher.c:2017
+#: src/prefs_matcher.c:2066
 msgid "points"
 msgstr "puntos"
 
-#: src/prefs_matcher.c:2027
+#: src/prefs_matcher.c:2076
 msgid "Size is"
 msgstr "Tamaño es"
 
-#: src/prefs_matcher.c:2032
+#: src/prefs_matcher.c:2081
 msgid "Scope:"
 msgstr "Alcance:"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2083
 msgid "tags"
 msgstr "etiquetas"
 
-#: src/prefs_matcher.c:2039
+#: src/prefs_matcher.c:2088
 msgid "type is"
 msgstr "tipo es"
 
-#: src/prefs_matcher.c:2043
+#: src/prefs_matcher.c:2092
 msgid "Program returns"
 msgstr "El programa devuelve"
 
-#: src/prefs_matcher.c:2113
+#: src/prefs_matcher.c:2162
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16487,11 +16582,11 @@ msgstr ""
 "La entrada no fue guardada.\n"
 "¿Cerrar igualmente?"
 
-#: src/prefs_matcher.c:2180
+#: src/prefs_matcher.c:2229
 msgid "Match Type: 'Test'"
 msgstr "Tipo de coincidencia: «Probar»"
 
-#: src/prefs_matcher.c:2181
+#: src/prefs_matcher.c:2230
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -16503,7 +16598,7 @@ msgstr ""
 "\n"
 "Se pueden usar los siguientes símbolos:"
 
-#: src/prefs_matcher.c:2280
+#: src/prefs_matcher.c:2329
 msgid "Current condition rules"
 msgstr "Reglas de condición actuales"
 
@@ -16587,7 +16682,7 @@ msgstr "Tratar estos caracteres como marcas de cita"
 msgid "Text Options"
 msgstr "Opciones de texto"
 
-#: src/prefs_migration.c:50
+#: src/prefs_migration.c:51
 #, c-format
 msgid ""
 "Your Claws Mail configuration is from a newer version than the version which "
@@ -16608,7 +16703,7 @@ msgstr ""
 "\n"
 "¿Quiere salir ahora?"
 
-#: src/prefs_migration.c:59
+#: src/prefs_migration.c:60
 msgid "Configuration warning"
 msgstr "Aviso de configuración"
 
@@ -16697,7 +16792,7 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Elegir el color para las firmas"
 
-#: src/prefs_msg_colors.c:311 src/prefs_summaries.c:365
+#: src/prefs_msg_colors.c:311 src/prefs_summaries.c:377
 msgid "Folder list"
 msgstr "Lista de carpetas"
 
@@ -16801,15 +16896,15 @@ msgstr "Elegir el color para el «color %d»"
 msgid "Colors"
 msgstr "Colores"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:108
 msgid "Choose preset keyboard shortcuts"
 msgstr "Elegir configuración de atajos de teclado"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:122
 msgid "Select preset:"
 msgstr "Seleccionar combinación:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:137
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16817,35 +16912,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:492
+#: src/prefs_other.c:494
 msgid "Add address to destination when double-clicked"
 msgstr "Añadir la dirección al destino con doble clic"
 
-#: src/prefs_other.c:495
+#: src/prefs_other.c:497
 msgid "On exit"
 msgstr "Al salir"
 
-#: src/prefs_other.c:498
+#: src/prefs_other.c:500
 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 
-#: src/prefs_other.c:505
+#: src/prefs_other.c:507
 msgid "Empty trash on exit"
 msgstr "Vaciar la papelera al salir"
 
-#: src/prefs_other.c:508
+#: src/prefs_other.c:510
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 
-#: src/prefs_other.c:510
+#: src/prefs_other.c:512
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: src/prefs_other.c:513
+#: src/prefs_other.c:515
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Habilitar los atajos de teclado configurables"
 
-#: src/prefs_other.c:516
+#: src/prefs_other.c:518
 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"
@@ -16856,15 +16951,15 @@ msgstr ""
 "de teclas.\n"
 "Desmarque esta opción si quiere bloquear todos los atajos existentes."
 
-#: src/prefs_other.c:523
+#: src/prefs_other.c:525
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Seleccionar configuración de atajos de teclado..."
 
-#: src/prefs_other.c:533
+#: src/prefs_other.c:535
 msgid "Metadata handling"
 msgstr "Gestión de metadatos"
 
-#: src/prefs_other.c:534
+#: src/prefs_other.c:536
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16873,33 +16968,45 @@ msgstr ""
 "metadatos;\n"
 "Evita la pérdida de datos en caso de caídas pero puede llevar cierto tiempo."
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:540
 msgid "Safer"
 msgstr "Más seguro"
 
-#: src/prefs_other.c:540
+#: src/prefs_other.c:542
 msgid "Faster"
 msgstr "Más rápido"
 
-#: src/prefs_other.c:558
+#: src/prefs_other.c:560
 msgid "Socket I/O timeout"
 msgstr "Tiempo límite de E/S del conector"
 
-#: src/prefs_other.c:579
+#: src/prefs_other.c:581
+msgid "Translate header names"
+msgstr "Traducir nombres de cabeceras"
+
+#: src/prefs_other.c:583
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"Las cabeceras estándar mostradas (como «From:», «Subject:») serán traducidas "
+"a su idioma."
+
+#: src/prefs_other.c:586
 msgid "Ask before emptying trash"
 msgstr "Preguntar antes de vaciar la papelera"
 
-#: src/prefs_other.c:581
+#: src/prefs_other.c:588
 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:586
+#: src/prefs_other.c:593
 msgid "Use secure file deletion if possible"
 msgstr "Usar borrado de ficheros seguro si es posible"
 
-#: src/prefs_other.c:590
+#: src/prefs_other.c:597
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16907,7 +17014,7 @@ msgstr ""
 "Usar borrado de ficheros seguro si es posible\n"
 "(el programa «shred» no está disponible)"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:602
 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."
@@ -16916,19 +17023,19 @@ msgstr ""
 "aleatorios antes de borrarlos. Esto ralentiza el borrado. Asegúrese de leer "
 "las implicaciones en la página del manual de shred."
 
-#: src/prefs_other.c:599
+#: src/prefs_other.c:606
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronizar carpetas sin conexión tan pronto como sea posible"
 
-#: src/prefs_other.c:602
+#: src/prefs_other.c:609
 msgid "Master passphrase"
 msgstr "Contraseña maestra"
 
-#: src/prefs_other.c:605
+#: src/prefs_other.c:612
 msgid "Use a master passphrase"
 msgstr "Utilizar una contraseña maestra"
 
-#: src/prefs_other.c:608
+#: src/prefs_other.c:615
 msgid ""
 "If checked, your saved account passwords will be protected by a master "
 "passphrase. If no master passphrase is set, you will be prompted to set one."
@@ -16936,15 +17043,15 @@ msgstr ""
 "Si se activa, las contraseñas guardadas de sus cuentas estarán protegidas "
 "por una contraseña maestra. Si no se establece ninguna se le solicitará una."
 
-#: src/prefs_other.c:613
+#: src/prefs_other.c:620
 msgid "Change master passphrase"
 msgstr "Cambiar la contraseña maestra"
 
-#: src/prefs_other.c:773
+#: src/prefs_other.c:785
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: src/prefs_proxy.c:240 src/prefs_receive.c:413 src/prefs_send.c:419
+#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
 msgid "Mail Handling"
 msgstr "Manejo de correo"
 
@@ -16952,68 +17059,68 @@ msgstr "Manejo de correo"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "El %d\\n%f escribió:\\n\\n%q"
 
-#: src/prefs_receive.c:143
+#: src/prefs_receive.c:145
 msgid "External incorporation program"
 msgstr "Programa externo para incorporación"
 
-#: src/prefs_receive.c:146
+#: src/prefs_receive.c:148
 msgid "Use external program for receiving mail"
 msgstr "Usar un programa externo para recibir correo"
 
-#: src/prefs_receive.c:213
+#: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
 msgstr "Comprobar si hay correo nuevo al inicio"
 
-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:218
 msgid "Dialogs"
 msgstr "Diálogos"
 
-#: src/prefs_receive.c:218
+#: src/prefs_receive.c:220
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_receive.c:228
+#: src/prefs_receive.c:230
 msgid "Only on manual receiving"
 msgstr "Sólo al recibir manualmente"
 
-#: src/prefs_receive.c:239
+#: src/prefs_receive.c:241
 msgid "Close receive dialog when finished"
 msgstr "Cerrar el diálogo de recepción al finalizar"
 
-#: src/prefs_receive.c:242
+#: src/prefs_receive.c:244
 msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar diálogo de error si hay error de recepción"
 
-#: src/prefs_receive.c:245
+#: src/prefs_receive.c:247
 msgid "After receiving new mail"
 msgstr "Después de recibir correo nuevo"
 
-#: src/prefs_receive.c:247
+#: src/prefs_receive.c:249
 msgid "Go to Inbox"
 msgstr "Ir a Entrada"
 
-#: src/prefs_receive.c:249
+#: src/prefs_receive.c:251
 msgid "Update all local folders"
 msgstr "Actualizar todas las carpetas locales"
 
-#: src/prefs_receive.c:251
+#: src/prefs_receive.c:253
 msgid "Run command"
 msgstr "Ejecutar una orden"
 
-#: src/prefs_receive.c:256
+#: src/prefs_receive.c:258
 msgid "after automatic check"
 msgstr "después de la comprobación automática"
 
-#: src/prefs_receive.c:258
+#: src/prefs_receive.c:260
 msgid "after manual check"
 msgstr "después de la comprobación manual"
 
-#: src/prefs_receive.c:278
+#: src/prefs_receive.c:280
 #, c-format
 msgid "Use %d as number of new mails"
 msgstr "Use %d como n.º de mensajes nuevos"
 
-#: src/prefs_receive.c:414
+#: src/prefs_receive.c:416
 msgid "Receiving"
 msgstr "Recepción"
 
@@ -17185,8 +17292,8 @@ msgstr ""
 "Especificar la codificación de envío (Content-Transfer-Encoding) usada "
 "cuando el cuerpo del mensaje contiene caracteres no-ASCII"
 
-#: src/prefs_send.c:420 src/send_message.c:519 src/send_message.c:523
-#: src/send_message.c:528
+#: src/prefs_send.c:420 src/send_message.c:520 src/send_message.c:524
+#: src/send_message.c:529
 msgid "Sending"
 msgstr "Enviando"
 
@@ -17238,241 +17345,252 @@ msgstr "Elegir color de los fallos ortográficos. Usar negro para subrayar"
 msgid "Spell Checking"
 msgstr "Corrección ortográfica"
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:166
 msgid "the abbreviated weekday name"
 msgstr "el día la semana abreviado"
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:167
 msgid "the full weekday name"
 msgstr "el día de la semana completo"
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:168
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:169
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:170
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:171
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:172
 msgid "the day of the month as a decimal number"
 msgstr "el día del mes como número decimal"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:173
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:174
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:175
 msgid "the day of the year as a decimal number"
 msgstr "el día del año como número decimal"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:176
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:177
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:178
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:179
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:180
 msgid "the day of the week as a decimal number"
 msgstr "el día de la semana como número decimal"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:181
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:182
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:183
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:184
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
-#: src/prefs_summaries.c:200 src/prefs_summaries.c:248
-#: src/prefs_summaries.c:565
+#: src/prefs_summaries.c:205 src/prefs_summaries.c:253
+#: src/prefs_summaries.c:465
 msgid "Date format"
 msgstr "Formato de fecha"
 
-#: src/prefs_summaries.c:224
+#: src/prefs_summaries.c:229
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_summaries.c:266
+#: src/prefs_summaries.c:271
 msgid "Example"
 msgstr "Ejemplo"
 
-#: src/prefs_summaries.c:371
+#: src/prefs_summaries.c:397
 msgid "Display message count next to folder name"
 msgstr "Ver el número de mensajes junto al nombre de la carpeta"
 
-#: src/prefs_summaries.c:381
+#: src/prefs_summaries.c:407
 msgid "Unread messages"
 msgstr "Mensajes sin leer"
 
-#: src/prefs_summaries.c:382
+#: src/prefs_summaries.c:408
 msgid "Unread and Total messages"
 msgstr "Mensajes sin leer y totales"
 
-#: src/prefs_summaries.c:392
+#: src/prefs_summaries.c:414
 msgid "Open last opened folder at start-up"
 msgstr "Abrir la última carpeta abierta al inicio"
 
-#: src/prefs_summaries.c:395
+#: src/prefs_summaries.c:421
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nombres de grupo con más de"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:434
 msgid "letters"
 msgstr "letras"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:442
 msgid "Message list"
 msgstr "Lista de mensajes"
 
-#: src/prefs_summaries.c:432
-msgid "Sort new folders by"
-msgstr "Ordenar las carpetas nuevas por"
-
-#: src/prefs_summaries.c:440 src/prefs_summary_column.c:85
-msgid "Number"
-msgstr "Número"
-
-#: src/prefs_summaries.c:443
-msgid "Thread date"
-msgstr "Fecha del hilo"
-
-#: src/prefs_summaries.c:454
-msgid "Don't sort"
-msgstr "No ordenar"
-
-#: src/prefs_summaries.c:471
-msgid "Set default selection when entering a folder"
-msgstr "Establecer la selección predeterminada al entrar en una carpeta"
+#: src/prefs_summaries.c:459
+msgid "Lock column headers"
+msgstr "Bloquear las cabeceras de las columnas"
 
 #: src/prefs_summaries.c:484
-msgid "Show \"no unread (or new) message\" dialog"
-msgstr "Mostrar el diálogo de «No hay mensajes sin leer (o nuevos)»"
-
-#: src/prefs_summaries.c:494
-msgid "Assume 'Yes'"
-msgstr "Asumir «Sí»"
+msgid "Date format help"
+msgstr "Ayuda del formato de fecha"
 
-#: src/prefs_summaries.c:495
-msgid "Assume 'No'"
-msgstr "Asumir «No»"
+#: src/prefs_summaries.c:490
+msgid "Set message selection when entering a folder"
+msgstr "Establecer el mensaje seleccionado al entrar en una carpeta"
 
-#: src/prefs_summaries.c:500
+#: src/prefs_summaries.c:499
 msgid "Open message when selected"
 msgstr "Abrir el mensaje cuando se seleccione"
 
-#: src/prefs_summaries.c:505
+#: src/prefs_summaries.c:504
 msgid "When opening a folder"
 msgstr "Al abrir una carpeta"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:506
 msgid "When displaying search results"
 msgstr "Al mostrar los resultados de una búsqueda"
 
-#: src/prefs_summaries.c:509
+#: src/prefs_summaries.c:508
 msgid "When selecting next or previous message using shortcuts"
 msgstr "Al seleccionar el mensaje anterior o siguiente usando atajos"
 
-#: src/prefs_summaries.c:511
+#: src/prefs_summaries.c:510
 msgid "When deleting or moving messages"
 msgstr "Al borrar o mover mensajes"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:512
 msgid "When using directional keys"
 msgstr "Al usar las teclas de dirección"
 
-#: src/prefs_summaries.c:517
-msgid "Thread using subject in addition to standard headers"
-msgstr "Jerarquizar usando el asunto además de las cabeceras estándar"
-
-#: src/prefs_summaries.c:521
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
-
-#: src/prefs_summaries.c:523
-msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/"
-"Execute'"
-msgstr ""
-"Pospone los movimientos, copiados y borrados de mensajes hasta que se "
-"seleccione «Herramientas/Ejecutar»"
-
-#: src/prefs_summaries.c:526
+#: src/prefs_summaries.c:514
 msgid "Mark message as read"
 msgstr "Marcar el mensaje como leído"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:517
 msgid "when selected, after"
 msgstr "al seleccionarlo, después de"
 
-#: src/prefs_summaries.c:548
+#: src/prefs_summaries.c:536
 msgid "only when opened in a new window, or replied to"
 msgstr "sólo al abrirlo en una ventana nueva, o al responderlo"
 
-#: src/prefs_summaries.c:555
+#: src/prefs_summaries.c:546
+msgid "Show \"no unread (or new) message\" dialog"
+msgstr "Mostrar el diálogo de «No hay mensajes sin leer (o nuevos)»"
+
+#: src/prefs_summaries.c:556
+msgid "Assume 'Yes'"
+msgstr "Asumir «Sí»"
+
+#: src/prefs_summaries.c:557
+msgid "Assume 'No'"
+msgstr "Asumir «No»"
+
+#: src/prefs_summaries.c:563
 msgid "Display sender using address book"
 msgstr "Mostrar remitente usando la agenda"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:567
+msgid "Thread using subject in addition to standard headers"
+msgstr "Jerarquizar usando el asunto además de las cabeceras estándar"
+
+#: src/prefs_summaries.c:571
+msgid "Execute immediately when moving or deleting messages"
+msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
+
+#: src/prefs_summaries.c:573
+msgid ""
+"When unchecked moving, copying and deleting of messages is deferred until "
+"you use 'Tools/Execute'"
+msgstr ""
+"Si está desactivado los movimientos, copiados y borrados de mensajes se "
+"posponen hasta que se utilice «Herramientas/Ejecutar»"
+
+#: src/prefs_summaries.c:578
+msgid "Confirm when marking all messages as read or unread"
+msgstr "Confirmar al marcar todos los correos como leídos o no leídos"
+
+#: src/prefs_summaries.c:581
+msgid "Confirm when changing color labels"
+msgstr "Confirmar al cambiar las etiquetas de los colores"
+
+#: src/prefs_summaries.c:585
 msgid "Show tooltips"
 msgstr "Mostrar ayudas de herramienta"
 
-#: src/prefs_summaries.c:584
-msgid "Date format help"
-msgstr "Ayuda del formato de fecha"
+#: src/prefs_summaries.c:595 src/quote_fmt.c:539
+msgid "Defaults"
+msgstr "Predeterminados"
 
-#: src/prefs_summaries.c:602
-msgid "Confirm before marking all messages in a folder as read or unread"
-msgstr "Confirmar antes de marcar todos los correos en una carpeta como "
-"leídos o no leídos"
+#: src/prefs_summaries.c:597
+msgid "New folders"
+msgstr "Carpetas nuevas"
 
-#: src/prefs_summaries.c:605
-msgid "Confirm before overriding color label of messages"
-msgstr "Confirmar antes de sobreescribir el color de los mensajes"
+#: src/prefs_summaries.c:603
+msgid "Sort by"
+msgstr "Ordenar por"
 
-#: src/prefs_summaries.c:608
-msgid "Translate header names"
-msgstr "Traducir nombres de cabeceras"
+#: src/prefs_summaries.c:611 src/prefs_summary_column.c:85
+msgid "Number"
+msgstr "Número"
 
-#: src/prefs_summaries.c:610
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"Las cabeceras estándar mostradas (como «From:», «Subject:») serán traducidas "
-"a su idioma."
+#: src/prefs_summaries.c:614
+msgid "Thread date"
+msgstr "Fecha del hilo"
+
+#: src/prefs_summaries.c:625
+msgid "Don't sort"
+msgstr "No ordenar"
 
-#: src/prefs_summaries.c:774
+#: src/prefs_summaries.c:640
+msgid "Thread view"
+msgstr "Vista jerárquica"
+
+#: src/prefs_summaries.c:643
+msgid "Collapse all threads"
+msgstr "Colapsar todos los hilos"
+
+#: src/prefs_summaries.c:649
+msgid "Hide read messages"
+msgstr "Ocultar los mensajes leídos"
+
+#: src/prefs_summaries.c:831
 msgid "Summaries"
 msgstr "Resúmenes"
 
@@ -17525,16 +17643,16 @@ msgid "newest unread email"
 msgstr "el correo no leído más reciente"
 
 #: src/prefs_summary_open.c:188
-msgid " Selection when entering a folder"
-msgstr " Selección al entrar en una carpeta"
+msgid "Message selection when entering a folder"
+msgstr "Selección de mensaje al entrar en una carpeta"
 
 #: src/prefs_summary_open.c:233
-msgid "Possible selections"
-msgstr "Selecciones posibles"
+msgid "Available selections"
+msgstr "Selecciones disponibles"
 
 #: src/prefs_summary_open.c:268
-msgid "Selection on folder opening"
-msgstr "Selección al abrir una carpeta"
+msgid "Current selections"
+msgstr "Selecciones actuales"
 
 #: src/prefs_template.c:80
 msgid "This name is used as the Menu item"
@@ -17652,33 +17770,29 @@ msgstr "Plantillas actuales"
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_themes.c:400 src/prefs_themes.c:841
+#: src/prefs_themes.c:401 src/prefs_themes.c:841
 msgid "Default internal theme"
 msgstr "Tema interno predeterminado"
 
-#: src/prefs_themes.c:422
+#: src/prefs_themes.c:423
 msgid "Themes"
 msgstr "Temas"
 
-#: src/prefs_themes.c:501
-msgid "Only root can remove system themes"
-msgstr "Sólo el administrador (root) puede eliminar temas globales"
-
-#: src/prefs_themes.c:504
+#: src/prefs_themes.c:500
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Eliminar el tema global «%s»"
 
-#: src/prefs_themes.c:507
+#: src/prefs_themes.c:502
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Eliminar tema «%s»"
 
-#: src/prefs_themes.c:513
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "¿Está seguro de que quiere borrar este tema?"
 
-#: src/prefs_themes.c:523
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17687,40 +17801,40 @@ msgstr ""
 "Error en el fichero %s\n"
 "al eliminar el tema."
 
-#: src/prefs_themes.c:527
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "Falló la eliminación del directorio del tema."
 
-#: src/prefs_themes.c:530
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "Tema eliminado con éxito"
 
-#: src/prefs_themes.c:550
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Seleccionar carpeta del tema"
 
-#: src/prefs_themes.c:565
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Instalar tema «%s»"
 
-#: src/prefs_themes.c:568
+#: src/prefs_themes.c:562
 msgid ""
-"This folder doesn't seem to be a theme folder.\n"
+"This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
 msgstr ""
 "Esta carpeta no parece una carpeta de un tema.\n"
 "¿Instalar de todas maneras?"
 
-#: src/prefs_themes.c:575
+#: src/prefs_themes.c:572
 msgid "Do you want to install theme for all users?"
 msgstr "¿Quiere instalar el tema para todos los usuarios?"
 
-#: src/prefs_themes.c:595
+#: src/prefs_themes.c:592
 msgid "Theme exists"
 msgstr "El tema ya existe"
 
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:593
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17732,12 +17846,12 @@ msgstr ""
 "\n"
 "¿Desea reemplazarlo?"
 
-#: src/prefs_themes.c:602
+#: src/prefs_themes.c:600
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "No se puede borrar el tema existente en %s."
 
-#: src/prefs_themes.c:610
+#: src/prefs_themes.c:609
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "No se puede crear el directorio de destino %s."
@@ -17930,35 +18044,35 @@ msgstr "Recortar texto a"
 msgid "Wrapping"
 msgstr "Recorte de líneas"
 
-#: src/printing.c:434
+#: src/printing.c:430
 msgid "Print preview"
 msgstr "Previsualizar impresión"
 
-#: src/printing.c:477
+#: src/printing.c:473
 msgid "First page"
 msgstr "Primera página"
 
-#: src/printing.c:487
+#: src/printing.c:483
 msgid "Last page"
 msgstr "Última página"
 
-#: src/printing.c:493
+#: src/printing.c:489
 msgid "Zoom 100%"
 msgstr "Aumento 100%"
 
-#: src/printing.c:495
+#: src/printing.c:491
 msgid "Zoom fit"
 msgstr "Aumento ajustado"
 
-#: src/printing.c:497
+#: src/printing.c:493
 msgid "Zoom in"
 msgstr "Aumentar"
 
-#: src/printing.c:499
+#: src/printing.c:495
 msgid "Zoom out"
 msgstr "Disminuir"
 
-#: src/printing.c:698
+#: src/printing.c:675
 #, c-format
 msgid "Page %d"
 msgstr "Página %d"
@@ -17971,28 +18085,28 @@ msgstr "No hay información disponible"
 msgid "No recipient keys defined."
 msgstr "No se definió ninguna clave para el destinatario."
 
-#: src/procmime.c:438 src/procmime.c:440 src/procmime.c:441
+#: src/procmime.c:401 src/procmime.c:403 src/procmime.c:404
 msgid "[Error decoding BASE64]\n"
 msgstr "[Error decodificando BASE64]\n"
 
-#: src/procmsg.c:937 src/procmsg.c:940
+#: src/procmsg.c:935 src/procmsg.c:938
 msgid "Already trying to send."
 msgstr "Ya se está intentando enviar."
 
-#: src/procmsg.c:1558 src/procmsg.c:1619
+#: src/procmsg.c:1562 src/procmsg.c:1623
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "No se puede abrir el fichero %s."
 
-#: src/procmsg.c:1629
+#: src/procmsg.c:1633
 msgid "Queued message header is broken."
 msgstr "La cabecera del mensaje en cola está corrupta."
 
-#: src/procmsg.c:1649
+#: src/procmsg.c:1653
 msgid "An error happened during SMTP session."
 msgstr "Hubo algún error durante la sesión SMTP."
 
-#: src/procmsg.c:1663
+#: src/procmsg.c:1667
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -18000,7 +18114,7 @@ msgstr ""
 "No se encontró una cuenta específica para enviar, y hubo un error durante la "
 "sesión SMTP."
 
-#: src/procmsg.c:1671
+#: src/procmsg.c:1675
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -18008,20 +18122,20 @@ msgstr ""
 "No se pudo determinar la información de envío. Quizás el correo no se generó "
 "con Claws Mail."
 
-#: src/procmsg.c:1694
+#: src/procmsg.c:1698
 msgid "Couldn't create temporary file for news sending."
 msgstr "No se pudo crear el fichero temporal para enviar noticias."
 
-#: src/procmsg.c:1707
+#: src/procmsg.c:1711
 msgid "Error when writing temporary file for news sending."
 msgstr "Error al escribir el fichero temporal para enviar noticias."
 
-#: src/procmsg.c:1721
+#: src/procmsg.c:1725
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Ocurrió un error mientras se enviaba el mensaje a %s."
 
-#: src/procmsg.c:2273
+#: src/procmsg.c:2285
 msgid "Filtering messages...\n"
 msgstr "Filtrando mensajes...\n"
 
@@ -18308,10 +18422,6 @@ msgstr ""
 "Sobreescribir la cabecera «Desde». Esto no cambia la cuenta usada para "
 "reenviar."
 
-#: src/quote_fmt.c:539
-msgid "Defaults"
-msgstr "Predeterminados"
-
 #: src/quote_fmt.c:557
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
@@ -18332,97 +18442,97 @@ msgstr "El campo «Marca de cita» de la plantilla «Responder» es inválido."
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr "El campo «Marca de cita» de la plantilla «Reenviar» es inválido."
 
-#: src/quote_fmt_parse.y:543
+#: src/quote_fmt_parse.y:544
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Introducir texto para sustituir «%s»"
 
-#: src/quote_fmt_parse.y:544
+#: src/quote_fmt_parse.y:545
 msgid "Enter variable"
 msgstr "Introducir variable"
 
-#: src/send_message.c:153
+#: src/send_message.c:154
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando mensaje usando la orden: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:168
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "No se pudo ejecutar la orden: %s"
 
-#: src/send_message.c:203
+#: src/send_message.c:204
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ha habido un error ejecutando la orden: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:353
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:357
+#: src/send_message.c:358
 msgid "Doing POP before SMTP..."
 msgstr "Haciendo POP antes de SMTP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:361
 msgid "POP before SMTP"
 msgstr "POP antes de SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:366
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor SMTP: %s:%d..."
 
-#: src/send_message.c:438
+#: src/send_message.c:439
 msgid "Mail sent successfully."
 msgstr "Correo enviado con éxito."
 
-#: src/send_message.c:504
+#: src/send_message.c:505
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:505 src/send_message.c:510 src/send_message.c:515
+#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
 msgid "Authenticating"
 msgstr "Autenticándose"
 
-#: src/send_message.c:506 src/send_message.c:511
+#: src/send_message.c:507 src/send_message.c:512
 msgid "Sending message..."
 msgstr "Enviando mensaje..."
 
-#: src/send_message.c:509
+#: src/send_message.c:510
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:518
+#: src/send_message.c:519
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:522
+#: src/send_message.c:523
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:527
+#: src/send_message.c:528
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:531
+#: src/send_message.c:532
 msgid "Quitting..."
 msgstr "Saliendo..."
 
-#: src/send_message.c:560
+#: src/send_message.c:561
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: src/send_message.c:613
+#: src/send_message.c:614
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: src/send_message.c:682 src/send_message.c:702
+#: src/send_message.c:683 src/send_message.c:703
 msgid "Error occurred while sending the message."
 msgstr "Ocurrió un error enviando los mensajes."
 
-#: src/send_message.c:685
+#: src/send_message.c:686
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18447,346 +18557,358 @@ msgstr ""
 "si ya lo tiene.\n"
 "Si no está seguro, seleccione Aceptar."
 
-#: src/sourcewindow.c:64
+#: src/sourcewindow.c:65
 msgid "Source of the message"
 msgstr "Fuente del mensaje"
 
-#: src/sourcewindow.c:159
+#: src/sourcewindow.c:160
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Fuente"
 
-#: src/ssl_manager.c:156
+#: src/ssl_manager.c:131
+msgid "Expiry"
+msgstr "Caducidad"
+
+#: src/ssl_manager.c:183
 msgid "Saved SSL/TLS certificates"
 msgstr "Certificados SSL/TLS guardados"
 
-#: src/ssl_manager.c:406
+#: src/ssl_manager.c:463
 msgid "Delete certificate"
 msgstr "Eliminar certificado"
 
-#: src/ssl_manager.c:407
+#: src/ssl_manager.c:464
 msgid "Do you really want to delete this certificate?"
 msgstr "¿Quiere borrar realmente este certificado?"
 
-#: src/summary_search.c:292
+#: src/summary_search.c:290
 msgid "Search messages"
 msgstr "Buscar en los mensajes"
 
-#: src/summary_search.c:314
+#: src/summary_search.c:312
 msgid "Match any of the following"
 msgstr "Coincidir con alguno de los siguientes"
 
-#: src/summary_search.c:316
+#: src/summary_search.c:314
 msgid "Match all of the following"
 msgstr "Coincidir con todos los siguientes"
 
-#: src/summary_search.c:437
+#: src/summary_search.c:435
 msgid "Body:"
 msgstr "Cuerpo:"
 
-#: src/summary_search.c:444
+#: src/summary_search.c:442
 msgid "Condition:"
 msgstr "Condición:"
 
-#: src/summary_search.c:478
+#: src/summary_search.c:476
 msgid "Find _all"
 msgstr "Encontrar _todos"
 
-#: src/summary_search.c:693 src/summaryview.c:1092 src/summaryview.c:1354
+#: src/summary_search.c:691 src/summaryview.c:1134 src/summaryview.c:1397
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Buscando en %s...\n"
 
-#: src/summary_search.c:788
+#: src/summary_search.c:786
 msgid "Beginning of list reached; continue from end?"
 msgstr "Se llegó al principio de la lista, ¿seguir desde el final?"
 
-#: src/summary_search.c:790
+#: src/summary_search.c:788
 msgid "End of list reached; continue from beginning?"
 msgstr "Se terminó la lista, ¿comenzar desde el principio?"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:440
 msgid "Create _filter rule"
 msgstr "Crear regla de _filtrado"
 
-#: src/summaryview.c:562
+#: src/summaryview.c:453
+msgid "_Set displayed columns"
+msgstr "E_stablecer columnas visibles"
+
+#: src/summaryview.c:458
+msgid "_Lock column headers"
+msgstr "B_loquear cabeceras de columna"
+
+#: src/summaryview.c:582
 msgid "Toggle quick search bar"
 msgstr "Conmutar barra de búsqueda rápida"
 
-#: src/summaryview.c:599
+#: src/summaryview.c:619
 msgid "Toggle multiple selection"
 msgstr "Commutar la selección múltiple"
 
-#: src/summaryview.c:1282
+#: src/summaryview.c:1325
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:1283
+#: src/summaryview.c:1326
 msgid "Some marks are left. Process them?"
 msgstr "Quedan algunas marcas. ¿Procesarlas?"
 
-#: src/summaryview.c:1333
+#: src/summaryview.c:1376
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1913 src/summaryview.c:1961
+#: src/summaryview.c:1956 src/summaryview.c:2004
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1914
+#: src/summaryview.c:1957
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1926 src/summaryview.c:1974 src/summaryview.c:2011
-#: src/summaryview.c:2059 src/summaryview.c:2126
+#: src/summaryview.c:1969 src/summaryview.c:2017 src/summaryview.c:2054
+#: src/summaryview.c:2102 src/summaryview.c:2169
 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:1938
+#: src/summaryview.c:1981
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:2005
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1998 src/summaryview.c:2046
+#: src/summaryview.c:2041 src/summaryview.c:2089
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:1999
+#: src/summaryview.c:2042
 msgid "No new message found. Search from the end?"
 msgstr "No hay mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:2023
+#: src/summaryview.c:2066
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:2047
+#: src/summaryview.c:2090
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:2080 src/summaryview.c:2113
+#: src/summaryview.c:2123 src/summaryview.c:2156
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:2081
+#: src/summaryview.c:2124
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2133
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:2114
+#: src/summaryview.c:2157
 msgid "No marked message found. Go to next folder?"
 msgstr "No hay mensajes marcados. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:2147 src/summaryview.c:2176
+#: src/summaryview.c:2190 src/summaryview.c:2219
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:2148
+#: src/summaryview.c:2191
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:2157 src/summaryview.c:2190
+#: src/summaryview.c:2200 src/summaryview.c:2233
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:2177
+#: src/summaryview.c:2220
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:2494
+#: src/summaryview.c:2538
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por el asunto..."
 
-#: src/summaryview.c:2679
+#: src/summaryview.c:2723
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrado(s)"
 
-#: src/summaryview.c:2683
+#: src/summaryview.c:2727
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2684 src/summaryview.c:2691
+#: src/summaryview.c:2728 src/summaryview.c:2735
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2689
+#: src/summaryview.c:2733
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2703
+#: src/summaryview.c:2747
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " elemento seleccionado"
 msgstr[1] " elementos seleccionados"
 
-#: src/summaryview.c:2721 src/summaryview.c:2764
+#: src/summaryview.c:2765 src/summaryview.c:2808
 #, 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:2739
+#: src/summaryview.c:2783
 msgid "Message summary"
 msgstr "Resumen de mensajes"
 
-#: src/summaryview.c:2740
+#: src/summaryview.c:2784
 msgid "New:"
 msgstr "Nuevos:"
 
-#: src/summaryview.c:2741
+#: src/summaryview.c:2785
 msgid "Unread:"
 msgstr "Sin leer:"
 
-#: src/summaryview.c:2742
+#: src/summaryview.c:2786
 msgid "Total:"
 msgstr "Total:"
 
-#: src/summaryview.c:2744
+#: src/summaryview.c:2788
 msgid "Marked:"
 msgstr "Marcados:"
 
-#: src/summaryview.c:2745
+#: src/summaryview.c:2789
 msgid "Replied:"
 msgstr "Respondidos:"
 
-#: src/summaryview.c:2746
+#: src/summaryview.c:2790
 msgid "Forwarded:"
 msgstr "Reenviados:"
 
-#: src/summaryview.c:2747
+#: src/summaryview.c:2791
 msgid "Locked:"
 msgstr "Bloqueados:"
 
-#: src/summaryview.c:2748
+#: src/summaryview.c:2792
 msgid "Ignored:"
 msgstr "ignorados:"
 
-#: src/summaryview.c:2749
+#: src/summaryview.c:2793
 msgid "Watched:"
 msgstr "Observados:"
 
-#: src/summaryview.c:2759
+#: src/summaryview.c:2803
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d seleccionados (%s/%s), %d sin leer"
 
-#: src/summaryview.c:3052
+#: src/summaryview.c:3096
 msgid "Sorting summary..."
 msgstr "Ordenando el resumen..."
 
-#: src/summaryview.c:3220
+#: src/summaryview.c:3264
 msgid "Setting summary from message data..."
 msgstr "Estableciendo el resumen de los mensajes..."
 
-#: src/summaryview.c:3425
+#: src/summaryview.c:3470
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
-#: src/summaryview.c:3482
+#: src/summaryview.c:3527
 msgid "(No Recipient)"
 msgstr "(Sin destinatario)"
 
-#: src/summaryview.c:3530
+#: src/summaryview.c:3575
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Desde: %s, en %s"
 
-#: src/summaryview.c:3539
+#: src/summaryview.c:3584
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Para: %s, en %s"
 
-#: src/summaryview.c:4428
+#: src/summaryview.c:4475
 msgid "You're not the author of the article."
 msgstr "Usted no es el autor del artículo."
 
-#: src/summaryview.c:4518
+#: src/summaryview.c:4565
 #, 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:4521
+#: src/summaryview.c:4568
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Borrar mensaje"
 msgstr[1] "Borrar mensajes"
 
-#: src/summaryview.c:4685
+#: src/summaryview.c:4732
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:4740
+#: src/summaryview.c:4787
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Seleccionar la carpeta a la que mover el mensaje seleccionado"
 msgstr[1] "Seleccionar la carpeta a la que mover los mensajes seleccionados"
 
-#: src/summaryview.c:4791
+#: src/summaryview.c:4838
 msgid "Destination to copy is same as current folder."
 msgstr "El destino de copia es la carpeta actual."
 
-#: src/summaryview.c:4825
+#: src/summaryview.c:4872
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Seleccionar la carpeta a la que copiar el mensaje seleccionado"
 msgstr[1] "Seleccionar la carpeta a la que copiar los mensajes seleccionados"
 
-#: src/summaryview.c:4976
+#: src/summaryview.c:5023
 msgid "Append or Overwrite"
 msgstr "Añadir o sobreescribir"
 
-#: src/summaryview.c:4977
+#: src/summaryview.c:5024
 msgid "Append or overwrite existing file?"
 msgstr "¿Añadir o sobreescribir el fichero existente?"
 
-#: src/summaryview.c:4978
+#: src/summaryview.c:5025
 msgid "_Append"
 msgstr "_Añadir"
 
-#: src/summaryview.c:4978
+#: src/summaryview.c:5025
 msgid "_Overwrite"
 msgstr "S_obreescribir"
 
-#: src/summaryview.c:5019
+#: src/summaryview.c:5066
 #, 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:5477
+#: src/summaryview.c:5524
 msgid "Building threads..."
 msgstr "Construyendo jerarquía..."
 
-#: src/summaryview.c:5725
+#: src/summaryview.c:5772
 msgid "Skip these rules"
 msgstr "Saltarse estas reglas"
 
-#: src/summaryview.c:5728
+#: src/summaryview.c:5775
 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:5731
+#: src/summaryview.c:5778
 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:5760
+#: src/summaryview.c:5807
 msgid "Filtering"
 msgstr "Filtrando"
 
-#: src/summaryview.c:5761
+#: src/summaryview.c:5808
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18794,69 +18916,73 @@ msgstr ""
 "Hay ciertas reglas de filtrado que pertenecen a una cuenta.\n"
 "Por favor seleccione que quiere hacer con ellas:"
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5839
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:5871
+#: src/summaryview.c:5918
 msgid "Processing configuration"
 msgstr "Configuración de procesamiento"
 
-#: src/summaryview.c:6019
+#: src/summaryview.c:6066
 msgid "Do you really want to reset the color label of all selected messages?"
-msgstr "¿Quiere reiniciar realmente el color de todos los mensajes "
-"seleccionados?"
+msgstr ""
+"¿Quiere reiniciar realmente el color de todos los mensajes seleccionados?"
 
-#: src/summaryview.c:6021
+#: src/summaryview.c:6068
 msgid "Do you really want to apply this color label to all selected messages?"
-msgstr "¿Quiere aplicar este color realmente a todos los mensajes "
-"seleccionados?"
+msgstr ""
+"¿Quiere aplicar este color realmente a todos los mensajes seleccionados?"
+
+#: src/summaryview.c:6069
+msgid "Reset color label"
+msgstr "Reiniciar etiqueta de color"
 
-#: src/summaryview.c:6022
+#: src/summaryview.c:6069
 msgid "Set color label"
 msgstr "Establecer color"
 
-#: src/summaryview.c:6465
+#: src/summaryview.c:6512
 msgid "Ignored thread"
 msgstr "Hilo ignorado"
 
-#: src/summaryview.c:6467
+#: src/summaryview.c:6514
 msgid "Watched thread"
 msgstr "Hilo observado"
 
-#: src/summaryview.c:6475
+#: src/summaryview.c:6522
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Respondido y también reenviado - pulse para ver la respuesta"
 
-#: src/summaryview.c:6477
+#: src/summaryview.c:6524
 msgid "Replied - click to see reply"
 msgstr "Respondido - pulse para ver la respuesta"
 
-#: src/summaryview.c:6489
+#: src/summaryview.c:6536
 msgid "To be moved"
 msgstr "Será movido"
 
-#: src/summaryview.c:6491
+#: src/summaryview.c:6538
 msgid "To be copied"
 msgstr "Será copiado"
 
-#: src/summaryview.c:6503
+#: src/summaryview.c:6550
 msgid "Signed, has attachment(s)"
 msgstr "Firmado, tiene adjunto(s)"
 
-#: src/summaryview.c:6507
+#: src/summaryview.c:6554
 msgid "Encrypted, has attachment(s)"
 msgstr "Cifrado, tiene adjunto(s)"
 
-#: src/summaryview.c:6509
+#: src/summaryview.c:6556
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: src/summaryview.c:6511
+#: src/summaryview.c:6558
 msgid "Has attachment(s)"
 msgstr "Tiene adjunto(s)"
 
-#: src/summaryview.c:8182
+#: src/summaryview.c:8272
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18865,53 +18991,53 @@ msgstr ""
 "Error en la expresión regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8285
+#: src/summaryview.c:8375
 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:8290
+#: src/summaryview.c:8380
 msgid "Go back to the folder list"
 msgstr "Volver a la lista de carpetas"
 
-#: src/textview.c:245
+#: src/textview.c:246
 msgid "_Open in web browser"
 msgstr "_Abrir con el navegador web"
 
-#: src/textview.c:246
+#: src/textview.c:247
 msgid "Copy this _link"
 msgstr "_Copiar el enlace"
 
-#: src/textview.c:253
+#: src/textview.c:254
 msgid "_Reply to this address"
 msgstr "_Responder a esta dirección"
 
-#: src/textview.c:254
+#: src/textview.c:255
 msgid "Add to _Address book"
 msgstr "Añadir a la _agenda"
 
-#: src/textview.c:255
+#: src/textview.c:256
 msgid "Copy this add_ress"
 msgstr "Copiar esta di_rección"
 
-#: src/textview.c:261
+#: src/textview.c:262
 msgid "_Open image"
 msgstr "_Abrir imagen"
 
-#: src/textview.c:262
+#: src/textview.c:263
 msgid "_Save image..."
 msgstr "_Guardar imagen..."
 
-#: src/textview.c:724
+#: src/textview.c:725
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
-#: src/textview.c:727
+#: src/textview.c:728
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
-#: src/textview.c:917
+#: src/textview.c:918
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -18925,69 +19051,69 @@ msgstr ""
 "\n"
 "  Utilice "
 
-#: src/textview.c:922
+#: src/textview.c:923
 msgid "'Network Log'"
 msgstr "«Traza de red»"
 
-#: src/textview.c:923
+#: src/textview.c:924
 msgid " in the Tools menu for more information."
 msgstr " en el menú Herramientas para más información."
 
-#: src/textview.c:989
+#: src/textview.c:990
 msgid "  The following can be performed on this part\n"
 msgstr "  Puede efectuar las siguientes acciones en esta parte haciendo\n"
 
-#: src/textview.c:991
+#: src/textview.c:992
 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:995
+#: src/textview.c:996
 msgid "     - To save, select "
 msgstr "     - Para guardar, seleccione "
 
-#: src/textview.c:996
+#: src/textview.c:997
 msgid "'Save as...'"
 msgstr "«Guardar como...»"
 
 # NOTE: closing quote is within and untranslated string
-#: src/textview.c:998 src/textview.c:1010 src/textview.c:1022
-#: src/textview.c:1032
+#: src/textview.c:999 src/textview.c:1011 src/textview.c:1023
+#: src/textview.c:1033
 msgid " (Shortcut key: '"
 msgstr " (Atajo de teclado: '"
 
-#: src/textview.c:1006
+#: src/textview.c:1007
 msgid "     - To display as text, select "
 msgstr "     - Para mostrar como texto, seleccione "
 
-#: src/textview.c:1007
+#: src/textview.c:1008
 msgid "'Display as text'"
 msgstr "«Mostrar como texto»"
 
-#: src/textview.c:1018
+#: src/textview.c:1019
 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir con un programa externo, seleccione "
 
-#: src/textview.c:1019
+#: src/textview.c:1020
 msgid "'Open'"
 msgstr "«Abrir»"
 
-#: src/textview.c:1027
+#: src/textview.c:1028
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente doble clic, o clic con el botón "
 
-#: src/textview.c:1028
+#: src/textview.c:1029
 msgid "mouse button)\n"
 msgstr "central del ratón)\n"
 
-#: src/textview.c:1030
+#: src/textview.c:1031
 msgid "     - Or use "
 msgstr "     - O utilice "
 
-#: src/textview.c:1031
+#: src/textview.c:1032
 msgid "'Open with...'"
 msgstr "«Abrir con...»"
 
-#: src/textview.c:1152
+#: src/textview.c:1153
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -18998,31 +19124,31 @@ msgstr ""
 "    %s\n"
 "Código de salida %d\n"
 
-#: src/textview.c:2228
+#: src/textview.c:2229
 msgid "Tags: "
 msgstr "Etiquetas: "
 
-#: src/textview.c:2947
+#: src/textview.c:2948
 msgid "The real URL is different from the displayed URL."
 msgstr "La URL real es distinta de la URL mostrada."
 
-#: src/textview.c:2948
+#: src/textview.c:2949
 msgid "Displayed URL:"
 msgstr "URL mostrada:"
 
-#: src/textview.c:2949
+#: src/textview.c:2950
 msgid "Real URL:"
 msgstr "URL real:"
 
-#: src/textview.c:2950
+#: src/textview.c:2951
 msgid "Open it anyway?"
 msgstr "¿Abrirla de todas formas?"
 
-#: src/textview.c:2951
+#: src/textview.c:2952
 msgid "Phishing attempt warning"
 msgstr "Aviso de intento de «phishing»"
 
-#: src/textview.c:2952
+#: src/textview.c:2953
 msgid "_Open URL"
 msgstr "_Abrir URL"
 
@@ -19418,12 +19544,12 @@ msgstr "Por favor seleccione la URL a abrir."
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/wizard.c:522
+#: src/wizard.c:523
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenido a Claws Mail"
 
-#: src/wizard.c:545
+#: src/wizard.c:546
 #, c-format
 msgid ""
 "\n"
@@ -19515,47 +19641,47 @@ msgstr ""
 "hacerlo en «%s».\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:621
 msgid "Please enter the mailbox name."
 msgstr "Por favor introduzca el nombre del buzón."
 
-#: src/wizard.c:648
+#: src/wizard.c:649
 msgid "Please enter your name and email address."
 msgstr "Por favor introduzca su nombre y dirección de correo."
 
-#: src/wizard.c:659
+#: src/wizard.c:660
 msgid "Please enter your receiving server and username."
 msgstr "Por favor introduzca su servidor de recepción y nombre de usuario."
 
-#: src/wizard.c:669
+#: src/wizard.c:670
 msgid "Please enter your username."
 msgstr "Por favor introduzca su nombre de usuario."
 
-#: src/wizard.c:679
+#: src/wizard.c:680
 msgid "Please enter your SMTP server."
 msgstr "Por favor introduzca su servidor SMTP."
 
-#: src/wizard.c:690
+#: src/wizard.c:691
 msgid "Please enter your SMTP username."
 msgstr "Por favor introduzca su nombre de usuario SMTP."
 
-#: src/wizard.c:975
+#: src/wizard.c:976
 msgid "Your name:"
 msgstr "Su nombre:"
 
-#: src/wizard.c:986
+#: src/wizard.c:987
 msgid "Your email address:"
 msgstr "Su dirección de correo:"
 
-#: src/wizard.c:997
+#: src/wizard.c:998
 msgid "Your organization:"
 msgstr "Su organización:"
 
-#: src/wizard.c:1031
+#: src/wizard.c:1032
 msgid "Mailbox name:"
 msgstr "Nombre del buzón:"
 
-#: src/wizard.c:1039
+#: src/wizard.c:1040
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19563,7 +19689,7 @@ msgstr ""
 "Puede especificar también una ruta absoluta, por ejemplo: «/home/usuario/"
 "Documentos/Correo»"
 
-#: src/wizard.c:1110
+#: src/wizard.c:1111
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19571,51 +19697,51 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:25»"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1114
 msgid "SMTP server address:"
 msgstr "Dirección del servidor SMTP:"
 
-#: src/wizard.c:1128
+#: src/wizard.c:1129
 msgid "(empty to use the same as receive)"
 msgstr "(vacío para usar el mismo que en la recepción)"
 
-#: src/wizard.c:1142
+#: src/wizard.c:1143
 msgid "SMTP username:"
 msgstr "Usuario SMTP:"
 
-#: src/wizard.c:1153
+#: src/wizard.c:1154
 msgid "SMTP password:"
 msgstr "Contraseña SMTP:"
 
-#: src/wizard.c:1166
+#: src/wizard.c:1167
 msgid "Use SSL/TLS to connect to SMTP server"
 msgstr "Usar SSL/TLS para conectar al servidor SMTP"
 
-#: src/wizard.c:1177 src/wizard.c:1597
+#: src/wizard.c:1178 src/wizard.c:1598
 msgid "Use STARTTLS command to start encryption"
 msgstr "Usar la orden STARTTLS para abrir la sesión cifrada"
 
-#: src/wizard.c:1189 src/wizard.c:1609
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "Client SSL/TLS certificate (optional)"
 msgstr "Certificado SSL/TLS de cliente (opcional)"
 
-#: src/wizard.c:1257 src/wizard.c:1289 src/wizard.c:1544
+#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
 msgid "Server address:"
 msgstr "Dirección del servidor:"
 
-#: src/wizard.c:1321
+#: src/wizard.c:1322
 msgid "Local mailbox:"
 msgstr "Buzón local:"
 
-#: src/wizard.c:1490
+#: src/wizard.c:1491
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/wizard.c:1499
+#: src/wizard.c:1500
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1555
+#: src/wizard.c:1556
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19623,19 +19749,19 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:110»"
 
-#: src/wizard.c:1586
+#: src/wizard.c:1587
 msgid "Use SSL/TLS to connect to receiving server"
 msgstr "Usar SSL/TLS para conectar al servidor de recepción"
 
-#: src/wizard.c:1651
+#: src/wizard.c:1652
 msgid "IMAP server directory:"
 msgstr "Directorio del servidor IMAP:"
 
-#: src/wizard.c:1662
+#: src/wizard.c:1663
 msgid "Show only subscribed folders"
 msgstr "Mostrar sólo las carpetas suscritas"
 
-#: src/wizard.c:1670
+#: src/wizard.c:1671
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19643,15 +19769,15 @@ msgstr ""
 "Aviso: esta versión de Claws Mail\n"
 "se construyó sin soporte IMAP."
 
-#: src/wizard.c:1788
+#: src/wizard.c:1789
 msgid "Claws Mail Setup Wizard"
 msgstr "Ayudante de configuración de Claws Mail"
 
-#: src/wizard.c:1821
+#: src/wizard.c:1822
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenido a Claws Mail "
 
-#: src/wizard.c:1828
+#: src/wizard.c:1829
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19665,31 +19791,31 @@ msgstr ""
 "correo más comunes de manera que pueda comenzar a usar Claws Mail en menos "
 "de cinco minutos."
 
-#: src/wizard.c:1841
+#: src/wizard.c:1842
 msgid "About You"
 msgstr "Sobre usted"
 
-#: src/wizard.c:1849 src/wizard.c:1864 src/wizard.c:1879 src/wizard.c:1895
+#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
 msgid "Bold fields must be completed"
 msgstr "Los campos en etiquetados en negrilla deben ser completados"
 
-#: src/wizard.c:1856
+#: src/wizard.c:1857
 msgid "Receiving mail"
 msgstr "Recibiendo correo"
 
-#: src/wizard.c:1871
+#: src/wizard.c:1872
 msgid "Sending mail"
 msgstr "Enviando correo"
 
-#: src/wizard.c:1887
+#: src/wizard.c:1888
 msgid "Saving mail on disk"
 msgstr "Guardando el correo en el disco"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1904
 msgid "Configuration finished"
 msgstr "Configuración finalizada."
 
-#: src/wizard.c:1910
+#: src/wizard.c:1911
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."

commit 2ee0241445cd46625b29a08c87497d2fe6550720
Author: Ricardo Mones <ricardo at mones.org>
Date:   Thu Dec 13 12:47:09 2018 +0100

    Simplify Tools section in README
    
    And point to the updated list of tools instead.

diff --git a/README b/README
index 5da3c34..36a7f0c 100644
--- a/README
+++ b/README
@@ -503,96 +503,16 @@ https://www.claws-mail.org/plugins.php
   https://www.claws-mail.org/manual/claws-mail-manual.html#adv_hidden
 
 9. Tools
---------- 
-  You will find all of these tools in the 'tools' directory:
-
-  acroread2claws-mail.pl 
-	send PDFs from Adobe Reader 7
-  calypso_convert.pl 
-	import mbox files exported by calypso
-  claws-mail-compose-insert-files.pl
-	insert files into a new Compose window
-  convert_mbox.pl
-  	convert mbox format to MH format
-  csv2addressbook.pl
-	import Becky, Thunderbird, Kmail, Gmail and Fox Mail
-	address books
-  eud2gc.py
-	convert a Eudora (v.3?) addressbook to vCard 
-	(GnomeCard) format
-  filter_conv.pl
-	convert sylpheed main's filter rules, (< 0.9.99),
-	into Claws' filtering format
-  filter_conv_new.pl
-	convert sylpheed main's filter rules, (>= 0.9.99),
-	into Claws' filtering format
-  fix-date.sh
-	Replace/Add a message's Date field
-  freshmeat_search.pl
-  	Actions script to lookup the selected text on
-	Freshmeat www.freshmeat.net using the configured
-	browser
-  gif2xface.pl
-	convert a gif file to an xface
-  google_msgid.pl
-  	Actions script to lookup selected message-id on 
-	google using mozilla.
-  google_search.pl
-  	Actions script to lookup up the selected text on
-	google using the configured browser
-  kdeservicemenu/*
-  	Service Menus for Konqueror to allow sending
-	files to Claws Mail
-  kmail2claws-mail.pl
-	convert a Kmail addressbook to a Claws Mail
-	addressbook
-  kmail2claws-mail_v2.pl
-	new version of the address book conversion script
-	for newer versions of Kmail/Kaddressbook
-  kmail-mailbox2claws-mail.pl
-  	convert a Kmail mailbox into a Claws mail mailbox
-  mairix.sh
-	a wrapper to mairix, to enable global searches in mail
-	folders
-  mew2claws-mail.pl
-	import a Mew address book
-  multiwebsearch.pl
-  	search any searchable website for the selected text
-  nautilus2claws-mail.sh
-  	enables sending files from the Nautilus file manager
-	to Claws Mail
-  OOo2claws-mail.pl
-	enable OpenOffice to send documents through
-	Claws Mail
-  outlook2claws-mail.pl
-	convert an Outlook contacts list to a Claws Mail
-	addressbook
-  popfile-link.sh
-	open messages in POPFile control center to edit their status
-  sylprint.pl
-	process a Claws Mail message and print it using enscript
-	if available or lpr if not
-  tb2claws-mail
-	convert an addressbook exported from The Bat! into 
-	a Claws Mail addressbook
-  tbird2claws.py
-  	integrate a Thunderbird folder tree into Claws Mail
-  textviewer.pl
-	Display various attachments as text
-  textviewer.sh
-  	attempt to view an attachment as plain text
-  thunderbird-filters-convertor.pl
-	convert Thunderbird filtering rules
-  update-po 
-	translators' tool that eases the creation of 
-	*.po files
-  uudec
-	decode UUencoded mails, for use with Actions
-  uuooffice
-	Decode uuencoded attachments and open them with OpenOffice
-  vcard2xml.py
-	import an Evolution vCard
+--------
 
+  Tools are small scripts which can help integrate Claws Mail with
+  other programs; perform format conversions between different kinds
+  of mailboxes, address books, etc.; be used in Claws Mail Actions for
+  a variety of purposes; or used in other programs to ease their
+  interoperability with Claws Mail.
+
+  You will find all the tools in the 'tools' directory and a detailed
+  description of the available scripts in 'tools/README.'
 
 10. How to contribute
 ---------------------

commit 83d08a08ca6c8fa43423e2221b43debe4c655334
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Dec 12 19:43:13 2018 +0100

    Handle corner case in news_get_extra_fields() where msglist is empty
    
    This makes the function quit early, instead of requesting
    XHDR with bogus ranges from the server.
    
    Closes bug #4133: trying to read message from an NNTP group (with
    all expired articles.

diff --git a/src/news.c b/src/news.c
index 61120c4..634a050 100644
--- a/src/news.c
+++ b/src/news.c
@@ -1125,6 +1125,9 @@ static void news_get_extra_fields(NewsSession *session, FolderItem *item, GSList
 	cm_return_if_fail(item->folder != NULL);
 	cm_return_if_fail(FOLDER_CLASS(item->folder) == &news_class);
 
+	if (msglist == NULL)
+		return;
+
 	news_folder_lock(NEWS_FOLDER(item->folder));
 
 	hash_table = g_hash_table_new(g_direct_hash, g_direct_equal);
@@ -1139,6 +1142,11 @@ static void news_get_extra_fields(NewsSession *session, FolderItem *item, GSList
 				GINT_TO_POINTER(msginfo->msgnum), msginfo);
 	}
 
+	if (first == -1 || last == -1) {
+		g_hash_table_destroy(hash_table);
+		return;
+	}
+
 /* Newsgroups */
 	ok = nntp_threaded_xhdr(item->folder, "newsgroups", first, last, &hdrlist);
 

commit 5e584dc8515ce4ddb54161f92796f6617b9422b2
Author: Paul <paul at claws-mail.org>
Date:   Wed Dec 12 11:49:48 2018 +0000

    fix the indentation

diff --git a/configure.ac b/configure.ac
index b5e956b..679597f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,7 +301,7 @@ AC_ARG_ENABLE(svg,
         [enable_svg=$enableval], [enable_svg=yes])
 
 AC_ARG_ENABLE(tests,
-				[ --enable-tests                   Build unit tests],
+				[  --enable-tests                   Build unit tests],
 				[enable_tests=$enableval], [enable_tests=no])
 
 manualdir='${docdir}/manual'

commit 4a00f71a540834421d3317051123fc81b8310cbd
Author: wwp <subscript at free.fr>
Date:   Mon Dec 10 19:10:14 2018 +0100

    French translation: updates & fixes.

diff --git a/po/fr.po b/po/fr.po
index ac6371f..a8501b9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -136,7 +136,7 @@ msgstr ""
 
 #: src/action.c:720
 msgid "There is no filtering action set"
-msgstr "Il n'y a pas d'action de filtrage définie."
+msgstr "Il n'y a pas d'action de filtrage définie"
 
 #: src/action.c:722
 #, c-format
@@ -393,7 +393,7 @@ msgstr "Supprimer l'adresse"
 #: src/addrduplicates.c:841 src/addressbook.c:1442
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
-"Les données de cette adresse sont en lecture seule \n"
+"Les données de cette adresse sont en lecture seule\n"
 "et ne peuvent pas être supprimées."
 
 #: src/addressadd.c:192 src/prefs_filtering_action.c:195
@@ -419,7 +419,7 @@ msgstr "Ajout d'adresse(s)"
 
 #: src/addressadd.c:597
 msgid "Can't add the specified address"
-msgstr "Impossible d'ajouter l'adresse spécifiée."
+msgstr "Impossible d'ajouter l'adresse spécifiée"
 
 #: src/addressbook.c:129 src/addressbook.c:5004 src/editaddress.c:1246
 #: src/editaddress.c:1284 src/editgroup.c:291 src/expldifdlg.c:517
@@ -578,7 +578,7 @@ msgstr "Arguments incorrects"
 
 #: src/addressbook.c:518 src/importldif.c:123
 msgid "File not specified"
-msgstr "Fichier non spécifié."
+msgstr "Fichier non spécifié"
 
 #: src/addressbook.c:519 src/importldif.c:124
 msgid "Error opening file"
@@ -610,7 +610,7 @@ msgstr "Erreur lors de l'ouverture du dossier"
 
 #: src/addressbook.c:526 src/importldif.c:131
 msgid "No path specified"
-msgstr "Chemin non spécifié."
+msgstr "Chemin non spécifié"
 
 #: src/addressbook.c:536
 msgid "Error connecting to LDAP server"
@@ -1052,11 +1052,11 @@ msgstr "Ce module fournit %s (%s), qui est déjà fourni par le module %s."
 
 #: src/common/plugin.c:438
 msgid "Plugin already loaded"
-msgstr "Module déjà chargé."
+msgstr "Module déjà chargé"
 
 #: src/common/plugin.c:449
 msgid "Failed to allocate memory for Plugin"
-msgstr "Échec lors de l'allocation de la mémoire pour le module."
+msgstr "Échec lors de l'allocation de la mémoire pour le module"
 
 #: src/common/plugin.c:483
 msgid "This module is not licensed under a GPL v3 or later compatible license."
@@ -1196,7 +1196,7 @@ msgstr "Aucun émetteur de certificat trouvé"
 
 #: src/common/ssl_certificate.c:657
 msgid "Certificate issuer is not a CA"
-msgstr "L'émetteur du certificat n'est pas une Autorité de Certification (CA)."
+msgstr "L'émetteur du certificat n'est pas une Autorité de Certification (CA)"
 
 #: src/common/ssl_certificate.c:882
 #, c-format
@@ -2182,7 +2182,7 @@ msgstr "Ajouter au carnet d'_adresses"
 
 #: src/compose.c:7214
 msgid "Delete entry contents"
-msgstr "Effacer le contenu du champ"
+msgstr "Effacer la zone de saisie"
 
 #: src/compose.c:7218 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
@@ -2327,7 +2327,7 @@ msgstr "Impossible d'enregistrer le brouillon."
 
 #: src/compose.c:10450
 msgid "Could not save draft"
-msgstr "Enregistrement impossible du brouillon"
+msgstr "Impossible d'enregistrer le brouillon"
 
 #: src/compose.c:10451
 msgid ""
@@ -2366,7 +2366,7 @@ msgstr ""
 
 #: src/compose.c:10751
 msgid "Discard message"
-msgstr "Interruption de la composition du message"
+msgstr "Interrompre la composition du message"
 
 #: src/compose.c:10752
 msgid "This message has been modified. Discard it?"
@@ -2455,7 +2455,7 @@ msgstr "Le processus Claws Mail (%ld) a reçu le signal %ld"
 
 #: src/crash.c:186
 msgid "Claws Mail has crashed"
-msgstr "Claws Mail s'est anormalement interrompu."
+msgstr "Claws Mail s'est anormalement interrompu"
 
 #: src/crash.c:202
 #, c-format
@@ -2689,7 +2689,7 @@ msgstr "Adresses disponibles"
 #: src/editgroup.c:452
 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr ""
-"Déplacer les adresses souhaitées du/vers le groupe avec les boutons fléchés."
+"Déplacer les adresses souhaitées du/vers le groupe avec les boutons fléchés"
 
 #: src/editgroup.c:500
 msgid "Edit Group Details"
@@ -3385,11 +3385,11 @@ msgstr "Nom absolu (DN)"
 
 #: src/export.c:113 src/summaryview.c:8459
 msgid "Export to mbox file"
-msgstr "Exporter la sélection en fichier mbox"
+msgstr "Exporter la sélection au format mbox"
 
 #: src/export.c:131
 msgid "Locate the folder to export and specify the mbox file."
-msgstr "Spécifier le dossier à exporter et le nom du nouveau fichier mbox."
+msgstr "Spécifier le dossier à exporter et le nom du fichier mbox à créer."
 
 #: src/export.c:142
 msgid "Source folder:"
@@ -3434,11 +3434,11 @@ msgstr "Carnet d'adresses de Claws Mail"
 
 #: src/exporthtml.c:1070 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
-msgstr "Le nom existe déjà mais ce n'est pas un dossier."
+msgstr "Le nom existe déjà mais ce n'est pas celui d'un dossier."
 
 #: src/exporthtml.c:1073 src/exportldif.c:610
 msgid "No permissions to create directory."
-msgstr "Pas de permissions pour créer le dossier."
+msgstr "Permissions insuffisantes pour créer le dossier."
 
 #: src/exporthtml.c:1076 src/exportldif.c:613
 msgid "Name is too long."
@@ -3486,7 +3486,7 @@ msgstr ""
 #: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
 #: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
 msgid "NON_EXISTENT"
-msgstr "NON_EXISTENT"
+msgstr "NON_EXISTANT"
 
 #: src/filtering.c:617
 msgid ""
@@ -3901,12 +3901,12 @@ msgstr "_Vider"
 
 #: src/folderview.c:2565 src/inc.c:1663 src/toolbar.c:3032
 msgid "Offline warning"
-msgstr "Travail hors-ligne"
+msgstr "Mode hors-ligne"
 
 #: src/folderview.c:2566 src/toolbar.c:3033
 msgid "You're working offline. Override?"
 msgstr ""
-"Attention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
+"Attention, vous êtes en mode hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 
 #: src/folderview.c:2577 src/toolbar.c:3052
@@ -6694,7 +6694,7 @@ msgstr ""
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
-"%s%sAttention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
+"%s%sAttention, vous êtes en mode hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 
 #: src/inc.c:1666
@@ -7686,7 +7686,7 @@ msgstr "Définir comme client par défaut"
 
 #: src/mainwindow.c:818
 msgid "Offline _mode"
-msgstr "_Travailler hors-ligne"
+msgstr "_Mode hors-ligne"
 
 #: src/mainwindow.c:819
 msgid "Men_ubar"

commit 5aacb361658d2296312ad8b336322e25174fdea9
Author: wwp <subscript at free.fr>
Date:   Mon Dec 10 18:24:00 2018 +0100

    Update French translation.

diff --git a/po/fr.po b/po/fr.po
index 3a51df9..ac6371f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2018-08-08 07:59+0100\n"
-"PO-Revision-Date: 2018-08-14 23:56+0100\n"
+"POT-Creation-Date: 2018-12-07 08:13+0000\n"
+"PO-Revision-Date: 2018-12-10 18:14+0100\n"
 "Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
 "Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
 "Language: fr\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "X-Generator: Poedit 1.6.11\n"
 
-#: src/account.c:401 src/account.c:468
+#: src/account.c:402 src/account.c:469
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -34,15 +34,15 @@ msgstr ""
 "Des fenêtres de composition de message sont ouvertes.\n"
 "Veuillez toutes les fermer avant de pouvoir configurer les comptes."
 
-#: src/account.c:446
+#: src/account.c:447
 msgid "Can't create folder."
 msgstr "Impossible de créer le dossier."
 
-#: src/account.c:734
+#: src/account.c:735
 msgid "Edit accounts"
 msgstr "Édition des comptes"
 
-#: src/account.c:751
+#: src/account.c:752
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -52,61 +52,61 @@ msgstr ""
 "comptes suivants, les cases à cocher de la colonne 'R' indiquant lesquels "
 "seront concernés par cette relève. Le compte en gras est celui par défaut."
 
-#: src/account.c:822
+#: src/account.c:823
 msgid " _Set as default account "
 msgstr "Définir comme comp_te par défaut"
 
-#: src/account.c:914
+#: src/account.c:915
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Les comptes avec des dossiers distants ne peuvent pas être copiés."
 
-#: src/account.c:921
+#: src/account.c:922
 #, c-format
 msgid "Copy of %s"
 msgstr "Copie de %s"
 
-#: src/account.c:1118
+#: src/account.c:1119
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Voulez-vous vraiment supprimer le compte '%s' ?"
 
-#: src/account.c:1120
+#: src/account.c:1121
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: src/account.c:1121
+#: src/account.c:1122
 msgid "Delete account"
 msgstr "Supprimer le compte"
 
-#: src/account.c:1595
+#: src/account.c:1596
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1601
+#: src/account.c:1602
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 "La fonctionnalité « Relever » récupèrera le courrier des comptes cochés"
 
-#: src/account.c:1608 src/addrduplicates.c:471 src/addressadd.c:222
-#: src/addressbook.c:127 src/compose.c:7413 src/editaddress.c:1472
-#: src/editaddress.c:1501 src/editaddress.c:1517
+#: src/account.c:1609 src/addrduplicates.c:471 src/addressadd.c:222
+#: src/addressbook.c:128 src/compose.c:7462 src/editaddress.c:1473
+#: src/editaddress.c:1502 src/editaddress.c:1518
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:170
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:427
+#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:427
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
-#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:469
-#: src/plugins/pdf_viewer/poppler_viewer.c:1828
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:470
+#: src/plugins/pdf_viewer/poppler_viewer.c:1846
 #: src/plugins/pgpcore/select-keys.c:463 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1874 src/prefs_template.c:79 src/prefs_themes.c:990
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:1616 src/prefs_account.c:1200 src/prefs_account.c:4622
+#: src/account.c:1617 src/prefs_account.c:1196 src/prefs_account.c:4644
 msgid "Protocol"
 msgstr "Protocole"
 
-#: src/account.c:1624 src/ssl_manager.c:100
+#: src/account.c:1625 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Serveur"
 
@@ -134,11 +134,11 @@ msgstr ""
 "L'action choisie ne peut être utilisée pour un message en cours\n"
 "de composition car elle contient %%f, %%F, %%as ou %%p."
 
-#: src/action.c:719
+#: src/action.c:720
 msgid "There is no filtering action set"
 msgstr "Il n'y a pas d'action de filtrage définie."
 
-#: src/action.c:721
+#: src/action.c:722
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -147,7 +147,7 @@ msgstr ""
 "Action(s) de filtrage non valide(s) :\n"
 "%s"
 
-#: src/action.c:986
+#: src/action.c:987
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -158,35 +158,35 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:988 src/compose.c:5222 src/compose.c:5227 src/ldaputil.c:333
-#: src/plugins/bogofilter/bogofilter.c:857
-#: src/plugins/tnef_parse/tnef_parse.c:75
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1845
-#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:62
+#: src/action.c:989 src/compose.c:5257 src/compose.c:5262 src/ldaputil.c:333
+#: src/plugins/bogofilter/bogofilter.c:858
+#: src/plugins/tnef_parse/tnef_parse.c:76
+#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1828
+#: src/plugins/vcalendar/vcal_folder.c:1846
+#: src/plugins/vcalendar/vcal_folder.c:1849 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/action.c:1206 src/action.c:1385
+#: src/action.c:1207 src/action.c:1379
 msgid "Completed"
 msgstr "Terminé"
 
-#: src/action.c:1242
+#: src/action.c:1243
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- En cours : %s\n"
 
-#: src/action.c:1246
+#: src/action.c:1247
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Terminé : %s\n"
 
-#: src/action.c:1292
+#: src/action.c:1293
 msgid "Action's input/output"
 msgstr "Entrées/Sorties d'Actions"
 
-#: src/action.c:1631
+#: src/action.c:1625
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -197,11 +197,11 @@ msgstr ""
 "(L'argument remplacera « %%h »)\n"
 "  %s"
 
-#: src/action.c:1636
+#: src/action.c:1630
 msgid "Action's hidden user argument"
 msgstr "Argument caché de l'action"
 
-#: src/action.c:1640
+#: src/action.c:1634
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -212,28 +212,28 @@ msgstr ""
 "(L'argument remplacera « %%u »)\n"
 "  %s"
 
-#: src/action.c:1645
+#: src/action.c:1639
 msgid "Action's user argument"
 msgstr "Argument pour l'action"
 
-#: src/addrclip.c:480
+#: src/addrclip.c:481
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr ""
 "Il n'est pas possible de copier un dossier vers lui-même ou vers un de ses "
 "sous-dossiers."
 
-#: src/addrclip.c:503
+#: src/addrclip.c:504
 msgid "Cannot copy an address book to itself."
 msgstr "Impossible de copier un carnet d'adresses vers lui-même."
 
-#: src/addrclip.c:594
+#: src/addrclip.c:595
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 "Il n'est pas possible de déplacer un dossier vers lui-même ou vers un de ses "
 "sous-dossiers."
 
-#: src/addr_compl.c:689 src/addressbook.c:5013
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/addr_compl.c:689 src/addressbook.c:5016
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "Groupe"
 
@@ -305,14 +305,14 @@ msgstr ""
 "Voulez-vous vraiment réinitialiser tous les noms d'attributs\n"
 "par ceux par défaut ?"
 
-#: src/addrcustomattr.c:217 src/addressbook.c:437 src/addressbook.c:466
-#: src/addressbook.c:483 src/edittags.c:286
-#: src/plugins/archive/archiver_gtk.c:1312 src/prefs_actions.c:1084
+#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
+#: src/addressbook.c:484 src/edittags.c:286
+#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1085
 #: src/prefs_filtering.c:1699 src/prefs_template.c:1111
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1085
+#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1086
 #: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "Delete _all"
 msgstr "_Tout supprimer.."
@@ -378,11 +378,11 @@ msgstr "Adresse"
 msgid "Address book path"
 msgstr "Chemin dans le carnet"
 
-#: src/addrduplicates.c:790 src/addressbook.c:1442 src/addressbook.c:1495
+#: src/addrduplicates.c:790 src/addressbook.c:1441 src/addressbook.c:1494
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1496
+#: src/addrduplicates.c:791 src/addressbook.c:1495
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous vraiment supprimer la(les) adresse(s) sélectionnée(s) ?"
 
@@ -390,13 +390,13 @@ msgstr "Voulez-vous vraiment supprimer la(les) adresse(s) sélectionnée(s) ?"
 msgid "Delete address"
 msgstr "Supprimer l'adresse"
 
-#: src/addrduplicates.c:841 src/addressbook.c:1443
+#: src/addrduplicates.c:841 src/addressbook.c:1442
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 "Les données de cette adresse sont en lecture seule \n"
 "et ne peuvent pas être supprimées."
 
-#: src/addressadd.c:192 src/prefs_filtering_action.c:201
+#: src/addressadd.c:192 src/prefs_filtering_action.c:195
 msgid "Add to address book"
 msgstr "Ajout au carnet d'adresses"
 
@@ -404,8 +404,8 @@ msgstr "Ajout au carnet d'adresses"
 msgid "Contact"
 msgstr "Contact"
 
-#: src/addressadd.c:245 src/addressbook.c:129 src/editaddress.c:1256
-#: src/editaddress.c:1300 src/editgroup.c:290
+#: src/addressadd.c:245 src/addressbook.c:130 src/editaddress.c:1257
+#: src/editaddress.c:1301 src/editgroup.c:292
 msgid "Remarks"
 msgstr "Remarques"
 
@@ -413,7 +413,7 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Sélectionner un dossier"
 
-#: src/addressadd.c:596 src/addressbook.c:3261 src/addressbook.c:3312
+#: src/addressadd.c:596 src/addressbook.c:3264 src/addressbook.c:3315
 msgid "Add address(es)"
 msgstr "Ajout d'adresse(s)"
 
@@ -421,268 +421,268 @@ msgstr "Ajout d'adresse(s)"
 msgid "Can't add the specified address"
 msgstr "Impossible d'ajouter l'adresse spécifiée."
 
-#: src/addressbook.c:128 src/addressbook.c:5001 src/editaddress.c:1245
-#: src/editaddress.c:1283 src/editgroup.c:289 src/expldifdlg.c:517
-#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
+#: src/addressbook.c:129 src/addressbook.c:5004 src/editaddress.c:1246
+#: src/editaddress.c:1284 src/editgroup.c:291 src/expldifdlg.c:517
+#: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
 msgid "Email Address"
 msgstr "Adresse email"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:405
 msgid "_Book"
 msgstr "_Carnet"
 
-#: src/addressbook.c:405 src/addressbook.c:436 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:604 src/mainwindow.c:515
-#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
+#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:515
+#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Édition"
 
-#: src/addressbook.c:406 src/compose.c:609 src/mainwindow.c:518
-#: src/messageview.c:213
+#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:518
+#: src/messageview.c:215
 msgid "_Tools"
 msgstr "Ou_tils"
 
-#: src/addressbook.c:407 src/compose.c:610 src/mainwindow.c:520
-#: src/messageview.c:214
+#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:520
+#: src/messageview.c:216
 msgid "_Help"
 msgstr "_Aide"
 
-#: src/addressbook.c:410 src/addressbook.c:468
+#: src/addressbook.c:411 src/addressbook.c:469
 msgid "New _Book"
 msgstr "Nouveau c_arnet"
 
-#: src/addressbook.c:411 src/addressbook.c:469
+#: src/addressbook.c:412 src/addressbook.c:470
 msgid "New _Folder"
 msgstr "Nouveau _dossier"
 
-#: src/addressbook.c:412
+#: src/addressbook.c:413
 msgid "New _vCard"
 msgstr "Nouveau carnet _vCard"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:417
 msgid "New _JPilot"
 msgstr "Nouveau carnet _JPilot"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:420
 msgid "New LDAP _Server"
 msgstr "Configuration d'un nouveau _serveur LDAP"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:424
 msgid "_Edit book"
 msgstr "_Éditer"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:425
 msgid "_Delete book"
 msgstr "Supp_rimer le carnet"
 
-#: src/addressbook.c:426 src/compose.c:621
+#: src/addressbook.c:427 src/compose.c:624
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "Enregi_strer"
 
-#: src/addressbook.c:427 src/compose.c:625 src/messageview.c:223
+#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/addressbook.c:430 src/addressbook.c:480 src/messageview.c:227
+#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
 msgid "_Select all"
 msgstr "_Sélectionner tout"
 
-#: src/addressbook.c:432 src/addressbook.c:472 src/addressbook.c:488
+#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
 msgid "C_ut"
 msgstr "Co_uper"
 
-#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:633 src/mainwindow.c:549 src/messageview.c:226
+#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
+#: src/compose.c:636 src/mainwindow.c:549 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copier"
 
-#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:634 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
+#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "Co_ller"
 
-#: src/addressbook.c:439 src/addressbook.c:485
+#: src/addressbook.c:440 src/addressbook.c:486
 msgid "New _Address"
 msgstr "Nouvelle _adresse"
 
-#: src/addressbook.c:440 src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
 msgid "New _Group"
 msgstr "Nouveau _groupe"
 
-#: src/addressbook.c:442 src/addressbook.c:492
+#: src/addressbook.c:443 src/addressbook.c:493
 msgid "_Mail To"
 msgstr "Co_mposer"
 
-#: src/addressbook.c:443 src/addressbook.c:496
+#: src/addressbook.c:444 src/addressbook.c:497
 msgid "_Merge"
 msgstr "_Fusionner"
 
-#: src/addressbook.c:447
+#: src/addressbook.c:448
 msgid "Import _LDIF file..."
 msgstr "Importer un carnet d'adresses _LDIF.."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:449
 msgid "Import M_utt file..."
 msgstr "Importer un carnet d'adresses _Mutt.."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:450
 msgid "Import _Pine file..."
 msgstr "Importer un carnet d'adresses _Pine.."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:452
 msgid "Export _HTML..."
 msgstr "Exporter le carnet d'adresses en _HTML.."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:453
 msgid "Export LDI_F..."
 msgstr "Exporter le carnet d'adresses en LDI_F.."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:455
 msgid "Find duplicates..."
 msgstr "_Chercher les contacts en double.."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:456
 msgid "Edit custom attributes..."
 msgstr "Personnaliser les _attributs.."
 
-#: src/addressbook.c:458 src/compose.c:711 src/mainwindow.c:814
-#: src/messageview.c:338
+#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:814
+#: src/messageview.c:340
 msgid "_About"
 msgstr "À _propos"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:495
 msgid "_Browse Entry"
 msgstr "_Parcourir l'entrée"
 
-#: src/addressbook.c:508 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:143
-#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:403
+#: src/addressbook.c:509 src/crash.c:456 src/crash.c:475 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
+#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
 #: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
 #: src/prefs_themes.c:851 src/prefs_themes.c:852
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/addressbook.c:515 src/addressbook.c:534 src/importldif.c:121
+#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
 msgid "Success"
 msgstr "Succès"
 
-#: src/addressbook.c:516 src/importldif.c:122
+#: src/addressbook.c:517 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Arguments incorrects"
 
-#: src/addressbook.c:517 src/importldif.c:123
+#: src/addressbook.c:518 src/importldif.c:123
 msgid "File not specified"
 msgstr "Fichier non spécifié."
 
-#: src/addressbook.c:518 src/importldif.c:124
+#: src/addressbook.c:519 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Erreur lors de l'ouverture du fichier"
 
-#: src/addressbook.c:519 src/importldif.c:125
+#: src/addressbook.c:520 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Erreur lors de la lecture du fichier"
 
-#: src/addressbook.c:520 src/importldif.c:126
+#: src/addressbook.c:521 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Fin de fichier inattendue"
 
-#: src/addressbook.c:521 src/importldif.c:127
+#: src/addressbook.c:522 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Erreur d'allocation de mémoire"
 
-#: src/addressbook.c:522 src/importldif.c:128
+#: src/addressbook.c:523 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Erreur dans le format du fichier"
 
-#: src/addressbook.c:523 src/importldif.c:129
+#: src/addressbook.c:524 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Erreur lors de l'écriture du fichier"
 
-#: src/addressbook.c:524 src/importldif.c:130
+#: src/addressbook.c:525 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Erreur lors de l'ouverture du dossier"
 
-#: src/addressbook.c:525 src/importldif.c:131
+#: src/addressbook.c:526 src/importldif.c:131
 msgid "No path specified"
 msgstr "Chemin non spécifié."
 
-#: src/addressbook.c:535
+#: src/addressbook.c:536
 msgid "Error connecting to LDAP server"
 msgstr "Erreur lors de la connexion au serveur LDAP"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:537
 msgid "Error initializing LDAP"
 msgstr "Erreur d'initialisation LDAP"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:538
 msgid "Error binding to LDAP server"
 msgstr "Erreur lors de la liaison avec le serveur LDAP"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:539
 msgid "Error searching LDAP database"
 msgstr "Erreur lors de la recherche de la base de données LDAP"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:540
 msgid "Timeout performing LDAP operation"
 msgstr "Délai excédé lors d'une opération LDAP"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:541
 msgid "Error in LDAP search criteria"
 msgstr "Erreur dans le critère de recherche LDAP"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:542
 msgid "No LDAP entries found for search criteria"
 msgstr ""
 "Aucune entrée LDAP correspondante au critère de recherche n'a été trouvée"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:543
 msgid "LDAP search terminated on request"
 msgstr "Recherche LDAP interrompue par l'utilisateur·rice"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:544
 msgid "Error starting STARTTLS connection"
 msgstr "Erreur lors de l'établissement de la connexion STARTTLS"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:545
 msgid "Distinguished Name (dn) is missing"
 msgstr "Le nom absolu (DN) est manquant"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:546
 msgid "Missing required information"
 msgstr "Information requise manquante"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:547
 msgid "Another contact exists with that key"
 msgstr "Un autre contact existe avec cette clé"
 
-#: src/addressbook.c:547
+#: src/addressbook.c:548
 msgid "Strong(er) authentication required"
 msgstr "Forte authentification obligatoire"
 
-#: src/addressbook.c:915
+#: src/addressbook.c:916
 msgid "Sources"
 msgstr "Sources"
 
-#: src/addressbook.c:919 src/prefs_matcher.c:631 src/prefs_other.c:488
+#: src/addressbook.c:920 src/prefs_matcher.c:642 src/prefs_other.c:490
 #: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:1115 src/editldap.c:793
+#: src/addressbook.c:1114 src/editldap.c:793
 msgid "Search"
 msgstr "Chercher"
 
-#: src/addressbook.c:1487
+#: src/addressbook.c:1486
 msgid "Delete group"
 msgstr "Suppression de groupe(s)"
 
-#: src/addressbook.c:1488
+#: src/addressbook.c:1487
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -690,30 +690,30 @@ msgstr ""
 "Voulez-vous supprimer ce(s) groupe(s) ?\n"
 "Les adresses contenues seront conservées."
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2214
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 "Impossible de coller. Le carnet d'adresses de destination est en lecture "
 "seule."
 
-#: src/addressbook.c:2225
+#: src/addressbook.c:2224
 msgid "Cannot paste into an address group."
 msgstr "Impossible de coller dans une adresse de groupe."
 
-#: src/addressbook.c:2958
+#: src/addressbook.c:2961
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr ""
 "Voulez-vous effacer les résultats de la recherche et les adresses dans « %s "
 "» ?"
 
-#: src/addressbook.c:2961 src/addressbook.c:2987 src/addressbook.c:2994
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
+#: src/addressbook.c:2964 src/addressbook.c:2990 src/addressbook.c:2997
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
 #: src/toolbar.c:497
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/addressbook.c:2970
+#: src/addressbook.c:2973
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -723,20 +723,20 @@ msgstr ""
 "uniquement le dossier, les adresses qu'il contient seront déplacées dans le "
 "dossier parent."
 
-#: src/addressbook.c:2973 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
+#: src/addressbook.c:2976 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:2974
+#: src/addressbook.c:2977
 msgid "Delete _folder only"
 msgstr "Supprimer le _Dossier uniquement"
 
-#: src/addressbook.c:2974
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -745,7 +745,7 @@ msgstr ""
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront conservées."
 
-#: src/addressbook.c:2992
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -754,30 +754,30 @@ msgstr ""
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront définitivement perdues."
 
-#: src/addressbook.c:3106
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr "Recherche « %s »"
 
-#: src/addressbook.c:3244 src/addressbook.c:3293
+#: src/addressbook.c:3247 src/addressbook.c:3296
 msgid "New Contacts"
 msgstr "Nouveaux contacts"
 
-#: src/addressbook.c:4132
+#: src/addressbook.c:4135
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur·rice. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:4136
+#: src/addressbook.c:4139
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur·rice. Impossible d'enregistrer le fichier de carnet "
 "d'adresses."
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4149
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:4151
+#: src/addressbook.c:4154
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -785,7 +785,7 @@ msgstr ""
 "Ancien carnet d'adresses converti :\n"
 "Mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4167
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -793,7 +793,7 @@ msgstr ""
 "Échec lors de la conversion de l'ancien carnet d'adresses :\n"
 "Création d'un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4173
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -801,7 +801,7 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses :\n"
 "Impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:4175
+#: src/addressbook.c:4178
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -809,57 +809,57 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses\n"
 "et lors de la création d'un nouveau carnet d'adresses."
 
-#: src/addressbook.c:4182 src/addressbook.c:4188
+#: src/addressbook.c:4185 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:4303
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:4304
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:4635
+#: src/addressbook.c:4638
 msgid "Busy searching..."
 msgstr "Recherche.."
 
-#: src/addressbook.c:4965 src/prefs_send.c:220
+#: src/addressbook.c:4968 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4977
+#: src/addressbook.c:4980
 msgid "Address Books"
 msgstr "Carnets d'adresses"
 
-#: src/addressbook.c:4989
+#: src/addressbook.c:4992
 msgid "Person"
 msgstr "Contact"
 
-#: src/addressbook.c:5025 src/exporthtml.c:884 src/folderview.c:354
-#: src/folderview.c:442 src/prefs_account.c:3169 src/prefs_folder_column.c:77
+#: src/addressbook.c:5028 src/exporthtml.c:885 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3169 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:5037
+#: src/addressbook.c:5040
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5049 src/addressbook.c:5061
+#: src/addressbook.c:5052 src/addressbook.c:5064
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5073
+#: src/addressbook.c:5076
 msgid "LDAP servers"
 msgstr "Serveurs LDAP"
 
-#: src/addressbook.c:5085
+#: src/addressbook.c:5088
 msgid "LDAP Query"
 msgstr "Requête LDAP"
 
 #: src/addressbook_foldersel.c:200 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:984 src/importldif.c:541
+#: src/exporthtml.c:985 src/importldif.c:541
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
@@ -880,7 +880,7 @@ msgid "Collecting addresses..."
 msgstr "Récupération des adresses.."
 
 #: src/addrgather.c:254
-msgid "address added by claws-mail"
+msgid "address added by Claws Mail"
 msgstr "adresse ajoutée par Claws Mail"
 
 #: src/addrgather.c:285
@@ -913,7 +913,7 @@ msgstr "Chercher dans les en-têtes suivants"
 msgid "Include subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
-#: src/addrgather.c:492 src/prefs_filtering_action.c:1405
+#: src/addrgather.c:492 src/prefs_filtering_action.c:1383
 msgid "Header Name"
 msgstr "En-tête"
 
@@ -938,45 +938,45 @@ msgstr "Récupération d'adresses email des messages sélectionnés"
 msgid "Collect email addresses from folder"
 msgstr "Récupération d'adresses email d'un dossier"
 
-#: src/addrindex.c:124
+#: src/addrindex.c:125
 msgid "Common addresses"
 msgstr "Adresses courantes"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:126
 msgid "Personal addresses"
 msgstr "Adresses personnelles"
 
-#: src/addrindex.c:131
+#: src/addrindex.c:132
 msgid "Common address"
 msgstr "Adresse courante"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:133
 msgid "Personal address"
 msgstr "Adresse personnelle"
 
-#: src/addrindex.c:1829
+#: src/addrindex.c:1830
 msgid "Address(es) update"
 msgstr "Mise à jour d'adresses"
 
-#: src/addrindex.c:1830
+#: src/addrindex.c:1831
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "La mise à jour a échoué. Les modifications ne seront pas appliquées au "
 "répertoire."
 
-#: src/alertpanel.c:144 src/compose.c:9737
+#: src/alertpanel.c:144 src/compose.c:9783
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:157 src/compose.c:5813 src/compose.c:6341
-#: src/compose.c:12180 src/file_checker.c:78 src/file_checker.c:101
-#: src/messageview.c:856 src/plugins/pgpcore/sgpgme.c:806
-#: src/plugins/vcalendar/vcalendar.c:124 src/summaryview.c:5024
+#: src/alertpanel.c:157 src/compose.c:5848 src/compose.c:6390
+#: src/compose.c:12246 src/file_checker.c:79 src/file_checker.c:102
+#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:807
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5071
 msgid "Warning"
 msgstr "Alerte"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5750 src/inc.c:719
-#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:310
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5785 src/inc.c:723
+#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
 msgid "Error"
 msgstr "Erreur"
 
@@ -1008,67 +1008,67 @@ msgstr "Nom LDAP"
 msgid "Attribute Value"
 msgstr "Valeur de l'attribut"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:70
 msgid "Nothing"
 msgstr "« Rien »"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:71
 msgid "a viewer"
 msgstr "un visualiseur"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:72
 msgid "a MIME parser"
 msgstr "un parser MIME"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:73
 msgid "folders"
 msgstr "des dossiers"
 
-#: src/common/plugin.c:73
+#: src/common/plugin.c:74
 msgid "filtering"
 msgstr "un outil de filtrage"
 
-#: src/common/plugin.c:74
+#: src/common/plugin.c:75
 msgid "a privacy interface"
 msgstr "une interface de confidentialité"
 
-#: src/common/plugin.c:75
+#: src/common/plugin.c:76
 msgid "a notifier"
 msgstr "un notificateur"
 
-#: src/common/plugin.c:76
+#: src/common/plugin.c:77
 msgid "an utility"
 msgstr "un utilitaire"
 
-#: src/common/plugin.c:77
+#: src/common/plugin.c:78
 msgid "things"
 msgstr "des choses"
 
-#: src/common/plugin.c:334
+#: src/common/plugin.c:335
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Ce module fournit %s (%s), qui est déjà fourni par le module %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:438
 msgid "Plugin already loaded"
 msgstr "Module déjà chargé."
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:449
 msgid "Failed to allocate memory for Plugin"
 msgstr "Échec lors de l'allocation de la mémoire pour le module."
 
-#: src/common/plugin.c:482
+#: src/common/plugin.c:483
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Ce module n'est pas distribué sous la licence GPL en version 3 ou une "
 "licence ultérieure compatible."
 
-#: src/common/plugin.c:491
+#: src/common/plugin.c:492
 msgid "This module is for Claws Mail GTK1."
 msgstr "Ce module est pour Claws Mail GTK1."
 
-#: src/common/plugin.c:769
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1077,7 +1077,7 @@ msgstr ""
 "La version de Claws Mail actuellement utilisée est plus récente que celle "
 "pour laquelle le module '%s' a été compilé."
 
-#: src/common/plugin.c:772
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1085,20 +1085,20 @@ msgstr ""
 "La version de Claws Mail actuellement utilisée est plus récente que celle "
 "pour laquelle le module a été compilé."
 
-#: src/common/plugin.c:781
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 "La version de Claws Mail actuellement utilisée est trop ancienne pour le "
 "module '%s'."
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 "La version de Claws Mail actuellement utilisée est trop ancienne pour le "
 "module."
 
-#: src/common/session.c:202 src/imap.c:1225
+#: src/common/session.c:202 src/imap.c:1226
 msgid "SSL/TLS handshake failed\n"
 msgstr "Échec de la négociation SSL/TLS\n"
 
@@ -1118,7 +1118,7 @@ msgstr "Réponse SMTP incorrecte\n"
 msgid "error occurred on SMTP session\n"
 msgstr "Erreur pendant la session SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:905
+#: src/common/smtp.c:535 src/pop.c:906
 msgid "error occurred on authentication\n"
 msgstr "Erreur lors de l'autorisation\n"
 
@@ -1127,7 +1127,7 @@ msgstr "Erreur lors de l'autorisation\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Ce message est trop volumineux (la taille maximale étant de %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:898
+#: src/common/smtp.c:617 src/pop.c:899
 msgid "couldn't start STARTTLS session\n"
 msgstr "Impossible d'initier une session STARTTLS\n"
 
@@ -1159,81 +1159,81 @@ msgstr "%s:%s : échec de la recherche de l'hôte (%s).\n"
 msgid "write on fd%d: %s\n"
 msgstr "écriture sur fd%d : %s\n"
 
-#: src/common/ssl_certificate.c:326
+#: src/common/ssl_certificate.c:339
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "Impossible d'accéder au fichier de certificat P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:334
+#: src/common/ssl_certificate.c:347
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "Impossible de lire le fichier de certificat P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:343
+#: src/common/ssl_certificate.c:356
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "Impossible d'importer le fichier de certificat P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:628
+#: src/common/ssl_certificate.c:641
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: src/common/ssl_certificate.c:633
+#: src/common/ssl_certificate.c:646
 msgid "Uncheckable"
 msgstr "Non checkable"
 
-#: src/common/ssl_certificate.c:637
+#: src/common/ssl_certificate.c:650
 msgid "Self-signed certificate"
 msgstr "Certificat auto-signé"
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:653
 msgid "Revoked certificate"
 msgstr "Révoquer le certificat"
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:655
 msgid "No certificate issuer found"
 msgstr "Aucun émetteur de certificat trouvé"
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:657
 msgid "Certificate issuer is not a CA"
 msgstr "L'émetteur du certificat n'est pas une Autorité de Certification (CA)."
 
-#: src/common/ssl_certificate.c:869
+#: src/common/ssl_certificate.c:882
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "Impossible d'ouvrir le fichier de certificat %s : %s\n"
 
-#: src/common/ssl_certificate.c:873
+#: src/common/ssl_certificate.c:886
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "Le fichier de certificat %s est manquant (%s)\n"
 
-#: src/common/ssl_certificate.c:892
+#: src/common/ssl_certificate.c:905
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "Impossible d'ouvrir le fichier de clé %s (%s)\n"
 
-#: src/common/ssl_certificate.c:896
+#: src/common/ssl_certificate.c:909
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "Fichier clé %s manquant (%s)\n"
 
-#: src/common/ssl_certificate.c:1044
+#: src/common/ssl_certificate.c:1057
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "Impossible d'ouvrir le fichier de certificat P12 %s\n"
 
-#: src/common/ssl_certificate.c:1047
+#: src/common/ssl_certificate.c:1060
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "Impossible d'ouvrir le fichier de certificat P12 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1051
+#: src/common/ssl_certificate.c:1064
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "Le fichier de certificat P12 %s est manquant (%s)\n"
 
-#: src/common/ssl_certificate.c:1076 src/gtk/sslcertwindow.c:85
+#: src/common/ssl_certificate.c:1089 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
 #: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
@@ -1244,650 +1244,664 @@ msgstr "<non spécifié dans le certificat>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Sujet supprimé par RegExp)"
 
-#: src/common/utils.c:220
+#: src/common/utils.c:198
 #, c-format
 msgid "%dB"
 msgstr "%do"
 
-#: src/common/utils.c:221
+#: src/common/utils.c:199
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dko"
 
-#: src/common/utils.c:222
+#: src/common/utils.c:200
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMo"
 
-#: src/common/utils.c:223
+#: src/common/utils.c:201
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGo"
 
-#: src/common/utils.c:4749
+#: src/common/utils.c:4009
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: src/common/utils.c:4750
+#: src/common/utils.c:4010
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lundi"
 
-#: src/common/utils.c:4751
+#: src/common/utils.c:4011
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: src/common/utils.c:4752
+#: src/common/utils.c:4012
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: src/common/utils.c:4753
+#: src/common/utils.c:4013
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: src/common/utils.c:4754
+#: src/common/utils.c:4014
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Vendredi"
 
-#: src/common/utils.c:4755
+#: src/common/utils.c:4015
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Samedi"
 
-#: src/common/utils.c:4757
+#: src/common/utils.c:4017
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Janvier"
 
-#: src/common/utils.c:4758
+#: src/common/utils.c:4018
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Février"
 
-#: src/common/utils.c:4759
+#: src/common/utils.c:4019
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Mars"
 
-#: src/common/utils.c:4760
+#: src/common/utils.c:4020
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Avril"
 
-#: src/common/utils.c:4761
+#: src/common/utils.c:4021
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4762
+#: src/common/utils.c:4022
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juin"
 
-#: src/common/utils.c:4763
+#: src/common/utils.c:4023
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juillet"
 
-#: src/common/utils.c:4764
+#: src/common/utils.c:4024
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Août"
 
-#: src/common/utils.c:4765
+#: src/common/utils.c:4025
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septembre"
 
-#: src/common/utils.c:4766
+#: src/common/utils.c:4026
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octobre"
 
-#: src/common/utils.c:4767
+#: src/common/utils.c:4027
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembre"
 
-#: src/common/utils.c:4768
+#: src/common/utils.c:4028
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Décembre"
 
-#: src/common/utils.c:4770
+#: src/common/utils.c:4030
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dim"
 
-#: src/common/utils.c:4771
+#: src/common/utils.c:4031
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4772
+#: src/common/utils.c:4032
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4773
+#: src/common/utils.c:4033
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mer"
 
-#: src/common/utils.c:4774
+#: src/common/utils.c:4034
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jeu"
 
-#: src/common/utils.c:4775
+#: src/common/utils.c:4035
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Ven"
 
-#: src/common/utils.c:4776
+#: src/common/utils.c:4036
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sam"
 
-#: src/common/utils.c:4778
+#: src/common/utils.c:4038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4779
+#: src/common/utils.c:4039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Fév"
 
-#: src/common/utils.c:4780
+#: src/common/utils.c:4040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4041
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Avr"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4042
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4043
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4784
+#: src/common/utils.c:4044
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jui"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4045
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aoû"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4046
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4787
+#: src/common/utils.c:4047
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4788
+#: src/common/utils.c:4048
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4049
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Déc"
 
-#: src/common/utils.c:4800
+#: src/common/utils.c:4060
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4801
+#: src/common/utils.c:4061
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4802
+#: src/common/utils.c:4062
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4803
+#: src/common/utils.c:4063
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:593
+#: src/compose.c:596
 msgid "_Add..."
 msgstr "_Ajouter.."
 
-#: src/compose.c:594 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:326
+#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "Enleve_r"
 
-#: src/compose.c:596 src/folderview.c:253
+#: src/compose.c:599 src/folderview.c:258
 msgid "_Properties..."
 msgstr "_Propriétés.."
 
-#: src/compose.c:603 src/mainwindow.c:517 src/messageview.c:212
+#: src/compose.c:606 src/mainwindow.c:517 src/messageview.c:214
 msgid "_Message"
 msgstr "_Message"
 
-#: src/compose.c:606
+#: src/compose.c:609
 msgid "_Spelling"
 msgstr "O_rthographe"
 
-#: src/compose.c:608 src/compose.c:675
+#: src/compose.c:611 src/compose.c:678
 msgid "_Options"
 msgstr "_Options"
 
-#: src/compose.c:612
+#: src/compose.c:615
 msgid "S_end"
 msgstr "_Envoyer"
 
-#: src/compose.c:613
+#: src/compose.c:616
 msgid "Send _later"
 msgstr "Envoyer _ultérieurement"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "_Attach file"
 msgstr "_Adjoindre un fichier"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "_Insert file"
 msgstr "_Insérer un fichier"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Insert si_gnature"
 msgstr "Insérer la si_gnature"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "_Replace signature"
 msgstr "_Remplacer la signature"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: src/compose.c:628 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "Ann_uler"
 
-#: src/compose.c:629 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Refaire"
 
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Co_uper"
 
-#: src/compose.c:636
+#: src/compose.c:639
 msgid "_Special paste"
 msgstr "Coller c_omme"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "As _quotation"
 msgstr "_Citation"
 
-#: src/compose.c:638
+#: src/compose.c:641
 msgid "_Wrapped"
 msgstr "Texte _justifié"
 
-#: src/compose.c:639
+#: src/compose.c:642
 msgid "_Unwrapped"
 msgstr "Texte _non justifié"
 
-#: src/compose.c:641 src/mainwindow.c:550
+#: src/compose.c:644 src/mainwindow.c:550
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Sélectionner tout"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "A_dvanced"
 msgstr "A_vancé"
 
-#: src/compose.c:644
+#: src/compose.c:647
 msgid "Move a character backward"
 msgstr "Reculer d'un _caractère"
 
-#: src/compose.c:645
+#: src/compose.c:648
 msgid "Move a character forward"
 msgstr "Avancer d'un c_aractère"
 
-#: src/compose.c:646
+#: src/compose.c:649
 msgid "Move a word backward"
 msgstr "Reculer d'un _mot"
 
-#: src/compose.c:647
+#: src/compose.c:650
 msgid "Move a word forward"
 msgstr "Avancer d'un m_ot"
 
-#: src/compose.c:648
+#: src/compose.c:651
 msgid "Move to beginning of line"
 msgstr "Aller en _début de ligne"
 
-#: src/compose.c:649
+#: src/compose.c:652
 msgid "Move to end of line"
 msgstr "Aller en _fin de ligne"
 
-#: src/compose.c:650
+#: src/compose.c:653
 msgid "Move to previous line"
 msgstr "Aller à la _ligne précédente"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Move to next line"
 msgstr "Aller à la l_igne suivante"
 
-#: src/compose.c:652
+#: src/compose.c:655
 msgid "Delete a character backward"
 msgstr "Supprimer le caractère _précédent"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Delete a character forward"
 msgstr "Supprimer le caractère _suivant"
 
-#: src/compose.c:654
+#: src/compose.c:657
 msgid "Delete a word backward"
 msgstr "Supprimer le mot p_récédent"
 
-#: src/compose.c:655
+#: src/compose.c:658
 msgid "Delete a word forward"
 msgstr "Supprimer le mot s_uivant"
 
-#: src/compose.c:656
+#: src/compose.c:659
 msgid "Delete line"
 msgstr "_Effacer la ligne"
 
-#: src/compose.c:657
+#: src/compose.c:660
 msgid "Delete to end of line"
 msgstr "Supprimer _jusqu'à la fin de la ligne"
 
-#: src/compose.c:660 src/messageview.c:229
+#: src/compose.c:663 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "Chercher dans le _message.."
 
-#: src/compose.c:663
+#: src/compose.c:666
 msgid "_Wrap current paragraph"
 msgstr "Justifier le _paragraphe actuel"
 
-#: src/compose.c:664
+#: src/compose.c:667
 msgid "Wrap all long _lines"
 msgstr "_Justifier tout le message"
 
-#: src/compose.c:666
+#: src/compose.c:669
 msgid "Edit with e_xternal editor"
 msgstr "Éditer avec un programme e_xterne"
 
-#: src/compose.c:669
+#: src/compose.c:672
 msgid "_Check all or check selection"
 msgstr "_Vérifier la sélection ou tout le texte"
 
-#: src/compose.c:670
+#: src/compose.c:673
 msgid "_Highlight all misspelled words"
 msgstr "Montrer les mots _inconnus"
 
-#: src/compose.c:671
+#: src/compose.c:674
 msgid "Check _backwards misspelled word"
 msgstr "Vérifier les mots _précédents"
 
-#: src/compose.c:672
+#: src/compose.c:675
 msgid "_Forward to next misspelled word"
 msgstr "Vérifier les mots _suivants et avancer"
 
-#: src/compose.c:679
+#: src/compose.c:682
 msgid "Reply _mode"
 msgstr "_Mode de réponse"
 
-#: src/compose.c:681
+#: src/compose.c:684
 msgid "Privacy _System"
 msgstr "S_ystème de confidentialité"
 
-#: src/compose.c:685
+#: src/compose.c:688
 msgid "_Priority"
 msgstr "_Priorité"
 
-#: src/compose.c:687 src/mainwindow.c:612 src/messageview.c:265
+#: src/compose.c:690 src/mainwindow.c:612 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "_Jeux de caractères"
 
-#: src/compose.c:692 src/mainwindow.c:617 src/messageview.c:270
+#: src/compose.c:695 src/mainwindow.c:617 src/messageview.c:272
 msgid "Western European"
 msgstr "Europe de l'Ouest"
 
-#: src/compose.c:693 src/mainwindow.c:618 src/messageview.c:271
+#: src/compose.c:696 src/mainwindow.c:618 src/messageview.c:273
 msgid "Baltic"
 msgstr "Baltique"
 
-#: src/compose.c:694 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:697 src/mainwindow.c:619 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: src/compose.c:695 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:275
 msgid "Arabic"
 msgstr "Arabe"
 
-#: src/compose.c:696 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:699 src/mainwindow.c:621 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
-#: src/compose.c:697 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:700 src/mainwindow.c:622 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japonais"
 
-#: src/compose.c:698 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:701 src/mainwindow.c:623 src/messageview.c:278
 msgid "Chinese"
 msgstr "Chinois"
 
-#: src/compose.c:699 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:702 src/mainwindow.c:624 src/messageview.c:279
 msgid "Korean"
 msgstr "Coréen"
 
-#: src/compose.c:700 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:280
 msgid "Thai"
 msgstr "Thaïlandais"
 
-#: src/compose.c:703 src/mainwindow.c:735 src/messageview.c:314
+#: src/compose.c:706 src/mainwindow.c:735 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Carnet d'adresses"
 
-#: src/compose.c:705
+#: src/compose.c:708
 msgid "_Template"
 msgstr "_Modèles"
 
-#: src/compose.c:707 src/mainwindow.c:763 src/messageview.c:334
+#: src/compose.c:710 src/mainwindow.c:763 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "_Actions"
 
-#: src/compose.c:716
+#: src/compose.c:719
 msgid "Aut_o wrapping"
 msgstr "Justifier aut_omatiquement pendant la saisie"
 
-#: src/compose.c:717
+#: src/compose.c:720
 msgid "Auto _indent"
 msgstr "_Indentation automatique"
 
-#: src/compose.c:718
+#: src/compose.c:721
 msgid "Si_gn"
 msgstr "_signer"
 
-#: src/compose.c:719
+#: src/compose.c:722
 msgid "_Encrypt"
 msgstr "_Chiffrer"
 
-#: src/compose.c:720
+#: src/compose.c:723
 msgid "_Request Return Receipt"
 msgstr "Demander un _accusé de réception"
 
-#: src/compose.c:721
+#: src/compose.c:724
 msgid "Remo_ve references"
 msgstr "Supprimer les _références"
 
-#: src/compose.c:722
+#: src/compose.c:725
 msgid "Show _ruler"
 msgstr "Afficher la _règle"
 
-#: src/compose.c:727 src/compose.c:737
+#: src/compose.c:730 src/compose.c:740
 msgid "_Normal"
 msgstr "_Normale"
 
-#: src/compose.c:728 src/mainwindow.c:666 src/messageview.c:303
+#: src/compose.c:731 src/mainwindow.c:666 src/messageview.c:305
+#: src/summaryview.c:430
 msgid "_All"
 msgstr "À _tous"
 
-#: src/compose.c:729 src/mainwindow.c:667 src/messageview.c:304
+#: src/compose.c:732 src/mainwindow.c:667 src/messageview.c:306
+#: src/summaryview.c:431
 msgid "_Sender"
 msgstr "À l'_expéditeur·rice"
 
-#: src/compose.c:730
+#: src/compose.c:733
 msgid "_Mailing-list"
 msgstr "La _liste"
 
-#: src/compose.c:735
+#: src/compose.c:738
 msgid "_Highest"
 msgstr "La plus _haute"
 
-#: src/compose.c:736
+#: src/compose.c:739
 msgid "Hi_gh"
 msgstr "Haute"
 
-#: src/compose.c:738
+#: src/compose.c:741
 msgid "Lo_w"
 msgstr "Ba_sse"
 
-#: src/compose.c:739
+#: src/compose.c:742
 msgid "_Lowest"
 msgstr "La plus _basse"
 
-#: src/compose.c:744 src/mainwindow.c:879 src/messageview.c:351
+#: src/compose.c:747 src/mainwindow.c:879 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Détection automatique"
 
-#: src/compose.c:745 src/mainwindow.c:880 src/messageview.c:352
+#: src/compose.c:748 src/mainwindow.c:880 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASC_II 7 bits (US-ASCII)"
 
-#: src/compose.c:746 src/mainwindow.c:881 src/messageview.c:353
+#: src/compose.c:749 src/mainwindow.c:881 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "_Unicode (UTF-8)"
 
-#: src/compose.c:750 src/mainwindow.c:885 src/messageview.c:357
+#: src/compose.c:753 src/mainwindow.c:885 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europe Centrale (ISO-8859-_2)"
 
-#: src/compose.c:753 src/mainwindow.c:888 src/messageview.c:360
+#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grec (ISO-8859-_7)"
 
-#: src/compose.c:758 src/mainwindow.c:893 src/messageview.c:365
+#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turc (ISO-8859-_9)"
 
-#: src/compose.c:1040
+#: src/compose.c:1015 src/compose.c:1697
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+"Vous avez choisi de signer et/ou de chiffrer ce message mais n'avez pas "
+"sélectionné de système de confidentialité.\n"
+"\n"
+"La signature et le chiffrement ont été désactivés pour ce message."
+
+#: src/compose.c:1051
 msgid "New message From format error."
 msgstr "Erreur de formatage du modèle d'expéditeur·rice des nouveaux messages."
 
-#: src/compose.c:1133
+#: src/compose.c:1144
 msgid "New message subject format error."
 msgstr "Erreur de formatage du modèle de sujet des nouveaux messages."
 
-#: src/compose.c:1165 src/quote_fmt.c:563
+#: src/compose.c:1176 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Le corps du modèle « Nouveau message » a une erreur à la ligne %d."
 
-#: src/compose.c:1430
+#: src/compose.c:1445
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Impossible de répondre. Le message original n'existe probablement pas."
 
-#: src/compose.c:1613 src/quote_fmt.c:580
+#: src/compose.c:1630 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "Le champ « De » du modèle « Réponse » contient une adresse email invalide."
 
-#: src/compose.c:1662 src/quote_fmt.c:583
+#: src/compose.c:1679 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Le corps du modèle « Réponse » a une erreur à la ligne %d."
 
-#: src/compose.c:1796 src/compose.c:1988 src/quote_fmt.c:600
+#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
 "Le champ « De » du modèle « Transfert » contient une adresse email invalide."
 
-#: src/compose.c:1857 src/quote_fmt.c:603
+#: src/compose.c:1883 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Le corps du modèle « Transfert » a une erreur à la ligne %d."
 
-#: src/compose.c:2031
+#: src/compose.c:2059
 msgid "Fw: multiple emails"
 msgstr "Fw : emails multiples"
 
-#: src/compose.c:2533
+#: src/compose.c:2566
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Le corps du modèle « Redirection » a une erreur à la ligne %d."
 
-#: src/compose.c:2600 src/gtk/headers.h:14
+#: src/compose.c:2633 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2603 src/gtk/headers.h:15
+#: src/compose.c:2636 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Cci:"
 
-#: src/compose.c:2606 src/gtk/headers.h:12
+#: src/compose.c:2639 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Répondre-à:"
 
-#: src/compose.c:2609 src/compose.c:4971 src/compose.c:4973
+#: src/compose.c:2642 src/compose.c:5006 src/compose.c:5008
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Groupe-de-discussion:"
 
-#: src/compose.c:2612 src/gtk/headers.h:34
+#: src/compose.c:2645 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Donnant-suite-à:"
 
-#: src/compose.c:2615 src/gtk/headers.h:17
+#: src/compose.c:2648 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En-réponse-à:"
 
-#: src/compose.c:2619 src/compose.c:4968 src/compose.c:4976
-#: src/gtk/headers.h:13 src/summary_search.c:423
+#: src/compose.c:2652 src/compose.c:5003 src/compose.c:5011
+#: src/gtk/headers.h:13 src/summary_search.c:421
 msgid "To:"
 msgstr "À:"
 
-#: src/compose.c:2809
+#: src/compose.c:2842
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Impossible d'adjoindre le fichier au message (échec de conversion de jeu de "
 "caractères)."
 
-#: src/compose.c:2815
+#: src/compose.c:2848
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1902,16 +1916,16 @@ msgstr[1] ""
 "Les fichiers suivants ont été joints au message :\n"
 "%s"
 
-#: src/compose.c:3095
+#: src/compose.c:3128
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Le « préfixe de citation » du modèle est invalide."
 
-#: src/compose.c:3624
+#: src/compose.c:3657
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Impossible de récupérer la taille du fichier '%s'."
 
-#: src/compose.c:3642
+#: src/compose.c:3675
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1920,57 +1934,57 @@ msgstr ""
 "Vous êtes sur le point d'insérer un fichier de %s dans le corps du message. "
 "Êtes-vous sûr·e de vouloir faire cela ?"
 
-#: src/compose.c:3645
+#: src/compose.c:3678
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr·e ?"
 
-#: src/compose.c:3646 src/compose.c:10781 src/compose.c:11659
+#: src/compose.c:3679 src/compose.c:10832 src/compose.c:11726
 msgid "_Insert"
 msgstr "_Insérer"
 
-#: src/compose.c:3771
+#: src/compose.c:3804
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:3772
+#: src/compose.c:3805
 msgid "Empty file"
 msgstr "Fichier vide"
 
-#: src/compose.c:3773
+#: src/compose.c:3806
 msgid "_Attach anyway"
 msgstr "_Attacher quand même"
 
-#: src/compose.c:3782
+#: src/compose.c:3815
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:3809
+#: src/compose.c:3842
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:4814 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4847 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [modifié]"
 
-#: src/compose.c:4821 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4854 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 
-#: src/compose.c:4824 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4857 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[Pas de sujet] - Composition d'un message%s"
 
-#: src/compose.c:4826 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4859 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Composition d'un message"
 
-#: src/compose.c:4853 src/messageview.c:885
+#: src/compose.c:4886 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1978,61 +1992,61 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez en sélectionner un avant d'envoyer du courrier."
 
-#: src/compose.c:5068 src/compose.c:5105
+#: src/compose.c:5103 src/compose.c:5140
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 "Le/la seul·e destinataire est l'adresse « %s » par défaut. Voulez-vous quand "
 "même envoyer le message ?"
 
-#: src/compose.c:5070 src/compose.c:5107 src/compose.c:5145 src/compose.c:5188
-#: src/prefs_account.c:3754 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5105 src/compose.c:5142 src/compose.c:5180 src/compose.c:5223
+#: src/prefs_account.c:3778 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:5072 src/compose.c:5109 src/compose.c:5146 src/compose.c:5189
-#: src/compose.c:5751 src/folderview.c:2543 src/messageview.c:857
-#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3042
+#: src/compose.c:5107 src/compose.c:5144 src/compose.c:5181 src/compose.c:5224
+#: src/compose.c:5786 src/folderview.c:2579 src/messageview.c:859
+#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/compose.c:5126
+#: src/compose.c:5161
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:5141
+#: src/compose.c:5176
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Le sujet est vide. %s"
 
-#: src/compose.c:5142 src/compose.c:5185
+#: src/compose.c:5177 src/compose.c:5220
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Voulez-vous quand même l'envoyer ?"
 
-#: src/compose.c:5143 src/compose.c:5186
+#: src/compose.c:5178 src/compose.c:5221
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Voulez-vous quand même le mettre en file d'attente d'envoi ?"
 
-#: src/compose.c:5145 src/compose.c:5188 src/toolbar.c:520
+#: src/compose.c:5180 src/compose.c:5223 src/toolbar.c:520
 msgid "Send later"
 msgstr "Plus tard"
 
-#: src/compose.c:5146 src/compose.c:5189
+#: src/compose.c:5181 src/compose.c:5224
 msgid "_Queue"
 msgstr "_Mettre en file d'attente"
 
-#: src/compose.c:5184
+#: src/compose.c:5219
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Le message sera envoyé à %d destinataires. %s"
 
-#: src/compose.c:5213
+#: src/compose.c:5248
 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:5216
+#: src/compose.c:5251
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2043,7 +2057,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5220
+#: src/compose.c:5255
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2054,7 +2068,7 @@ msgstr ""
 "\n"
 "Sa signature a échoué : %s"
 
-#: src/compose.c:5225
+#: src/compose.c:5260
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2065,7 +2079,7 @@ msgstr ""
 "\n"
 "Le chiffrement a échoué : %s"
 
-#: src/compose.c:5230
+#: src/compose.c:5265
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2075,7 +2089,7 @@ msgstr ""
 "\n"
 "La conversion de jeu de caractères a échoué."
 
-#: src/compose.c:5234
+#: src/compose.c:5269
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2085,7 +2099,7 @@ msgstr ""
 "\n"
 "La clé de chiffrement du destinataire n'est pas disponible."
 
-#: src/compose.c:5294 src/compose.c:5354
+#: src/compose.c:5329 src/compose.c:5389
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2093,7 +2107,7 @@ msgstr ""
 "Le message a été mis dans la file d'attente mais n'a pas pu être envoyé.\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
-#: src/compose.c:5350
+#: src/compose.c:5385
 #, c-format
 msgid ""
 "%s\n"
@@ -2102,7 +2116,7 @@ msgstr ""
 "%s\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
-#: src/compose.c:5747
+#: src/compose.c:5782
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2113,7 +2127,7 @@ msgstr ""
 "message vers le jeu de caractères spécifié (%s).\n"
 "Voulez-vous l'envoyer en %s ?"
 
-#: src/compose.c:5809
+#: src/compose.c:5844
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2127,70 +2141,70 @@ msgstr ""
 "\n"
 "Voulez-vous quand même l'envoyer ?"
 
-#: src/compose.c:6041
+#: src/compose.c:6076
 msgid "Encryption warning"
 msgstr "Avertissement concernant le chiffrement"
 
-#: src/compose.c:6042
+#: src/compose.c:6077
 msgid "C_ontinue"
 msgstr "_Poursuivre"
 
-#: src/compose.c:6091
+#: src/compose.c:6126
 msgid "No account for sending mails available!"
 msgstr "Il n'existe pas de compte pour l'envoi de messages."
 
-#: src/compose.c:6100
+#: src/compose.c:6135
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 "Le compte sélectionné n'est pas un compte NNTP : Poster est impossible."
 
-#: src/compose.c:6340
+#: src/compose.c:6389
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "La pièce jointe %s n'existe plus. Ignorer ?"
 
-#: src/compose.c:6342 src/mainwindow.c:657 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6391 src/mainwindow.c:657 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Interrompre l'envoi"
 
-#: src/compose.c:6342
+#: src/compose.c:6391
 msgid "Ignore attachment"
 msgstr "Ignorer cette pièce jointe"
 
-#: src/compose.c:6398
+#: src/compose.c:6447
 #, c-format
 msgid "Original %s part"
 msgstr "Partie %s originale"
 
-#: src/compose.c:6998
+#: src/compose.c:7047
 msgid "Add to address _book"
 msgstr "Ajouter au carnet d'_adresses"
 
-#: src/compose.c:7165
+#: src/compose.c:7214
 msgid "Delete entry contents"
 msgstr "Effacer le contenu du champ"
 
-#: src/compose.c:7169 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7218 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Taper <tab> pour utiliser à la complétion depuis le carnet d'adresse"
 
-#: src/compose.c:7401
+#: src/compose.c:7450
 msgid "Mime type"
 msgstr "Type Mime"
 
-#: src/compose.c:7407 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:451
-#: src/prefs_matcher.c:629 src/prefs_summaries.c:441
-#: src/prefs_summary_column.c:84 src/summaryview.c:449
+#: src/compose.c:7456 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:451
+#: src/prefs_matcher.c:640 src/prefs_summaries.c:612
+#: src/prefs_summary_column.c:84 src/summaryview.c:469
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:7470
+#: src/compose.c:7518
 msgid "Save Message to "
 msgstr "Enregistrer le message dans "
 
-#: src/compose.c:7498 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7549 src/editjpilot.c:276 src/editldap.c:517
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
-#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1080
+#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2199,27 +2213,27 @@ msgstr "Enregistrer le message dans "
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: src/compose.c:7520
+#: src/compose.c:7565
 msgid "Select folder to save message to"
 msgstr "Sélection du dossier où enregistrer le message"
 
-#: src/compose.c:7977
+#: src/compose.c:8022
 msgid "Hea_der"
 msgstr "E_n-tête"
 
-#: src/compose.c:7982
+#: src/compose.c:8027
 msgid "_Attachments"
 msgstr "Pièces _jointes"
 
-#: src/compose.c:7996
+#: src/compose.c:8041
 msgid "Othe_rs"
 msgstr "A_utres"
 
-#: src/compose.c:8011
+#: src/compose.c:8056
 msgid "S_ubject:"
 msgstr "S_ujet :"
 
-#: src/compose.c:8235
+#: src/compose.c:8280
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2228,19 +2242,19 @@ msgstr ""
 "Le correcteur orthographique n'a pu être lancé.\n"
 "%s"
 
-#: src/compose.c:8382
+#: src/compose.c:8427
 msgid "_From:"
 msgstr "_De :"
 
-#: src/compose.c:8399
+#: src/compose.c:8444
 msgid "Account to use for this email"
 msgstr "Compte à utiliser pour l'envoi de ce message"
 
-#: src/compose.c:8401
+#: src/compose.c:8446
 msgid "Sender address to be used"
 msgstr "Adresse email à utiliser en tant qu'expéditeur·rice"
 
-#: src/compose.c:8583
+#: src/compose.c:8628
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2249,50 +2263,50 @@ msgstr ""
 "Le système de confidentialité '%s' ne peut être chargé. Il sera impossible "
 "de signer ou chiffrer ce message."
 
-#: src/compose.c:8694 src/plugins/archive/archiver_gtk.c:1179
+#: src/compose.c:8739 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "_Aucun"
 
-#: src/compose.c:8795 src/prefs_template.c:751
+#: src/compose.c:8840 src/prefs_template.c:751
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Le corps du modèle a une erreur à la ligne %d."
 
-#: src/compose.c:8892
+#: src/compose.c:8937
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Erreur de formatage dans l'en-tête « %s » du modèle."
 
-#: src/compose.c:9315
+#: src/compose.c:9361
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:9330
+#: src/compose.c:9376
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:9404
+#: src/compose.c:9450
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:9421
+#: src/compose.c:9467
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:9454
+#: src/compose.c:9500
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:9474
+#: src/compose.c:9520
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:9475
+#: src/compose.c:9521
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:9734
+#: src/compose.c:9780
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2303,19 +2317,19 @@ msgstr ""
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
-#: src/compose.c:10202 src/messageview.c:1086
+#: src/compose.c:10253 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail nécessite un accès réseau pour envoyer ce message."
 
-#: src/compose.c:10395
+#: src/compose.c:10446
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
-#: src/compose.c:10399
+#: src/compose.c:10450
 msgid "Could not save draft"
 msgstr "Enregistrement impossible du brouillon"
 
-#: src/compose.c:10400
+#: src/compose.c:10451
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2324,24 +2338,24 @@ msgstr ""
 "Voulez-vous annuler la fermeture de l'application ou simplement interrompre "
 "l'édition de ce message ?"
 
-#: src/compose.c:10402
+#: src/compose.c:10453
 msgid "_Cancel exit"
 msgstr "A_nnuler"
 
-#: src/compose.c:10402
+#: src/compose.c:10453
 msgid "_Discard email"
 msgstr "_Interrompre"
 
-#: src/compose.c:10591 src/compose.c:10605
+#: src/compose.c:10642 src/compose.c:10656
 msgid "Select file"
 msgstr "Sélectionner un fichier"
 
-#: src/compose.c:10619
+#: src/compose.c:10670
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Échec lors de la lecture de « %s »."
 
-#: src/compose.c:10621
+#: src/compose.c:10672
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2350,54 +2364,54 @@ msgstr ""
 "Le fichier « %s » contient des caractères n'appartenant pas\n"
 "à l'encodage courant : l'insertion peut être incorrecte."
 
-#: src/compose.c:10700
+#: src/compose.c:10751
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:10701
+#: src/compose.c:10752
 msgid "This message has been modified. Discard it?"
 msgstr ""
 "Ce message a été modifié mais non envoyé. Voulez-vous interrompre sa "
 "composition ?"
 
-#: src/compose.c:10702 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10753 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Interrompre"
 
-#: src/compose.c:10702 src/compose.c:10707
+#: src/compose.c:10753 src/compose.c:10758
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10705 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10756 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: src/compose.c:10706
+#: src/compose.c:10757
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 "Ce message a été modifié. Voulez-vous enregistrer les dernières "
 "modifications ?"
 
-#: src/compose.c:10707
+#: src/compose.c:10758
 msgid "_Don't save"
 msgstr "_Ne pas enregistrer"
 
-#: src/compose.c:10778
+#: src/compose.c:10829
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voulez-vous utiliser le modèle « %s » ?"
 
-#: src/compose.c:10780
+#: src/compose.c:10831
 msgid "Apply template"
 msgstr "Utiliser le modèle"
 
-#: src/compose.c:10781 src/prefs_actions.c:329 src/prefs_filtering_action.c:594
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:769 src/prefs_template.c:310
+#: src/compose.c:10832 src/prefs_actions.c:330 src/prefs_filtering_action.c:582
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:794 src/prefs_template.c:310
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:11652
+#: src/compose.c:11719
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2412,20 +2426,20 @@ msgstr[1] ""
 "Voulez-vous insérer le contenu des %d fichiers directement dans le corps du "
 "message ou les adjoindre en tant que pièces jointes ?"
 
-#: src/compose.c:11658
+#: src/compose.c:11725
 msgid "Insert or attach?"
 msgstr "Insérer ou adjoindre ?"
 
-#: src/compose.c:11659
+#: src/compose.c:11726
 msgid "_Attach"
 msgstr "_Adjoindre"
 
-#: src/compose.c:11877
+#: src/compose.c:11944
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erreur de formatage de la citation à la ligne %d."
 
-#: src/compose.c:12174
+#: src/compose.c:12240
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2473,11 +2487,11 @@ msgstr "Création d'un rapport de bogue"
 msgid "Save crash information"
 msgstr "Enregistrer les données de l'interruption inattendue"
 
-#: src/editaddress.c:149 src/editaddress.c:287
+#: src/editaddress.c:150 src/editaddress.c:288
 msgid "Add New Person"
 msgstr "Ajout d'un contact"
 
-#: src/editaddress.c:151
+#: src/editaddress.c:152
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2503,7 +2517,7 @@ msgstr ""
 "Cliquez sur Valider pour continuer d'éditer ce contact ou\n"
 "sur Annuler pour fermer sans enregistrer."
 
-#: src/editaddress.c:162
+#: src/editaddress.c:163
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2525,35 +2539,35 @@ msgstr ""
 "Cliquez sur Valider pour continuer d'éditer ce contact ou\n"
 "sur Annuler pour fermer sans enregistrer."
 
-#: src/editaddress.c:288
+#: src/editaddress.c:289
 msgid "Edit Person Details"
 msgstr "Édition des coordonnées d'un contact"
 
-#: src/editaddress.c:506
+#: src/editaddress.c:507
 msgid "An Email address must be supplied."
 msgstr "L'adresse email est requise."
 
-#: src/editaddress.c:709 src/editaddress_other_attributes_ldap.c:205
+#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
 msgid "A Name and Value must be supplied."
 msgstr "Un nom et une valeur sont requis."
 
-#: src/editaddress.c:819 src/prefs_folder_item.c:1693
+#: src/editaddress.c:820 src/prefs_folder_item.c:1784
 msgid "Discard"
 msgstr "Annuler"
 
-#: src/editaddress.c:820
+#: src/editaddress.c:821
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/editaddress.c:850 src/editaddress.c:899
+#: src/editaddress.c:851 src/editaddress.c:900
 msgid "Edit Person Data"
 msgstr "Édition des coordonnées d'un contact"
 
-#: src/editaddress.c:928
+#: src/editaddress.c:929
 msgid "Choose a picture"
 msgstr "Choisir une image"
 
-#: src/editaddress.c:947
+#: src/editaddress.c:948
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2562,58 +2576,58 @@ msgstr ""
 "Échec lors de l'ajout de l'image: \n"
 "%s"
 
-#: src/editaddress.c:989
+#: src/editaddress.c:990
 msgid "_Set picture"
 msgstr "_Définir la photo"
 
-#: src/editaddress.c:990
+#: src/editaddress.c:991
 msgid "_Unset picture"
 msgstr "_Supprimer la photo"
 
-#: src/editaddress.c:1048
+#: src/editaddress.c:1049
 msgid "Photo"
 msgstr "Photo"
 
-#: src/editaddress.c:1095 src/editaddress.c:1097 src/expldifdlg.c:516
-#: src/exporthtml.c:761 src/ldif.c:746
+#: src/editaddress.c:1096 src/editaddress.c:1098 src/expldifdlg.c:516
+#: src/exporthtml.c:762 src/ldif.c:747
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#: src/editaddress.c:1106 src/editaddress.c:1110 src/ldif.c:754
+#: src/editaddress.c:1107 src/editaddress.c:1111 src/ldif.c:755
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/editaddress.c:1107 src/editaddress.c:1109 src/ldif.c:750
+#: src/editaddress.c:1108 src/editaddress.c:1110 src/ldif.c:751
 msgid "First Name"
 msgstr "Prénom"
 
-#: src/editaddress.c:1113 src/editaddress.c:1115
+#: src/editaddress.c:1114 src/editaddress.c:1116
 msgid "Nickname"
 msgstr "Surnom"
 
-#: src/editaddress.c:1251 src/editaddress.c:1292
+#: src/editaddress.c:1252 src/editaddress.c:1293
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1477 src/editaddress.c:1510 src/editaddress.c:1526
+#: src/editaddress.c:1478 src/editaddress.c:1511 src/editaddress.c:1527
 #: src/editaddress_other_attributes_ldap.c:376
-#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:221
+#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:222
 msgid "Value"
 msgstr "Valeur"
 
-#: src/editaddress.c:1592
+#: src/editaddress.c:1593
 msgid "_User Data"
 msgstr "Nom d'_utilisateur·rice"
 
-#: src/editaddress.c:1593
+#: src/editaddress.c:1594
 msgid "_Email Addresses"
 msgstr "_Adresses Email"
 
-#: src/editaddress.c:1596 src/editaddress.c:1599
+#: src/editaddress.c:1597 src/editaddress.c:1600
 msgid "O_ther Attributes"
 msgstr "Données _supplémentaires"
 
-#: src/editaddress.c:1767
+#: src/editaddress.c:1768
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2643,8 +2657,8 @@ msgid " Check File "
 msgstr " Vérifier le fichier "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2173
-#: src/wizard.c:1197 src/wizard.c:1617
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2178
+#: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Fichier"
 
@@ -2656,19 +2670,19 @@ msgstr "Nouveau carnet d'adresses"
 msgid "A Group Name must be supplied."
 msgstr "Donnez un nom de groupe."
 
-#: src/editgroup.c:294
+#: src/editgroup.c:296
 msgid "Edit Group Data"
 msgstr "Édition du groupe"
 
-#: src/editgroup.c:323 src/exporthtml.c:597
+#: src/editgroup.c:325 src/exporthtml.c:598
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: src/editgroup.c:342
+#: src/editgroup.c:344
 msgid "Addresses in Group"
 msgstr "Adresses dans le groupe"
 
-#: src/editgroup.c:377
+#: src/editgroup.c:378
 msgid "Available Addresses"
 msgstr "Adresses disponibles"
 
@@ -2694,12 +2708,12 @@ msgid "Input the new name of folder:"
 msgstr "Saisir le nouveau nom du dossier :"
 
 #: src/editgroup.c:556 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
+#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "New folder"
 msgstr "Nouveau dossier"
 
 #: src/editgroup.c:557 src/foldersel.c:571 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "Input the name of new folder:"
 msgstr "Saisir le nom du nouveau dossier :"
 
@@ -2727,14 +2741,14 @@ msgstr "Ajouter une donnée JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "LDAP - Sélection de bases de recherches"
 
-#: src/editldap_basedn.c:172 src/editldap.c:440 src/prefs_account.c:2925
+#: src/editldap_basedn.c:172 src/editldap.c:440 src/prefs_account.c:2930
 #: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "Hôte"
 
 #: src/editldap_basedn.c:182 src/editldap.c:457
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2932
-#: src/prefs_proxy.c:105 src/ssl_manager.c:108
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2937
+#: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
 
@@ -2794,7 +2808,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:469 src/prefs_account.c:3827
+#: src/editldap.c:469 src/prefs_account.c:3851
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2958,8 +2972,8 @@ msgstr "Mot de passe de connexion"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Le mot de passe de l'utilisateur·rice « Bind DN »."
 
-#: src/editldap.c:738 src/prefs_account.c:1406 src/prefs_account.c:2018
-#: src/prefs_account.c:2737 src/prefs_account.c:2765 src/prefs_account.c:2970
+#: src/editldap.c:738 src/prefs_account.c:1402 src/prefs_account.c:2023
+#: src/prefs_account.c:2742 src/prefs_account.c:2770 src/prefs_account.c:2975
 #: src/prefs_proxy.c:146
 msgid "Show password"
 msgstr "Afficher le mot de passe"
@@ -2981,11 +2995,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Le nombre maximal d'entrées à retourner lors d'une recherche."
 
-#: src/editldap.c:792 src/prefs_account.c:3718
+#: src/editldap.c:792 src/prefs_account.c:3742
 msgid "Basic"
 msgstr "Général"
 
-#: src/editldap.c:794 src/gtk/quicksearch.c:708
+#: src/editldap.c:794 src/gtk/quicksearch.c:706
 msgid "Extended"
 msgstr "Avancé"
 
@@ -2993,8 +3007,8 @@ msgstr "Avancé"
 msgid "Add New LDAP Server"
 msgstr "Configuration d'un nouveau serveur LDAP"
 
-#: src/edittags.c:192 src/prefs_filtering_action.c:1426
-#: src/prefs_summaries.c:448
+#: src/edittags.c:192 src/prefs_filtering_action.c:1402
+#: src/prefs_summaries.c:619
 msgid "Tag"
 msgstr "Label"
 
@@ -3120,25 +3134,26 @@ msgstr "Fichier HTML destinataire"
 msgid "B_rowse"
 msgstr "Pa_rcourir"
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:300
+#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:301
 msgid "Stylesheet"
 msgstr "Feuille de style"
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1577
-#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:125 src/mainwindow.c:1170
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
+#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:123 src/mainwindow.c:1170
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1041
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6197
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1037
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6244
 msgid "None"
 msgstr "Aucun"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:519 src/prefs_other.c:126
-#: src/prefs_other.c:414
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
+#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
+#: src/prefs_other.c:127 src/prefs_other.c:415
 msgid "Default"
 msgstr "Par défaut"
 
 #: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
+#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
 msgid "Full"
 msgstr "Complet"
 
@@ -3368,7 +3383,7 @@ msgstr "Exporter le carnet d'adresses vers un ficher LDIF"
 msgid "Distinguished Name"
 msgstr "Nom absolu (DN)"
 
-#: src/export.c:113 src/summaryview.c:8369
+#: src/export.c:113 src/summaryview.c:8459
 msgid "Export to mbox file"
 msgstr "Exporter la sélection en fichier mbox"
 
@@ -3404,48 +3419,48 @@ msgstr "Sélection du fichier exporté"
 msgid "Select folder to export"
 msgstr "Sélection du dossier pour l'export"
 
-#: src/exporthtml.c:767
+#: src/exporthtml.c:768
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: src/exporthtml.c:771 src/importldif.c:980
-#: src/plugins/archive/archiver_gtk.c:771
+#: src/exporthtml.c:772 src/importldif.c:980
+#: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "Attributs"
 
-#: src/exporthtml.c:974
+#: src/exporthtml.c:975
 msgid "Claws Mail Address Book"
 msgstr "Carnet d'adresses de Claws Mail"
 
-#: src/exporthtml.c:1069 src/exportldif.c:606
+#: src/exporthtml.c:1070 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
 msgstr "Le nom existe déjà mais ce n'est pas un dossier."
 
-#: src/exporthtml.c:1072 src/exportldif.c:609
+#: src/exporthtml.c:1073 src/exportldif.c:610
 msgid "No permissions to create directory."
 msgstr "Pas de permissions pour créer le dossier."
 
-#: src/exporthtml.c:1075 src/exportldif.c:612
+#: src/exporthtml.c:1076 src/exportldif.c:613
 msgid "Name is too long."
 msgstr "Le nom est trop long."
 
-#: src/exporthtml.c:1078 src/exportldif.c:615
+#: src/exporthtml.c:1079 src/exportldif.c:616
 msgid "Not specified."
 msgstr "Non spécifié."
 
-#: src/file_checker.c:76
+#: src/file_checker.c:77
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr ""
 "Le fichier %s est manquant ! Voulez-vous utiliser le fichier de sauvegarde "
 "du %s ?"
 
-#: src/file_checker.c:85 src/file_checker.c:108
+#: src/file_checker.c:86 src/file_checker.c:109
 #, c-format
 msgid "Could not copy %s to %s"
 msgstr "Impossible de copier %s vers %s"
 
-#: src/file_checker.c:99
+#: src/file_checker.c:100
 #, c-format
 msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3628,61 +3643,61 @@ msgstr ""
 "filtrage du message (%s%s%s)\n"
 "%sfichier message : %s\n"
 
-#: src/folder.c:1591 src/prefs_folder_item.c:315
+#: src/folder.c:1595 src/prefs_folder_item.c:319
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/folder.c:1595
+#: src/folder.c:1599
 msgid "Sent"
 msgstr "Envoyés"
 
-#: src/folder.c:1599 src/plugins/attachwarner/attachwarner.c:218
-#: src/prefs_folder_item.c:318
+#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
+#: src/prefs_folder_item.c:322
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/folder.c:1603 src/prefs_folder_item.c:319
+#: src/folder.c:1607 src/prefs_folder_item.c:323
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/folder.c:1607 src/prefs_folder_item.c:317
+#: src/folder.c:1611 src/prefs_folder_item.c:321
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/folder.c:2038
+#: src/folder.c:2042
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Traitement (%s)..\n"
 
-#: src/folder.c:3283
+#: src/folder.c:3287
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copie de %s vers %s..\n"
 
-#: src/folder.c:3283
+#: src/folder.c:3287
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Déplacement de %s vers %s..\n"
 
-#: src/folder.c:3593
+#: src/folder.c:3597
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Mise à jour du cache pour %s.."
 
-#: src/folder.c:4455
+#: src/folder.c:4459
 msgid "Processing messages..."
 msgstr "Traitement des messages.."
 
-#: src/folder.c:4590
+#: src/folder.c:4594
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniser %s pour une utilisation hors-ligne..\n"
 
-#: src/folder.c:4849
+#: src/folder.c:4853
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Un nom de dossier ne peut commencer ou finir par un point."
 
-#: src/folder.c:4853
+#: src/folder.c:4857
 msgid "A folder name can not end with a space."
 msgstr "Un nom de dossier ne peut pas finir par un espace."
 
@@ -3691,102 +3706,106 @@ msgid "Select folder"
 msgstr "Sélection d'un dossier"
 
 #: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
 #: src/foldersel.c:580 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2064
+#: src/plugins/rssyl/rssyl_cb_menu.c:202
+#: src/plugins/vcalendar/vcal_folder.c:2065
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
 
 #: src/foldersel.c:595 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
+#: src/plugins/vcalendar/vcal_folder.c:2072
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Le dossier '%s' existe déjà."
 
 #: src/foldersel.c:602 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:124
+#: src/plugins/rssyl/rssyl_cb_menu.c:125
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Impossible de créer le dossier '%s'."
 
-#: src/folderview.c:246
+#: src/folderview.c:251
 msgid "Mark all re_ad"
 msgstr "Marquer tous comme _lus"
 
-#: src/folderview.c:247
+#: src/folderview.c:252
 msgid "Mark all u_nread"
 msgstr "Marquer tou_s comme non lus"
 
-#: src/folderview.c:248
+#: src/folderview.c:253
 msgid "Mark all read recursi_vely"
 msgstr "Marquer tous comme lus récursivement"
 
-#: src/folderview.c:249
+#: src/folderview.c:254
 msgid "Mark all unread recursi_vely"
 msgstr "Marquer tous comme non lus récursi_vement"
 
-#: src/folderview.c:251
+#: src/folderview.c:256
 msgid "R_un processing rules"
 msgstr "Exéc_uter les règles de traitement"
 
-#: src/folderview.c:252 src/mainwindow.c:554
+#: src/folderview.c:257 src/mainwindow.c:554
 msgid "_Search folder..."
 msgstr "Chercher dans le _dossier.."
 
-#: src/folderview.c:254
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr "_Traitement.."
 
-#: src/folderview.c:255
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "_Vider la corbeille.."
 
-#: src/folderview.c:256
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr "_Envoyer les messages.."
 
-#: src/folderview.c:396 src/folderview.c:443
+#: src/folderview.c:268
+msgid "Set Displayed columns"
+msgstr "Sélect_ion des colonnes affichées"
+
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:392 src/summaryview.c:6471
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6518
 msgid "New"
 msgstr "Nouveau"
 
-#: src/folderview.c:397 src/folderview.c:444
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:391 src/summaryview.c:6473
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6520
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:398 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:446 src/summaryview.c:450
+#: src/folderview.c:457 src/summaryview.c:470
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:781
+#: src/folderview.c:808
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers.."
 
-#: src/folderview.c:866 src/summaryview.c:4235
+#: src/folderview.c:893 src/summaryview.c:4282
 msgid "Mark all as read"
 msgstr "Marquer tous comme lus"
 
-#: src/folderview.c:867
+#: src/folderview.c:894
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3794,16 +3813,16 @@ msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
 "dossiers comme lus ?"
 
-#: src/folderview.c:869 src/summaryview.c:4236
+#: src/folderview.c:896 src/summaryview.c:4283
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier comme lus ?"
 
-#: src/folderview.c:872 src/summaryview.c:4281
+#: src/folderview.c:899 src/summaryview.c:4328
 msgid "Mark all as unread"
 msgstr "Marquer tous comme non l_us"
 
-#: src/folderview.c:873
+#: src/folderview.c:900
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
@@ -3811,98 +3830,98 @@ msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
 "dossiers comme non lus ?"
 
-#: src/folderview.c:875 src/summaryview.c:4282
+#: src/folderview.c:902 src/summaryview.c:4329
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier comme non lus ?"
 
-#: src/folderview.c:1065 src/imap.c:4631
+#: src/folderview.c:1092 src/imap.c:4628
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Analyse du dossier %s/%s.."
 
-#: src/folderview.c:1068 src/imap.c:4635 src/mainwindow.c:5235 src/setup.c:96
+#: src/folderview.c:1095 src/imap.c:4632 src/mainwindow.c:5247 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Analyse du dossier %s.."
 
-#: src/folderview.c:1099
+#: src/folderview.c:1126
 msgid "Rebuild folder tree"
 msgstr "Reconstruction de l'arborescence"
 
-#: src/folderview.c:1100
+#: src/folderview.c:1127
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "La reconstruction de l'arborescence supprimera les caches locaux. Voulez-"
 "vous continuer ?"
 
-#: src/folderview.c:1110
+#: src/folderview.c:1137
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence.."
 
-#: src/folderview.c:1112
+#: src/folderview.c:1139
 msgid "Scanning folder tree..."
 msgstr "Analyse de l'arborescence.."
 
-#: src/folderview.c:1203
+#: src/folderview.c:1230
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Impossible d'ouvrir le dossier '%s'\n"
 
-#: src/folderview.c:1257
+#: src/folderview.c:1284
 msgid "Checking for new messages in all folders..."
 msgstr "Examiner tous les dossiers pour nouveaux messages.."
 
-#: src/folderview.c:2228
+#: src/folderview.c:2264
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fermeture du dossier %s.."
 
-#: src/folderview.c:2323
+#: src/folderview.c:2359
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Ouverture du dossier %s.."
 
-#: src/folderview.c:2341
+#: src/folderview.c:2377
 msgid "Folder could not be opened."
 msgstr "Le dossier n'a pu être ouvert."
 
-#: src/folderview.c:2483 src/mainwindow.c:2880 src/mainwindow.c:2885
+#: src/folderview.c:2519 src/mainwindow.c:2882 src/mainwindow.c:2887
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2484
+#: src/folderview.c:2520
 msgid "Delete all messages in trash?"
 msgstr "Voulez-vous vraiment supprimer tous les messages de la corbeille ?"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2521
 msgid "_Empty trash"
 msgstr "_Vider"
 
-#: src/folderview.c:2529 src/inc.c:1635 src/toolbar.c:3020
+#: src/folderview.c:2565 src/inc.c:1663 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Travail hors-ligne"
 
-#: src/folderview.c:2530 src/toolbar.c:3021
+#: src/folderview.c:2566 src/toolbar.c:3033
 msgid "You're working offline. Override?"
 msgstr ""
 "Attention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 
-#: src/folderview.c:2541 src/toolbar.c:3040
+#: src/folderview.c:2577 src/toolbar.c:3052
 msgid "Send queued messages"
 msgstr "Envoyer les messages en file d'attente"
 
-#: src/folderview.c:2542 src/toolbar.c:3041
+#: src/folderview.c:2578 src/toolbar.c:3053
 msgid "Send all queued messages?"
 msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
 
-#: src/folderview.c:2551 src/toolbar.c:3060
+#: src/folderview.c:2587 src/toolbar.c:3072
 msgid "Some errors occurred while sending queued messages."
 msgstr "Une erreur est survenue pendant l'envoi de messages en attente."
 
-#: src/folderview.c:2554 src/main.c:2792 src/toolbar.c:3063
+#: src/folderview.c:2590 src/main.c:2786 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3911,67 +3930,67 @@ msgstr ""
 "Une erreur est survenue pendant l'envoi de messages en attente :\n"
 "%s"
 
-#: src/folderview.c:2629
+#: src/folderview.c:2665
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Voulez-vous vraiment copier le dossier '%s' dans '%s' ?"
 
-#: src/folderview.c:2630
+#: src/folderview.c:2666
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Voulez-vous vraiment faire du dossier '%s' un sous-dossier de '%s' ?"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2668
 msgid "Copy folder"
 msgstr "Copie du dossier"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2668
 msgid "Move folder"
 msgstr "Déplacement du dossier"
 
-#: src/folderview.c:2643
+#: src/folderview.c:2679
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copie de %s vers %s.."
 
-#: src/folderview.c:2643
+#: src/folderview.c:2679
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Déplacement de %s vers %s.."
 
-#: src/folderview.c:2677
+#: src/folderview.c:2713
 msgid "Source and destination are the same."
 msgstr "Source et destination identiques."
 
-#: src/folderview.c:2680
+#: src/folderview.c:2716
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 "Il n'est pas possible de copier un dossier vers un de ses SOUS-DOSSIERS."
 
-#: src/folderview.c:2681
+#: src/folderview.c:2717
 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Il n'est pas possible de déplacer un dossier vers un de ses SOUS-DOSSIERS."
 
-#: src/folderview.c:2684
+#: src/folderview.c:2720
 msgid "A folder cannot be moved between different mailboxes."
 msgstr ""
 "Un dossier ne peut être déplacé à travers différentes boîtes aux lettres."
 
-#: src/folderview.c:2687
+#: src/folderview.c:2723
 msgid "Copy failed!"
 msgstr "La copie a échoué."
 
-#: src/folderview.c:2687
+#: src/folderview.c:2723
 msgid "Move failed!"
 msgstr "Le déplacement a échoué."
 
-#: src/folderview.c:2737
+#: src/folderview.c:2773
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Options de filtrage/traitement du dossier %s"
 
-#: src/folderview.c:3176 src/summaryview.c:4690 src/summaryview.c:4796
+#: src/folderview.c:3212 src/summaryview.c:4737 src/summaryview.c:4843
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 "Le dossier de destination ne peut être utilisé seulement pour stocker des "
@@ -4005,53 +4024,53 @@ msgstr "Messages"
 msgid "Type"
 msgstr "Type"
 
-#: src/grouplistdialog.c:347
+#: src/grouplistdialog.c:346
 msgid "moderated"
 msgstr "modéré"
 
-#: src/grouplistdialog.c:349
+#: src/grouplistdialog.c:348
 msgid "readonly"
 msgstr "lecture uniquement"
 
-#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:114
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: src/plugins/vcalendar/vcal_manager.c:115
+#: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/grouplistdialog.c:422
+#: src/grouplistdialog.c:421
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1863 src/summaryview.c:1626
+#: src/grouplistdialog.c:458 src/gtk/gtkutils.c:1857 src/summaryview.c:1669
 msgid "Done."
 msgstr "Terminé."
 
-#: src/grouplistdialog.c:492
+#: src/grouplistdialog.c:491
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d groupes de discussion reçus (%s lu)"
 
-#: src/gtk/about.c:132
+#: src/gtk/about.c:133
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr ""
 "Claws Mail est un client email conçu pour être léger, rapide,\n"
 "et hautement configurable."
 
-#: src/gtk/about.c:135
+#: src/gtk/about.c:136
 msgid "For further information visit the Claws Mail website:"
 msgstr ""
 "Pour plus d'informations au sujet des modules, voir le site web de Claws "
 "Mail :"
 
-#: src/gtk/about.c:140
+#: src/gtk/about.c:141
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
 "Pour vos questions ou discussions, vous pouvez vous inscrire à la liste de "
 "diffusion des utilisateur·rice·s de Claws Mail :"
 
-#: src/gtk/about.c:146
+#: src/gtk/about.c:147
 msgid ""
 "Claws Mail is free software released under the GPL. If you wish to donate to "
 "the Claws Mail project you can do so at:"
@@ -4060,7 +4079,7 @@ msgstr ""
 "faire un don au projet Claws Mail, vous pouvez le faire à l'adresse "
 "suivante :"
 
-#: src/gtk/about.c:162 src/gtk/about.c:850
+#: src/gtk/about.c:163 src/gtk/about.c:851
 msgid ""
 "Copyright (C) 1999-2018\n"
 "The Claws Mail Team\n"
@@ -4070,11 +4089,11 @@ msgstr ""
 "L'équipe Claws Mail\n"
 "et Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:167
+#: src/gtk/about.c:168
 msgid "System Information\n"
 msgstr "Informations systèmes :\n"
 
-#: src/gtk/about.c:173
+#: src/gtk/about.c:174
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4083,7 +4102,7 @@ msgstr ""
 "Localisation : %s (jeu de caractère : %s)\n"
 "Système d'exploitation : %s %s (%s)"
 
-#: src/gtk/about.c:182
+#: src/gtk/about.c:183
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4092,7 +4111,7 @@ msgstr ""
 "Localisation : %s (jeu de caractère : %s)\n"
 "Système d'exploitation : %s"
 
-#: src/gtk/about.c:191
+#: src/gtk/about.c:192
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4101,97 +4120,97 @@ msgstr ""
 "Localisation : %s (jeu de caractère : %s)\n"
 "Système d'exploitation : (inconnu)"
 
-#: src/gtk/about.c:247 src/prefs_themes.c:842 src/wizard.c:528
+#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
 msgid "The Claws Mail Team"
 msgstr "L'équipe de Claws Mail"
 
-#: src/gtk/about.c:266
+#: src/gtk/about.c:267
 msgid "Previous team members"
 msgstr "Les ancien·ne·s membres de l'équipe"
 
-#: src/gtk/about.c:285
+#: src/gtk/about.c:286
 msgid "The translation team"
 msgstr "L'équipe de traduction"
 
-#: src/gtk/about.c:304
+#: src/gtk/about.c:305
 msgid "Documentation team"
 msgstr "L'équipe de documentation"
 
-#: src/gtk/about.c:322
+#: src/gtk/about.c:323
 msgid "Logo"
 msgstr "Réalisation du logo"
 
-#: src/gtk/about.c:341
+#: src/gtk/about.c:342
 msgid "Icons"
 msgstr "Réalisation des icônes"
 
-#: src/gtk/about.c:360
+#: src/gtk/about.c:361
 msgid "Contributors"
 msgstr "Contributeur·rice·s"
 
-#: src/gtk/about.c:408
+#: src/gtk/about.c:409
 msgid "Compiled-in Features"
 msgstr "Options intégrées :"
 
-#: src/gtk/about.c:425
+#: src/gtk/about.c:426
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "support de l'en-tête X-Face,\n"
 
-#: src/gtk/about.c:435
+#: src/gtk/about.c:436
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "support de la correction orthographique\n"
 
-#: src/gtk/about.c:445
+#: src/gtk/about.c:446
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "support du cryptage des connexions aux serveurs,\n"
 
-#: src/gtk/about.c:455
+#: src/gtk/about.c:456
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr ""
 "support des adresses IPv6, le nouveau protocole d'adressage sur Internet,\n"
 
-#: src/gtk/about.c:466
+#: src/gtk/about.c:467
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "conversion depuis et vers des jeux de caractères différents,\n"
 
-#: src/gtk/about.c:476
+#: src/gtk/about.c:477
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "support des carnets d'adresses de type PalmOS,\n"
 
-#: src/gtk/about.c:486
+#: src/gtk/about.c:487
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "support des carnets d'adresses partagés via LDAP,\n"
 
-#: src/gtk/about.c:496
+#: src/gtk/about.c:497
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "support des connexions aux serveurs IMAP et NNTP,\n"
 
-#: src/gtk/about.c:506
+#: src/gtk/about.c:507
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "support pour la gestion des sessions.\n"
 
-#: src/gtk/about.c:516
+#: src/gtk/about.c:517
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "support pour la détection des changements de connexions réseau,\n"
 
-#: src/gtk/about.c:526
+#: src/gtk/about.c:527
 msgctxt "librSVG"
 msgid "adds support for SVG themes\n"
 msgstr "support pour les thèmes SVG\n"
 
 # NDT : références : <http://fsffrance.org/gpl/gpl-fr.fr.html> et
 # <http://www.gnu.org/licenses/translations.fr.html>
-#: src/gtk/about.c:558
+#: src/gtk/about.c:559
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4202,7 +4221,7 @@ msgstr ""
 "publiée par la Free Software Foundation ; soit la version 3 de la Licence, "
 "ou (à votre discrétion) une version ultérieure quelconque."
 
-#: src/gtk/about.c:565
+#: src/gtk/about.c:566
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4214,7 +4233,7 @@ msgstr ""
 "CONFORMITE A UNE UTILISATION PARTICULIERE. Voir la Licence Publique Générale "
 "GNU pour plus de détails."
 
-#: src/gtk/about.c:584
+#: src/gtk/about.c:585
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4222,147 +4241,147 @@ msgstr ""
 "Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU "
 "avec ce programme. Si ça n'était pas le cas, veuillez consulter "
 
-#: src/gtk/about.c:717 src/main.c:2616
+#: src/gtk/about.c:718 src/main.c:2610
 msgid "Session statistics\n"
 msgstr "Statistiques de la session\n"
 
-#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2626 src/main.c:2629
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2620 src/main.c:2623
 #, c-format
 msgid "Started: %s\n"
 msgstr "Démarrée le : %s\n"
 
-#: src/gtk/about.c:737 src/main.c:2635
+#: src/gtk/about.c:738 src/main.c:2629
 msgid "Incoming traffic\n"
 msgstr "Trafic entrant\n"
 
-#: src/gtk/about.c:740 src/main.c:2638
+#: src/gtk/about.c:741 src/main.c:2632
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Messages reçus : %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2644
+#: src/gtk/about.c:748 src/main.c:2638
 msgid "Outgoing traffic\n"
 msgstr "Trafic sortant\n"
 
-#: src/gtk/about.c:750 src/main.c:2647
+#: src/gtk/about.c:751 src/main.c:2641
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nouveaux messages et redirections : %d\n"
 
-#: src/gtk/about.c:755 src/main.c:2651
+#: src/gtk/about.c:756 src/main.c:2645
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Réponses : %d\n"
 
-#: src/gtk/about.c:760 src/main.c:2655
+#: src/gtk/about.c:761 src/main.c:2649
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Messages transférés : %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2659
+#: src/gtk/about.c:766 src/main.c:2653
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total des messages sortants : %d\n"
 
-#: src/gtk/about.c:792
+#: src/gtk/about.c:793
 msgid "About Claws Mail"
 msgstr "À propos de Claws Mail"
 
-#: src/gtk/about.c:864
+#: src/gtk/about.c:865
 msgid "_Info"
 msgstr "_Description"
 
-#: src/gtk/about.c:870
+#: src/gtk/about.c:871
 msgid "_Authors"
 msgstr "_Auteurs"
 
-#: src/gtk/about.c:876
+#: src/gtk/about.c:877
 msgid "_Features"
 msgstr "_Options"
 
-#: src/gtk/about.c:882
+#: src/gtk/about.c:883
 msgid "_License"
 msgstr "_Licence"
 
-#: src/gtk/about.c:890
+#: src/gtk/about.c:891
 msgid "_Release Notes"
 msgstr "_Notes de version"
 
-#: src/gtk/about.c:896
+#: src/gtk/about.c:897
 msgid "_Statistics"
 msgstr "_Statistiques"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:363
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Orange"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:367
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Rouge"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:371
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Rose"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:375
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Bleu ciel"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:379
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Bleu"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:383
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Vert"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:387
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Brun"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:391
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Gris"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:395
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Marron clair"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:399
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Rouge foncé"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:403
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Rose foncé"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:407
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Bleu acier"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:411
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Or"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:415
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Vert clair"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:419
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/foldersort.c:241
+#: src/gtk/foldersort.c:231
 msgid "Set mailbox order"
 msgstr "Définir l'ordre de tri des boîtes aux lettres"
 
-#: src/gtk/foldersort.c:275
+#: src/gtk/foldersort.c:265
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 "Monter ou descendre les boîtes aux lettres dans la liste pour changer "
 "l'ordre de tri dans la liste des dossiers."
 
-#: src/gtk/foldersort.c:309
+#: src/gtk/foldersort.c:299
 msgid "Mailboxes"
 msgstr "Boîtes aux lettres"
 
@@ -4471,26 +4490,26 @@ msgstr ""
 "Le correcteur orthographique n'a pas pu changer le dictionnaire alternatif.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1868
+#: src/gtk/gtkutils.c:1862
 msgid "Failed: no service record found."
 msgstr "Échec : service non fourni."
 
-#: src/gtk/gtkutils.c:1871
+#: src/gtk/gtkutils.c:1865
 msgid "Failed: network error."
 msgstr "Échec : problème de connexion réseau."
 
-#: src/gtk/gtkutils.c:1874
+#: src/gtk/gtkutils.c:1868
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Échec : erreur inconnue (%d)."
 
-#: src/gtk/gtkutils.c:1944
+#: src/gtk/gtkutils.c:1938
 msgid "Configuring..."
 msgstr "Configuration.."
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1242
-#: src/prefs_matcher.c:2164 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:448
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1224
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2213 src/prefs_summaries.c:613
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:468
 msgid "Date"
 msgstr "Date"
 
@@ -4498,13 +4517,13 @@ msgstr "Date"
 msgid "Date:"
 msgstr "Date:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1239
-#: src/prefs_matcher.c:2161 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:446
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1221
+#: src/prefs_matcher.c:2210 src/prefs_summaries.c:615
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:466
 msgid "From"
 msgstr "De"
 
-#: src/gtk/headers.h:10 src/summary_search.c:416
+#: src/gtk/headers.h:10 src/summary_search.c:414
 msgid "From:"
 msgstr "De:"
 
@@ -4520,14 +4539,14 @@ msgstr "Expéditeur·rice:"
 msgid "Reply-To"
 msgstr "Répondre-à"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1240
-#: src/prefs_matcher.c:2162 src/prefs_summaries.c:445
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:447
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1222
+#: src/prefs_matcher.c:2211 src/prefs_summaries.c:616
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:467
 msgid "To"
 msgstr "À"
 
-#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1241
-#: src/prefs_matcher.c:2163 src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1223
+#: src/prefs_matcher.c:2212 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4535,8 +4554,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Cci"
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1243
-#: src/prefs_matcher.c:2165 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1225
+#: src/prefs_matcher.c:2214 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Identifiant-du-message"
 
@@ -4548,8 +4567,8 @@ msgstr "Identifiant-du-message:"
 msgid "In-Reply-To"
 msgstr "En-réponse-à"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1245
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1227
+#: src/prefs_matcher.c:2216 src/quote_fmt.c:60
 msgid "References"
 msgstr "Références"
 
@@ -4557,14 +4576,14 @@ msgstr "Références"
 msgid "References:"
 msgstr "Références:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1238
-#: src/prefs_matcher.c:2160 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:445
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1220
+#: src/prefs_matcher.c:2209 src/prefs_summaries.c:617
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:465
 msgid "Subject"
 msgstr "Sujet"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:704
-#: src/summary_search.c:430
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/summary_search.c:428
 msgid "Subject:"
 msgstr "Sujet:"
 
@@ -4580,7 +4599,7 @@ msgstr "Commentaires:"
 msgid "Keywords"
 msgstr "Mots-clés"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Keywords:"
 msgstr "Mots-clés:"
 
@@ -4656,8 +4675,8 @@ msgstr "Reçu"
 msgid "Received:"
 msgstr "Reçu:"
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1244
-#: src/prefs_matcher.c:2166 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1226
+#: src/prefs_matcher.c:2215 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Groupe-de-discussion"
 
@@ -4682,8 +4701,9 @@ msgid "Seen:"
 msgstr "Consulté:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:450
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/summaryview.c:2853
+#: src/gtk/sslcertwindow.c:166 src/prefs_summaries.c:621
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/ssl_manager.c:124
+#: src/summaryview.c:2897
 msgid "Status"
 msgstr "État"
 
@@ -4727,7 +4747,7 @@ msgstr "Client-de-messagerie:"
 msgid "Content-Type"
 msgstr "Type-de-contenu"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:327
+#: src/gtk/headers.h:42 src/image_viewer.c:328
 msgid "Content-Type:"
 msgstr "Type-de-contenu:"
 
@@ -4755,7 +4775,7 @@ msgstr "Précédence"
 msgid "Precedence:"
 msgstr "Précédence:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1170
+#: src/gtk/headers.h:46 src/prefs_account.c:1166
 msgid "Organization"
 msgstr "Société"
 
@@ -5012,19 +5032,19 @@ msgstr "Retenir le mot de passe pour cette session"
 msgid "Remember this"
 msgstr "S'en souvenir"
 
-#: src/gtk/logwindow.c:453
+#: src/gtk/logwindow.c:449
 msgid "_Go to last error"
 msgstr "_Atteindre la dernière erreur"
 
-#: src/gtk/logwindow.c:460
+#: src/gtk/logwindow.c:456
 msgid "Clear _Log"
 msgstr "_Effacer les traces"
 
-#: src/gtk/menu.c:137
+#: src/gtk/menu.c:135
 msgid "Warning:"
 msgstr "Attention :"
 
-#: src/gtk/menu.c:138
+#: src/gtk/menu.c:136
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -5068,14 +5088,14 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:791
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
 #: src/plugins/address_keeper/address_keeper_prefs.c:273
 #: src/plugins/archive/archiver_prefs.c:106
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:114
+#: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
@@ -5104,7 +5124,7 @@ msgstr "_Charger.."
 msgid "_Unload"
 msgstr "_Enlever"
 
-#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:230
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:235
 msgid "Description"
 msgstr "Description"
 
@@ -5135,209 +5155,221 @@ msgstr "Préférences"
 msgid "_Hide"
 msgstr "_Cacher"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:692
-#: src/prefs_account.c:3717 src/prefs_account.c:3735 src/prefs_account.c:3753
-#: src/prefs_account.c:3771 src/prefs_account.c:3789 src/prefs_account.c:3807
-#: src/prefs_account.c:3826 src/prefs_account.c:3919 src/prefs_account.c:3937
-#: src/prefs_filtering_action.c:1401 src/prefs_filtering.c:397
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:693
+#: src/prefs_account.c:3741 src/prefs_account.c:3759 src/prefs_account.c:3777
+#: src/prefs_account.c:3795 src/prefs_account.c:3813 src/prefs_account.c:3831
+#: src/prefs_account.c:3850 src/prefs_account.c:3943 src/prefs_account.c:3961
+#: src/prefs_filtering_action.c:1379 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1883
 msgid "Account"
 msgstr "Compte"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:472
 msgid "all messages"
 msgstr "tous les messages"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:473
 msgid "messages whose age is greater than # days"
 msgstr "messages âgés de plus de # jours"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:474
 msgid "messages whose age is less than # days"
 msgstr "messages agés de moins de # jours"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:475
 msgid "messages whose age is greater than # hours"
 msgstr "messages âgés de plus de # heures"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:476
 msgid "messages whose age is less than # hours"
 msgstr "messages agés de moins de # heures"
 
-#: src/gtk/quicksearch.c:483
+#: src/gtk/quicksearch.c:477
 msgid "messages which contain S in the message body"
 msgstr "messages contenant S dans leur corps"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:478
 msgid "messages which contain S in the whole message"
 msgstr "message contenant S"
 
-#: src/gtk/quicksearch.c:485
+#: src/gtk/quicksearch.c:479
 msgid "messages carbon-copied to S"
 msgstr "messages contenant S dans l'en-tête « Cc: »"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:480
 msgid "message is either To: or Cc: to S"
 msgstr "messages contenant S dans les en-têtes « À: » ou « Cc: »"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:481
 msgid "deleted messages"
 msgstr "messages supprimés"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:482
+msgid "messages whose date is after requested date (time is optional)"
+msgstr ""
+"messages dont la date est ultérieure à la date requise (l'heure est "
+"facultative)"
+
+#: src/gtk/quicksearch.c:484
+msgid "messages whose date is before requested date (time is optional)"
+msgstr ""
+"messages dont la date est antérieure à la date requise (l'heure est "
+"facultative)"
+
+#: src/gtk/quicksearch.c:486
 msgid "messages which contain S in the Sender field"
 msgstr ""
 "messages contenant S dans l'en-tête d'expéditeur·rice (en-tête « "
 "Expéditeur·rice: »)"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:487
 msgid "true if execute \"S\" succeeds"
 msgstr "vrai si l'exécution de « S » réussit"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:488
 msgid "messages originating from user S"
 msgstr "messages venant de l'expéditeur·rice S"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:489
 msgid "forwarded messages"
 msgstr "messages transférés"
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:490
 msgid "messages which have attachments"
 msgstr "messages avec pièces jointes"
 
-#: src/gtk/quicksearch.c:493
+#: src/gtk/quicksearch.c:491
 msgid "messages which contain S in any header name or value"
 msgstr "messages contenant S dans un nom d'en-tête ou sa valeur"
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:492
 msgid "messages which contain S in the value of any header"
 msgstr "messages contenant S dans la valeur d'un en-tête"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:493
 msgid "messages which contain S in Message-ID header"
 msgstr "messages contenant S dans l'en-tête « Message-ID: »"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:494
 msgid "messages which contain S in In-Reply-To header"
 msgstr "messages contenant S dans l'en-tête « En-réponse-à: »"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:495
 msgid "messages which are marked with color #"
 msgstr "messages marqués de la couleur n°#"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:496
 msgid "locked messages"
 msgstr "messages verrouillés"
 
-#: src/gtk/quicksearch.c:499
+#: src/gtk/quicksearch.c:497
 msgid "messages which are in newsgroup S"
 msgstr "messages appartenant au groupe de discussion S"
 
-#: src/gtk/quicksearch.c:500
+#: src/gtk/quicksearch.c:498
 msgid "new messages"
 msgstr "nouveaux messages"
 
-#: src/gtk/quicksearch.c:501
+#: src/gtk/quicksearch.c:499
 msgid "old messages"
 msgstr "messages anciens"
 
-#: src/gtk/quicksearch.c:502
+#: src/gtk/quicksearch.c:500
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "messages incomplets (partiellement téléchargés)"
 
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:501
 msgid "messages which you have replied to"
 msgstr "messages auxquels vous avez répondu"
 
-#: src/gtk/quicksearch.c:504
+#: src/gtk/quicksearch.c:502
 msgid "read messages"
 msgstr "messages lus"
 
-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:503
 msgid "messages which contain S in subject"
 msgstr "messages contenant S dans le sujet"
 
-#: src/gtk/quicksearch.c:506
+#: src/gtk/quicksearch.c:504
 msgid "messages whose score is equal to # points"
 msgstr "messages dont le score est égal à # points"
 
-#: src/gtk/quicksearch.c:507
+#: src/gtk/quicksearch.c:505
 msgid "messages whose score is greater than # points"
 msgstr "messages dont le score est plus grand que # points"
 
-#: src/gtk/quicksearch.c:508
+#: src/gtk/quicksearch.c:506
 msgid "messages whose score is lower than # points"
 msgstr "messages dont le score est plus petit que # points"
 
-#: src/gtk/quicksearch.c:509
+#: src/gtk/quicksearch.c:507
 msgid "messages whose size is equal to # bytes"
 msgstr "messages dont la taille est égale à # octets"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:508
 msgid "messages whose size is greater than # bytes"
 msgstr "messages dont la taille est plus grande que # octets"
 
-#: src/gtk/quicksearch.c:511
+#: src/gtk/quicksearch.c:509
 msgid "messages whose size is smaller than # bytes"
 msgstr "messages dont la taille est plus petite que # octets"
 
-#: src/gtk/quicksearch.c:512
+#: src/gtk/quicksearch.c:510
 msgid "messages which have been sent to S"
 msgstr "messages qui ont été envoyés à S"
 
-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:511
 msgid "messages which tags contain S"
 msgstr "messages dont les labels contiennent S"
 
-#: src/gtk/quicksearch.c:514
+#: src/gtk/quicksearch.c:512
 msgid "messages which have tag(s)"
 msgstr "messages labellisés"
 
-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:513
 msgid "marked messages"
 msgstr "messages marqués"
 
-#: src/gtk/quicksearch.c:516
+#: src/gtk/quicksearch.c:514
 msgid "unread messages"
 msgstr "messages non lus"
 
-#: src/gtk/quicksearch.c:517
+#: src/gtk/quicksearch.c:515
 msgid "messages which contain S in References header"
 msgstr "messages contenant S dans l'en-tête « Références: »"
 
-#: src/gtk/quicksearch.c:518
+#: src/gtk/quicksearch.c:516
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "messages qui, passés à la commande « cmd », lui font\n"
 "retourner 0 (%F étant le fichier correspondant au message)"
 
-#: src/gtk/quicksearch.c:519
+#: src/gtk/quicksearch.c:517
 msgid "messages which contain S in X-Label header"
 msgstr "messages contenant S dans l'en-tête « X-Label: »"
 
-#: src/gtk/quicksearch.c:521
+#: src/gtk/quicksearch.c:519
 msgid "logical AND operator"
 msgstr "opérateur logique ET"
 
-#: src/gtk/quicksearch.c:522
+#: src/gtk/quicksearch.c:520
 msgid "logical OR operator"
 msgstr "opérateur logique OU"
 
-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:521
 msgid "logical NOT operator"
 msgstr "opérateur logique NON"
 
-#: src/gtk/quicksearch.c:524
+#: src/gtk/quicksearch.c:522
 msgid "case sensitive search"
 msgstr "recherche sensible à la casse"
 
-#: src/gtk/quicksearch.c:525
+#: src/gtk/quicksearch.c:523
 msgid "match using regular expressions instead of substring search"
 msgstr "recherche par expressions régulières au lieu de sous-chaînes"
 
-#: src/gtk/quicksearch.c:527
+#: src/gtk/quicksearch.c:525
 msgid ""
 "all filtering expressions are allowed, but cannot be mixed through logical "
 "operators with the expressions above"
@@ -5345,11 +5377,11 @@ msgstr ""
 "Toutes les conditions de filtrage sont utilisables, mais ne peuvent être "
 "combinées avec les expressions ci-dessus par des opérateurs logiques."
 
-#: src/gtk/quicksearch.c:537 src/summary_search.c:463
+#: src/gtk/quicksearch.c:535 src/summary_search.c:461
 msgid "Extended Search"
 msgstr "Recherche avancée"
 
-#: src/gtk/quicksearch.c:538
+#: src/gtk/quicksearch.c:536
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5360,98 +5392,107 @@ msgstr ""
 "répondant à ces critères.\n"
 "Il est possible d'utiliser les symboles suivants :"
 
-#: src/gtk/quicksearch.c:638
+#: src/gtk/quicksearch.c:640
 msgid "Something went wrong during search. Please check your logs."
 msgstr "La recherche a échoué. Consultez les traces d'activités."
 
-#: src/gtk/quicksearch.c:704
+#: src/gtk/quicksearch.c:702
 msgid "From/To/Cc/Subject/Tag"
 msgstr "De/À/Cc/Sujet/Label"
 
-#: src/gtk/quicksearch.c:715 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Récursif"
 
-#: src/gtk/quicksearch.c:724
+#: src/gtk/quicksearch.c:722
 msgid "Sticky"
 msgstr "Permanent"
 
-#: src/gtk/quicksearch.c:734
+#: src/gtk/quicksearch.c:732
 msgid "Type-ahead"
 msgstr "Dynamique"
 
-#: src/gtk/quicksearch.c:746
+#: src/gtk/quicksearch.c:744
 msgid "Run on select"
 msgstr "Sélection validante"
 
-#: src/gtk/quicksearch.c:784
+#: src/gtk/quicksearch.c:780
 msgid "Clear the current search"
 msgstr "Effacement de la recherche courante"
 
-#: src/gtk/quicksearch.c:794 src/summary_search.c:414
+#: src/gtk/quicksearch.c:790 src/summary_search.c:412
 msgid "Edit search criteria"
 msgstr "Édition des critères de recherche"
 
-#: src/gtk/quicksearch.c:803
+#: src/gtk/quicksearch.c:799
 msgid "Information about extended symbols"
 msgstr "Informations sur la syntaxe avancée"
 
-#: src/gtk/quicksearch.c:841 src/gtk/quicksearch.c:865
+#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
 msgid "_Information"
 msgstr "_Information"
 
-#: src/gtk/quicksearch.c:842 src/gtk/quicksearch.c:866
+#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
 msgid "E_dit"
 msgstr "É_dition"
 
-#: src/gtk/quicksearch.c:843 src/gtk/quicksearch.c:867 src/prefs_actions.c:347
+#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:348
 #: src/prefs_filtering.c:495 src/prefs_template.c:329
 msgid "C_lear"
 msgstr "_Effacer"
 
-#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348
-#: src/gtk/sslcertwindow.c:398 src/gtk/sslcertwindow.c:462
-msgid "Correct"
-msgstr "Correct"
+#: src/gtk/sslcertwindow.c:157 src/ssl_manager.c:325
+#, c-format
+msgid "Correct%s"
+msgstr "Correct%s"
 
-#: src/gtk/sslcertwindow.c:162
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:159
+#: src/ssl_manager.c:325 src/ssl_manager.c:329
+msgid " (expired)"
+msgstr "(expiré)"
+
+#: src/gtk/sslcertwindow.c:164
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:165
 msgid "Signer"
 msgstr "Signé par"
 
-#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
+#: src/gtk/sslcertwindow.c:172 src/gtk/sslcertwindow.c:196
 msgid "Name: "
 msgstr "Nom : "
 
-#: src/gtk/sslcertwindow.c:178 src/gtk/sslcertwindow.c:202
+#: src/gtk/sslcertwindow.c:180 src/gtk/sslcertwindow.c:204
 msgid "Organization: "
 msgstr "Société : "
 
-#: src/gtk/sslcertwindow.c:186 src/gtk/sslcertwindow.c:210
+#: src/gtk/sslcertwindow.c:188 src/gtk/sslcertwindow.c:212
 msgid "Location: "
 msgstr "Lieu : "
 
-#: src/gtk/sslcertwindow.c:218
+#: src/gtk/sslcertwindow.c:220
 msgid "Fingerprint: \n"
 msgstr "Empreinte : \n"
 
-#: src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:230
 msgid "Signature status: "
 msgstr "État des signatures : "
 
-#: src/gtk/sslcertwindow.c:235
+#: src/gtk/sslcertwindow.c:237
+msgid "Expired on: "
+msgstr "A expiré le : "
+
+#: src/gtk/sslcertwindow.c:237
 msgid "Expires on: "
 msgstr "Expire le : "
 
-#: src/gtk/sslcertwindow.c:302
+#: src/gtk/sslcertwindow.c:304
 #, c-format
 msgid "SSL/TLS certificate for %s"
 msgstr "Certificat SSL/TLS pour %s"
 
-#: src/gtk/sslcertwindow.c:318
+#: src/gtk/sslcertwindow.c:320
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5463,7 +5504,7 @@ msgstr ""
 "malveillant.\n"
 "\n"
 
-#: src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:340
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5474,32 +5515,37 @@ msgstr ""
 
 #: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
 #: src/gtk/sslcertwindow.c:464
+msgid "Correct"
+msgstr "Correct"
+
+#: src/gtk/sslcertwindow.c:352 src/gtk/sslcertwindow.c:402
+#: src/gtk/sslcertwindow.c:466
 #, c-format
 msgid "Signature status: %s"
 msgstr "État de la signature : %s"
 
-#: src/gtk/sslcertwindow.c:358 src/gtk/sslcertwindow.c:408
+#: src/gtk/sslcertwindow.c:360 src/gtk/sslcertwindow.c:410
 msgid "_View certificate"
 msgstr "_Voir le certificat"
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:366
 msgid "SSL/TLS certificate is invalid"
 msgstr "Le certificat SSL/TLS est invalide"
 
-#: src/gtk/sslcertwindow.c:366
+#: src/gtk/sslcertwindow.c:368
 msgid "SSL/TLS certificate is unknown"
 msgstr "Le certificat SSL/TLS est inconnu"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
-#: src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:371 src/gtk/sslcertwindow.c:421
+#: src/gtk/sslcertwindow.c:483
 msgid "_Cancel connection"
 msgstr "_Interrompre la connexion"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:371 src/gtk/sslcertwindow.c:483
 msgid "_Accept and save"
 msgstr "_Accepter et enregistrer"
 
-#: src/gtk/sslcertwindow.c:387
+#: src/gtk/sslcertwindow.c:389
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5508,27 +5554,27 @@ msgstr ""
 "Le certificat pour %s a expiré.\n"
 "%sVoulez-vous continuer ?"
 
-#: src/gtk/sslcertwindow.c:414
+#: src/gtk/sslcertwindow.c:416
 msgid "SSL/TLS certificate is invalid and expired"
 msgstr "Le certificat SSL/TLS est invalide et a expiré"
 
-#: src/gtk/sslcertwindow.c:416
+#: src/gtk/sslcertwindow.c:418
 msgid "SSL/TLS certificate is expired"
 msgstr "Le certificat SSL/TLS a expiré"
 
-#: src/gtk/sslcertwindow.c:419
+#: src/gtk/sslcertwindow.c:421
 msgid "_Accept"
 msgstr "_Accepter"
 
-#: src/gtk/sslcertwindow.c:439
+#: src/gtk/sslcertwindow.c:441
 msgid "New certificate:"
 msgstr "Nouveau certificat :"
 
-#: src/gtk/sslcertwindow.c:444
+#: src/gtk/sslcertwindow.c:446
 msgid "Known certificate:"
 msgstr "Certificat connu :"
 
-#: src/gtk/sslcertwindow.c:451
+#: src/gtk/sslcertwindow.c:453
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5537,15 +5583,15 @@ msgstr ""
 "Le certificat pour %s a changé.\n"
 "%sVoulez-vous l'accepter ?"
 
-#: src/gtk/sslcertwindow.c:472
+#: src/gtk/sslcertwindow.c:474
 msgid "_View certificates"
 msgstr "_Voir les certificats"
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:479
 msgid "SSL/TLS certificate changed and is invalid"
 msgstr "Le certificat SSL/TLS a changé et est invalide"
 
-#: src/gtk/sslcertwindow.c:479
+#: src/gtk/sslcertwindow.c:481
 msgid "SSL/TLS certificate changed"
 msgstr "Le certificat SSL/TLS a changé"
 
@@ -5555,227 +5601,227 @@ msgstr "Labels :"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3453
-#: src/summaryview.c:3471 src/summaryview.c:3510
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3498
+#: src/summaryview.c:3516 src/summaryview.c:3555
 msgid "(No From)"
 msgstr "(Pas d'expéditeur·rice)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3522
-#: src/summaryview.c:3525
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3567
+#: src/summaryview.c:3570
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/image_viewer.c:100
+#: src/image_viewer.c:101
 msgid "Error:"
 msgstr "Erreur : "
 
-#: src/image_viewer.c:299 src/mimeview.c:2613
+#: src/image_viewer.c:300 src/mimeview.c:2614
 #: src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:700
+#: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: src/image_viewer.c:306
+#: src/image_viewer.c:307
 msgid "Filesize:"
 msgstr "Taille du fichier :"
 
-#: src/image_viewer.c:355
+#: src/image_viewer.c:356
 msgid "Load Image"
 msgstr "Charger l'image"
 
-#: src/imap.c:576
+#: src/imap.c:577
 msgid "IMAP connection broken\n"
 msgstr "Connexion IMAP rompue\n"
 
-#: src/imap.c:615 src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627
-#: src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:644
-#: src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:656 src/imap.c:659
-#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
-#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
-#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
-#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
-#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
-#: src/imap.c:738 src/imap.c:742
+#: src/imap.c:616 src/imap.c:619 src/imap.c:622 src/imap.c:625 src/imap.c:628
+#: src/imap.c:632 src/imap.c:635 src/imap.c:638 src/imap.c:641 src/imap.c:645
+#: src/imap.c:648 src/imap.c:651 src/imap.c:654 src/imap.c:657 src/imap.c:660
+#: src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672 src/imap.c:675
+#: src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687 src/imap.c:690
+#: src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702 src/imap.c:705
+#: src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717 src/imap.c:720
+#: src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732 src/imap.c:735
+#: src/imap.c:739 src/imap.c:743
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Erreur IMAP sur %s :"
 
-#: src/imap.c:615
+#: src/imap.c:616
 msgid "authenticated"
 msgstr "authentifié"
 
-#: src/imap.c:618
+#: src/imap.c:619
 msgid "not authenticated"
 msgstr "non authentifié"
 
-#: src/imap.c:621
+#: src/imap.c:622
 msgid "bad state"
 msgstr "état incorrect"
 
-#: src/imap.c:624
+#: src/imap.c:625
 msgid "stream error"
 msgstr "erreur de flux"
 
-#: src/imap.c:627
+#: src/imap.c:628
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "erreur d'analyse (très probablement due au non-respect des RFC de la part du "
 "serveur)"
 
-#: src/imap.c:631
+#: src/imap.c:632
 msgid "connection refused"
 msgstr "connexion refusée"
 
-#: src/imap.c:634
+#: src/imap.c:635
 msgid "memory error"
 msgstr "erreur de mémoire"
 
-#: src/imap.c:637
+#: src/imap.c:638
 msgid "fatal error"
 msgstr "erreur fatale"
 
-#: src/imap.c:640
+#: src/imap.c:641
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 "erreur de protocole (très probablement due au non-respect des RFC de la part "
 "du serveur)"
 
-#: src/imap.c:644
+#: src/imap.c:645
 msgid "connection not accepted"
 msgstr "connexion non acceptée"
 
-#: src/imap.c:647
+#: src/imap.c:648
 msgid "APPEND error"
 msgstr "erreur de la commande « APPEND »"
 
-#: src/imap.c:650
+#: src/imap.c:651
 msgid "NOOP error"
 msgstr "erreur NOOP"
 
-#: src/imap.c:653
+#: src/imap.c:654
 msgid "LOGOUT error"
 msgstr "erreur de la commande « LOGOUT »"
 
-#: src/imap.c:656
+#: src/imap.c:657
 msgid "CAPABILITY error"
 msgstr "erreur de la commande « CAPABILITY »"
 
-#: src/imap.c:659
+#: src/imap.c:660
 msgid "CHECK error"
 msgstr "erreur de la commande « CHECK »"
 
-#: src/imap.c:662
+#: src/imap.c:663
 msgid "CLOSE error"
 msgstr "erreur de la commande « CLOSE »"
 
-#: src/imap.c:665
+#: src/imap.c:666
 msgid "EXPUNGE error"
 msgstr "erreur de la commande « EXPUNGE »"
 
-#: src/imap.c:668
+#: src/imap.c:669
 msgid "COPY error"
 msgstr "erreur de la commande « COPY »"
 
-#: src/imap.c:671
+#: src/imap.c:672
 msgid "UID COPY error"
 msgstr "erreur de la commande « UID COPY »"
 
-#: src/imap.c:674
+#: src/imap.c:675
 msgid "CREATE error"
 msgstr "erreur de la commande « CREATE »"
 
-#: src/imap.c:677
+#: src/imap.c:678
 msgid "DELETE error"
 msgstr "erreur de la commande « DELETE »"
 
-#: src/imap.c:680
+#: src/imap.c:681
 msgid "EXAMINE error"
 msgstr "erreur de la commande « EXAMINE »"
 
-#: src/imap.c:683
+#: src/imap.c:684
 msgid "FETCH error"
 msgstr "erreur de la commande « FETCH »"
 
-#: src/imap.c:686
+#: src/imap.c:687
 msgid "UID FETCH error"
 msgstr "erreur de la commande « UID FETCH »"
 
-#: src/imap.c:689
+#: src/imap.c:690
 msgid "LIST error"
 msgstr "erreur de la commande « LIST »"
 
-#: src/imap.c:692
+#: src/imap.c:693
 msgid "LOGIN error"
 msgstr "erreur de la commande « LOGIN »"
 
-#: src/imap.c:695
+#: src/imap.c:696
 msgid "LSUB error"
 msgstr "erreur de la commande « LSUB »"
 
-#: src/imap.c:698
+#: src/imap.c:699
 msgid "RENAME error"
 msgstr "erreur de la commande « RENAME »"
 
-#: src/imap.c:701
+#: src/imap.c:702
 msgid "SEARCH error"
 msgstr "erreur de la commande « SEARCH »"
 
-#: src/imap.c:704
+#: src/imap.c:705
 msgid "UID SEARCH error"
 msgstr "erreur de la commande « UID SEARCH »"
 
-#: src/imap.c:707
+#: src/imap.c:708
 msgid "SELECT error"
 msgstr "erreur de la commande « SELECT »"
 
-#: src/imap.c:710
+#: src/imap.c:711
 msgid "STATUS error"
 msgstr "erreur de la commande « STATUS »"
 
-#: src/imap.c:713
+#: src/imap.c:714
 msgid "STORE error"
 msgstr "erreur de la commande « STORE »"
 
-#: src/imap.c:716
+#: src/imap.c:717
 msgid "UID STORE error"
 msgstr "erreur de la commande « UID STORE »"
 
-#: src/imap.c:719
+#: src/imap.c:720
 msgid "SUBSCRIBE error"
 msgstr "erreur de la commande « SUBSCRIBE »"
 
-#: src/imap.c:722
+#: src/imap.c:723
 msgid "UNSUBSCRIBE error"
 msgstr "erreur de la commande « UNSUBSCRIBE »"
 
-#: src/imap.c:725
+#: src/imap.c:726
 msgid "STARTTLS error"
 msgstr "erreur de la commande « STARTTLS »"
 
-#: src/imap.c:728
+#: src/imap.c:729
 msgid "INVAL error"
 msgstr "erreur de la commande « INVAL »"
 
-#: src/imap.c:731
+#: src/imap.c:732
 msgid "EXTENSION error"
 msgstr "erreur de la commande « EXTENSION »"
 
-#: src/imap.c:734
+#: src/imap.c:735
 msgid "SASL error"
 msgstr "erreur SASL"
 
-#: src/imap.c:738
+#: src/imap.c:739
 msgid "SSL/TLS error"
 msgstr "erreur SSL/TLS"
 
-#: src/imap.c:742
+#: src/imap.c:743
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Erreur inconnue [%d]"
 
-#: src/imap.c:946
+#: src/imap.c:947
 msgid ""
 "\n"
 "\n"
@@ -5788,7 +5834,7 @@ msgstr ""
 "a été compilée avec le support SASL et si le module CRAM-MD5 SASL est "
 "installé."
 
-#: src/imap.c:952
+#: src/imap.c:953
 msgid ""
 "\n"
 "\n"
@@ -5801,7 +5847,7 @@ msgstr ""
 "'libetpan' a été compilée avec le support SASL et si le module DIGEST-MD5 "
 "SASL est installé."
 
-#: src/imap.c:958
+#: src/imap.c:959
 msgid ""
 "\n"
 "\n"
@@ -5814,7 +5860,7 @@ msgstr ""
 "'libetpan' a été compilée avec le support SASL et si le module SCRAM SASL "
 "est installé."
 
-#: src/imap.c:964
+#: src/imap.c:965
 msgid ""
 "\n"
 "\n"
@@ -5826,7 +5872,7 @@ msgstr ""
 "L'authentification PLAIN fonctionne uniquement si la librairie 'libetpan' a "
 "été compilée avec le support SASL et si le module PLAIN SASL est installé."
 
-#: src/imap.c:970
+#: src/imap.c:971
 msgid ""
 "\n"
 "\n"
@@ -5838,36 +5884,36 @@ msgstr ""
 "L'authentification LOGIN fonctionne uniquement si la librairie 'libetpan' a "
 "été compilée avec le support SASL et si le module LOGIN SASL est installé."
 
-#: src/imap.c:977
+#: src/imap.c:978
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "La connexion vers %s a échoué : nom d'utilisateur·rice refusé.%s"
 
-#: src/imap.c:981
+#: src/imap.c:982
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "La connexion vers %s a échoué : nom d'utilisateur·rice refusé.%s\n"
 
-#: src/imap.c:999
+#: src/imap.c:1000
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "La connexion vers %s a échoué."
 
-#: src/imap.c:1006 src/imap.c:1009
+#: src/imap.c:1007 src/imap.c:1010
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP vers %s a été rompue. Reconnexion..\n"
 
-#: src/imap.c:1039 src/imap.c:3681 src/imap.c:4340 src/imap.c:4434
-#: src/imap.c:4612 src/imap.c:5423
+#: src/imap.c:1040 src/imap.c:3678 src/imap.c:4337 src/imap.c:4431
+#: src/imap.c:4609 src/imap.c:5420
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail nécessite un accès réseau pour accéder au serveur IMAP."
 
-#: src/imap.c:1149 src/inc.c:869 src/news.c:400 src/send_message.c:284
+#: src/imap.c:1150 src/inc.c:873 src/news.c:401 src/send_message.c:285
 msgid "Insecure connection"
 msgstr "Connexion non sécurisée"
 
-#: src/imap.c:1150 src/inc.c:870 src/news.c:401 src/send_message.c:285
+#: src/imap.c:1151 src/inc.c:874 src/news.c:402 src/send_message.c:286
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5881,108 +5927,108 @@ msgstr ""
 "Voulez-vous quand même poursuivre la connexion à ce serveur même si la "
 "communication ne peut pas être sécurisée ?"
 
-#: src/imap.c:1156 src/inc.c:876 src/news.c:407 src/send_message.c:291
+#: src/imap.c:1157 src/inc.c:880 src/news.c:408 src/send_message.c:292
 msgid "Con_tinue connecting"
 msgstr "_Poursuivre la connexion"
 
-#: src/imap.c:1166
+#: src/imap.c:1167
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Compte '%s' : Connexion au serveur IMAP : %s:%d.."
 
-#: src/imap.c:1231
+#: src/imap.c:1232
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Impossible de se connecter au serveur IMAP : %s:%d"
 
-#: src/imap.c:1234
+#: src/imap.c:1235
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP : %s:%d\n"
 
-#: src/imap.c:1266 src/imap.c:4102
+#: src/imap.c:1267 src/imap.c:4099
 msgid "Can't start STARTTLS session.\n"
 msgstr "Impossible d'initier la session STARTTLS.\n"
 
-#: src/imap.c:1333
+#: src/imap.c:1334
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Connexion impossible au serveur IMAP %s.\n"
 
-#: src/imap.c:1336
+#: src/imap.c:1337
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Authentification impossible au serveur IMAP %s."
 
-#: src/imap.c:1764
+#: src/imap.c:1765
 msgid "Adding messages..."
 msgstr "Ajout des messages en cours.."
 
-#: src/imap.c:1969 src/mh.c:529
+#: src/imap.c:1970 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Copie des messages en cours.."
 
-#: src/imap.c:2491
+#: src/imap.c:2492
 msgid "Search failed due to server error."
 msgstr "Échec de la recherche dû à un problème de serveur."
 
-#: src/imap.c:2570
+#: src/imap.c:2571
 msgid "can't set deleted flags\n"
 msgstr "Impossible de marquer pour la suppression\n"
 
-#: src/imap.c:2577 src/imap.c:5053
+#: src/imap.c:2578 src/imap.c:5050
 msgid "can't expunge\n"
 msgstr "Impossible de purger\n"
 
-#: src/imap.c:2928
+#: src/imap.c:2929
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Recherche des dossiers non inscrits dans %s.."
 
-#: src/imap.c:2931
+#: src/imap.c:2932
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Recherche des sous-dossiers de %s.."
 
-#: src/imap.c:3221
+#: src/imap.c:3220
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: src/imap.c:3236
+#: src/imap.c:3233
 msgid "can't create mailbox\n"
 msgstr "Impossible de créer la boîte aux lettres\n"
 
-#: src/imap.c:3367
+#: src/imap.c:3364
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Impossible de renommer la boîte aux lettres %s en %s.\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3477
 msgid "can't delete mailbox\n"
 msgstr "Impossible de supprimer la boîte aux lettres.\n"
 
-#: src/imap.c:3759
+#: src/imap.c:3756
 msgid "LIST failed\n"
 msgstr "commande LIST échouée\n"
 
-#: src/imap.c:3844
+#: src/imap.c:3841
 msgid "Flagging messages..."
 msgstr "Marquage des messages en cours.."
 
-#: src/imap.c:3947
+#: src/imap.c:3944
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s.\n"
 
-#: src/imap.c:4099
+#: src/imap.c:4096
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Le serveur nécessite STARTTLS pour s'y connecter.\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4106
 msgid "Can't refresh capabilities.\n"
 msgstr "Impossible de rafraîchir la liste des facilités IMAP.\n"
 
-#: src/imap.c:4114
+#: src/imap.c:4111
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5991,20 +6037,20 @@ msgstr ""
 "La connexion vers %s a échoué : le serveur nécessite STARTTLS, mais Claws "
 "Mail a été compilé sans le support STARTTLS.\n"
 
-#: src/imap.c:4122
+#: src/imap.c:4119
 msgid "Server logins are disabled.\n"
 msgstr "Les connexions au serveur sont désactivées.\n"
 
-#: src/imap.c:4345
+#: src/imap.c:4342
 msgid "Fetching message..."
 msgstr "Lecture du message en cours.."
 
-#: src/imap.c:5046
+#: src/imap.c:5043
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Impossible de marquer pour la suppression : %d.\n"
 
-#: src/imap.c:6081
+#: src/imap.c:6078
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6056,7 +6102,7 @@ msgstr "_Inscriptions"
 msgid "_Subscribe..."
 msgstr "S'_inscrire"
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:170
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Unsubscribe..."
 msgstr "Se _désinscrire.."
 
@@ -6088,25 +6134,25 @@ msgstr ""
 "mais sans messages, veuillez ajouter '/' à la fin du nom)"
 
 #: src/imap_gtk.c:198 src/mh_gtk.c:147
-msgid "Inherit properties from parent folder"
-msgstr "Hériter des options du dossier parent"
+msgid "Inherit properties and processing rules from parent folder"
+msgstr "Hériter des options et règles de traitement du dossier parent"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2056
+#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
+#: src/plugins/vcalendar/vcal_folder.c:2057
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Saisir le nouveau nom pour '%s' :"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
-#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2057
+#: src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2058
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2077
+#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:220
+#: src/plugins/vcalendar/vcal_folder.c:2078
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6124,7 +6170,7 @@ msgstr "Sélection du dossier où déplacer le dossier '%s'"
 msgid "Select folder to copy folder '%s' to"
 msgstr "Sélection du dossier où copier le dossier '%s'"
 
-#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:153
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6138,8 +6184,8 @@ msgstr ""
 "Voulez-vous vraiment les supprimer ?"
 
 #: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
-#: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2010
+#: src/plugins/rssyl/rssyl_cb_menu.c:172
+#: src/plugins/vcalendar/vcal_folder.c:2011
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible de supprimer le dossier '%s'."
@@ -6202,8 +6248,8 @@ msgstr "inscrire au"
 msgid "unsubscribe"
 msgstr "désinscrire du"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1446 src/prefs_folder_item.c:1474
-#: src/prefs_folder_item.c:1502
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1537 src/prefs_folder_item.c:1565
+#: src/prefs_folder_item.c:1593
 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
@@ -6304,7 +6350,7 @@ msgstr "Sélectionner le fichier LDIF à importer."
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:710 src/summaryview.c:443
+#: src/importldif.c:710 src/summaryview.c:463
 msgid "S"
 msgstr "S"
 
@@ -6405,142 +6451,142 @@ msgstr "Sélection d'un carnet d'adresses Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importation d'un carnet d'adresses Pine"
 
-#: src/inc.c:190 src/inc.c:298 src/inc.c:324
+#: src/inc.c:191 src/inc.c:299 src/inc.c:325
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail nécessite un accès réseau pour relever le courrier."
 
-#: src/inc.c:343
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s a échoué\n"
 
-#: src/inc.c:472
+#: src/inc.c:476
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:530
+#: src/inc.c:534
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:671 src/inc.c:725
+#: src/inc.c:675 src/inc.c:729
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:682
+#: src/inc.c:686
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:691
+#: src/inc.c:695
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Terminé (%d message (%s) reçu)"
 msgstr[1] "Terminé (%d messages (%s) reçus)"
 
-#: src/inc.c:697
+#: src/inc.c:701
 msgid "Done (no new messages)"
 msgstr "Terminé (aucun nouveau message)"
 
-#: src/inc.c:702
+#: src/inc.c:706
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:705 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:709 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: src/inc.c:712 src/prefs_matcher.c:397 src/prefs_summaries.c:453
-#: src/prefs_summary_column.c:87 src/summaryview.c:2849 src/summaryview.c:6497
+#: src/inc.c:716 src/prefs_matcher.c:407 src/prefs_summaries.c:624
+#: src/prefs_summary_column.c:87 src/summaryview.c:2893 src/summaryview.c:6544
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:722 src/plugins/spamassassin/spamassassin_gtk.c:394
+#: src/inc.c:726 src/plugins/spamassassin/spamassassin_gtk.c:394
 msgid "Timeout"
 msgstr "Délai d'attente dépassé"
 
-#: src/inc.c:808
+#: src/inc.c:812
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Terminé (%d nouveau message)"
 msgstr[1] "Terminé (%d nouveaux messages)"
 
-#: src/inc.c:812
+#: src/inc.c:816
 msgid "Finished (no new messages)"
 msgstr "Terminé (aucun nouveau message)"
 
-#: src/inc.c:853
+#: src/inc.c:857
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:883
+#: src/inc.c:887
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Compte '%s' : Connexion au serveur POP3 : %s:%d.."
 
-#: src/inc.c:917
+#: src/inc.c:921
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d"
 
-#: src/inc.c:921
+#: src/inc.c:925
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d.\n"
 
-#: src/inc.c:1001 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:514
+#: src/inc.c:1005 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:515
 msgid "Authenticating..."
 msgstr "Authentification.."
 
-#: src/inc.c:1003
+#: src/inc.c:1007
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Réception des messages de %s (%s).."
 
-#: src/inc.c:1009
+#: src/inc.c:1013
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT).."
 
-#: src/inc.c:1013
+#: src/inc.c:1017
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST).."
 
-#: src/inc.c:1017
+#: src/inc.c:1021
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL).."
 
-#: src/inc.c:1021
+#: src/inc.c:1025
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages"
 
-#: src/inc.c:1028 src/send_message.c:532
+#: src/inc.c:1032 src/send_message.c:533
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:1053
+#: src/inc.c:1057
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s octets)"
 
-#: src/inc.c:1066
+#: src/inc.c:1070
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Récupération (%d message (%s) reçu)"
 msgstr[1] "Récupération (%d messages (%s) reçus)"
 
-#: src/inc.c:1225
+#: src/inc.c:1229
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "La connexion vers %s:%d a échoué."
 
-#: src/inc.c:1230
+#: src/inc.c:1234
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1236
+#: src/inc.c:1240
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6549,37 +6595,37 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1242
+#: src/inc.c:1246
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1247
+#: src/inc.c:1251
 msgid "Can't write file."
 msgstr "Impossible d'enregistrer le fichier."
 
-#: src/inc.c:1252
+#: src/inc.c:1256
 msgid "Socket error."
 msgstr "Erreur de « socket »."
 
-#: src/inc.c:1255
+#: src/inc.c:1259
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Erreur de socket lors de la connexion vers %s:%d."
 
-#: src/inc.c:1260 src/send_message.c:443 src/send_message.c:706
+#: src/inc.c:1264 src/send_message.c:444 src/send_message.c:707
 msgid "Connection closed by the remote host."
 msgstr "Connexion fermée par l'hôte distant."
 
-#: src/inc.c:1263
+#: src/inc.c:1267
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Connexion vers %s:%d fermée par l'hôte distant."
 
-#: src/inc.c:1268
+#: src/inc.c:1272
 msgid "Mailbox is locked."
 msgstr "Boîte aux lettres verrouillée."
 
-#: src/inc.c:1272
+#: src/inc.c:1276
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6588,11 +6634,11 @@ msgstr ""
 "La boîte aux lettres est verrouillée :\n"
 "%s"
 
-#: src/inc.c:1278 src/send_message.c:691
+#: src/inc.c:1282 src/send_message.c:692
 msgid "Authentication failed."
 msgstr "L'authentification a échoué."
 
-#: src/inc.c:1284 src/send_message.c:694
+#: src/inc.c:1288 src/send_message.c:695
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6601,7 +6647,7 @@ msgstr ""
 "L'authentification a échoué\n"
 "%s"
 
-#: src/inc.c:1289 src/send_message.c:710
+#: src/inc.c:1293 src/send_message.c:711
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6609,30 +6655,49 @@ msgstr ""
 "La session a expiré. Augmenter la valeur du délai d'expiration dans "
 "Préférences/Autres/Divers peut dans certains cas être une solution."
 
-#: src/inc.c:1294
+#: src/inc.c:1298
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "La connexion vers %s:%d a échoué."
 
-#: src/inc.c:1332
+#: src/inc.c:1336
 msgid "Incorporation cancelled\n"
 msgstr "Relève annulée\n"
 
-#: src/inc.c:1625
+#: src/inc.c:1628 src/plugins/notification/notification_prefs.c:1072
+#: src/plugins/notification/notification_prefs.c:1367
+#: src/plugins/notification/notification_prefs.c:1673
+#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1786
+#: src/prefs_other.c:572 src/prefs_receive.c:203 src/prefs_summaries.c:530
+msgid "seconds"
+msgstr "secondes"
+
+#: src/inc.c:1638 src/inc.c:1648
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minute"
+msgstr[1] "minutes"
+
+#: src/inc.c:1641
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hour"
+msgstr[1] "hours"
+
+#: src/inc.c:1653
 #, c-format
-msgid "%s%sYou're working offline. Override for %d minutes?"
+msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr ""
-"%s%sAttention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
-"l'avertissement pour %d minutes ?"
+"%s%sLe mode hors-ligne est actif. Voulez-vous passer outre pour %d %s ?"
 
-#: src/inc.c:1631
+#: src/inc.c:1659
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
 "%s%sAttention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 
-#: src/inc.c:1638
+#: src/inc.c:1666
 msgid "On_ly once"
 msgstr "_Seulement pour cette fois-ci"
 
@@ -6657,7 +6722,7 @@ msgid "LDAP error (rename): from '%s' to '%s': %d (%s)\n"
 msgstr "LDAP erreur (renommage) : de '%s' vers '%s' : %d (%s)\n"
 
 #: src/ldaputil.c:81 src/ldaputil.c:156
-msgid "LDAP (search): succesful\n"
+msgid "LDAP (search): successful\n"
 msgstr "LDAP (recherche) : succès\n"
 
 #: src/ldaputil.c:112 src/ldaputil.c:200
@@ -6665,11 +6730,11 @@ msgstr "LDAP (recherche) : succès\n"
 msgid "LDAP error (search): %d (%s)\n"
 msgstr "LDAP erreur (recherche) : %d (%s)\n"
 
-#: src/ldif.c:758
+#: src/ldif.c:759
 msgid "Nick Name"
 msgstr "Surnom"
 
-#: src/main.c:247
+#: src/main.c:248
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6678,7 +6743,7 @@ msgstr ""
 "Le fichier '%s' existe déjà.\n"
 "Impossible de créer le dossier."
 
-#: src/main.c:368
+#: src/main.c:373
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6687,7 +6752,7 @@ msgstr ""
 "Une configuration pour %s a été trouvée.\n"
 "Voulez-vous faire migrer cette configuration ?"
 
-#: src/main.c:370
+#: src/main.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6700,11 +6765,11 @@ msgstr ""
 "Vos règles de filtrage pour Sylpheed peuvent être converties\n"
 "par un script disponible ici : %s."
 
-#: src/main.c:382
+#: src/main.c:387
 msgid "Keep old configuration"
 msgstr "Conserver l'ancienne configuration"
 
-#: src/main.c:385
+#: src/main.c:390
 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 "
@@ -6715,31 +6780,31 @@ msgstr ""
 "IMAP ou provenant de serveurs de discussions, et occupera un espace "
 "supplémentaire sur votre disque."
 
-#: src/main.c:393
+#: src/main.c:398
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:404
+#: src/main.c:409
 msgid "Copying configuration... This may take a while..."
 msgstr "Copie de la configuration.. Cela peut prendre du temps.."
 
-#: src/main.c:413
+#: src/main.c:418
 msgid "Migration failed!"
 msgstr "La migration a échoué !"
 
-#: src/main.c:422
+#: src/main.c:427
 msgid "Migrating configuration..."
 msgstr "Migration de la configuration.."
 
-#: src/main.c:1130
+#: src/main.c:1129
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non supporté par glib.\n"
 
-#: src/main.c:1150 src/main.c:1154 src/main.c:1158
+#: src/main.c:1149 src/main.c:1153 src/main.c:1157
 msgid "(or older)"
 msgstr "(ou antérieure)"
 
-#: src/main.c:1494
+#: src/main.c:1496
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6758,7 +6823,7 @@ msgstr[1] ""
 "configuration des modules pour de plus amples informations :\n"
 "%s"
 
-#: src/main.c:1536
+#: src/main.c:1538
 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 "
@@ -6769,7 +6834,7 @@ msgstr ""
 "Veuillez utiliser « Reconstruire l'_arborescence » depuis le menu contextuel "
 "du dossier principal de la boîte aux lettres pour tenter de le résoudre."
 
-#: src/main.c:1542
+#: src/main.c:1544
 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 "
@@ -6779,36 +6844,36 @@ msgstr ""
 "est probablement dû à la caducité d'un module externe. Veuillez ré-installer "
 "le module et essayer à nouveau."
 
-#: src/main.c:1789
+#: src/main.c:1784
 msgid "Missing filename\n"
 msgstr "Nom de fichier manquant\n"
 
-#: src/main.c:1796
+#: src/main.c:1791
 msgid "Cannot open filename for reading\n"
 msgstr "Impossible d'ouvrir le fichier en lecture\n"
 
-#: src/main.c:1807
+#: src/main.c:1802
 msgid "Malformed header\n"
 msgstr "En-tête non conforme\n"
 
-#: src/main.c:1814
+#: src/main.c:1809
 msgid "Duplicated 'To:' header\n"
 msgstr "En-tête « À: » en plusieurs exemplaires\n"
 
-#: src/main.c:1825
+#: src/main.c:1820
 msgid "Missing required 'To:' header\n"
 msgstr "L'en-tête « À: » est manquant\n"
 
-#: src/main.c:1971
+#: src/main.c:1965
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]..\n"
 
-#: src/main.c:1973
+#: src/main.c:1967
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:1974
+#: src/main.c:1968
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6828,7 +6893,7 @@ msgstr ""
 "                         jusqu'à une ligne vide, puis le corps de message "
 "jusqu'à la fin de fichier"
 
-#: src/main.c:1979
+#: src/main.c:1973
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      s'abonner au flux RSS ou WebCal donné (requiert\n"
@@ -6836,7 +6901,7 @@ msgstr ""
 "                         de nouvelles, ou « vCalendar » , gestionnaire de\n"
 "                         rendez-vous et calendriers en ligne)"
 
-#: src/main.c:1980
+#: src/main.c:1974
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6846,7 +6911,7 @@ msgstr ""
 "                         ouvrir une fenêtre de composition avec les\n"
 "                         fichiers spécifiés attachés"
 
-#: src/main.c:1983
+#: src/main.c:1977
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6856,25 +6921,25 @@ msgstr ""
 "                         ouvrir une fenêtre de composition avec les\n"
 "                         fichiers spécifiés insérés"
 
-#: src/main.c:1986
+#: src/main.c:1980
 msgid "  --receive              receive new messages"
 msgstr ""
 "  --receive              récupérer les nouveaux messages (du compte courant)"
 
-#: src/main.c:1987
+#: src/main.c:1981
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 
-#: src/main.c:1988
+#: src/main.c:1982
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     annuler la récupération des messages"
 
-#: src/main.c:1989
+#: src/main.c:1983
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       annuler l'envoi des messages"
 
-#: src/main.c:1990
+#: src/main.c:1984
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6894,17 +6959,17 @@ msgstr ""
 "                         récursif: aucune si l'argument commence par 0, n, "
 "N, f ou F"
 
-#: src/main.c:1997
+#: src/main.c:1991
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:1998
+#: src/main.c:1992
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 "  --status [dossier]..   afficher le nombre de messages\n"
 "                         (nouveaux, non lus, total)"
 
-#: src/main.c:1999
+#: src/main.c:1993
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6912,15 +6977,15 @@ msgstr ""
 "  --status-full [dossier]..\n"
 "                         afficher le nombre de messages de chaque dossier"
 
-#: src/main.c:2001
+#: src/main.c:1995
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           affiche les statistiques de la session"
 
-#: src/main.c:2002
+#: src/main.c:1996
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     réinitialise les statistiques de la session"
 
-#: src/main.c:2003
+#: src/main.c:1997
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6931,35 +6996,35 @@ msgstr ""
 "voici\n"
 "                         un exemple de syntaxe : 'dossier/sous_dossier'"
 
-#: src/main.c:2005
+#: src/main.c:1999
 msgid "  --online               switch to online mode"
 msgstr "  --online               travailler en ligne"
 
-#: src/main.c:2006
+#: src/main.c:2000
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              travailler hors-ligne"
 
-#: src/main.c:2007
+#: src/main.c:2001
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       quitter Claws Mail"
 
-#: src/main.c:2008
+#: src/main.c:2002
 msgid "  --debug                debug mode"
 msgstr "  --debug                lancer Claws Mail en mode de déboguage"
 
-#: src/main.c:2009
+#: src/main.c:2003
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         changer le mode debug"
 
-#: src/main.c:2010
+#: src/main.c:2004
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              afficher cette aide et terminer"
 
-#: src/main.c:2011
+#: src/main.c:2005
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           afficher la version et terminer"
 
-#: src/main.c:2012
+#: src/main.c:2006
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6967,12 +7032,12 @@ msgstr ""
 "  --version-full -V      afficher la version et les informations concernant\n"
 "                         les options intégrées et terminer"
 
-#: src/main.c:2013
+#: src/main.c:2007
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 "  --config-dir           afficher le dossier contenant la configuration"
 
-#: src/main.c:2014
+#: src/main.c:2008
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6980,7 +7045,7 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         utiliser le dossier de configuration spécifié"
 
-#: src/main.c:2016
+#: src/main.c:2010
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6988,44 +7053,44 @@ msgstr ""
 "  --geometry -geometry LxH+X+Y\n"
 "                         définir la géométrie de la fenêtre principale"
 
-#: src/main.c:2069
+#: src/main.c:2063
 msgid "Unknown option\n"
 msgstr ""
 "claws-mail: option non reconnue.\n"
 "Pour en savoir davantage, faites: « claws-mail --help ».\n"
 
-#: src/main.c:2087
+#: src/main.c:2081
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Traitement (%s).."
 
-#: src/main.c:2090
+#: src/main.c:2084
 msgid "top level folder"
 msgstr "dossier racine"
 
-#: src/main.c:2172
+#: src/main.c:2166
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:2173
+#: src/main.c:2167
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Voulez-vous "
 "quitter maintenant ?"
 
-#: src/main.c:2920
+#: src/main.c:2914
 msgid "NetworkManager: network is online.\n"
 msgstr "Gestionnaire réseau : le réseau est activé.\n"
 
-#: src/main.c:2926
+#: src/main.c:2920
 msgid "NetworkManager: network is offline.\n"
 msgstr "Gestionnaire réseau : le réseau est désactivé.\n"
 
-#: src/mainwindow.c:514 src/messageview.c:209
+#: src/mainwindow.c:514 src/messageview.c:211
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/mainwindow.c:516 src/messageview.c:211 src/summaryview.c:438
+#: src/mainwindow.c:516 src/messageview.c:213 src/summaryview.c:444
 msgid "_View"
 msgstr "_Vue"
 
@@ -7061,19 +7126,19 @@ msgstr "_Exporter la sélection en fichier mbox.."
 msgid "Empty all _Trash folders"
 msgstr "_Vider toutes les corbeilles"
 
-#: src/mainwindow.c:537 src/messageview.c:218
+#: src/mainwindow.c:537 src/messageview.c:220
 msgid "_Save email as..."
 msgstr "Enregi_strer le message sous.."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save part as..."
 msgstr "Enregi_strer la partie sous.."
 
-#: src/mainwindow.c:541 src/messageview.c:220
+#: src/mainwindow.c:541 src/messageview.c:222
 msgid "Page setup..."
 msgstr "Mise en _page.."
 
-#: src/mainwindow.c:542 src/messageview.c:221
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "_Print..."
 msgstr "_Imprimer.."
 
@@ -7137,99 +7202,99 @@ msgstr "Déplo_yer les fils de discussion"
 msgid "Co_llapse all threads"
 msgstr "Re_plier les fils de discussion"
 
-#: src/mainwindow.c:577 src/messageview.c:232
+#: src/mainwindow.c:577 src/messageview.c:234
 msgid "_Go to"
 msgstr "_Aller à"
 
-#: src/mainwindow.c:578 src/messageview.c:233
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Previous message"
 msgstr "Message _précédent"
 
-#: src/mainwindow.c:579 src/messageview.c:234
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Next message"
 msgstr "Message suiva_nt"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:581 src/messageview.c:238
 msgid "P_revious unread message"
 msgstr "Non l_u précédent"
 
-#: src/mainwindow.c:582 src/messageview.c:237
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "N_ext unread message"
 msgstr "Non _lu suivant"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:584 src/messageview.c:241
 msgid "Previous ne_w message"
 msgstr "Message nouv_eau précédent"
 
-#: src/mainwindow.c:585 src/messageview.c:240
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Ne_xt new message"
 msgstr "Message nou_veau suivant"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:587 src/messageview.c:244
 msgid "Previous _marked message"
 msgstr "M_arqué précédent"
 
-#: src/mainwindow.c:588 src/messageview.c:243
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Next m_arked message"
 msgstr "_Marqué suivant"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:590 src/messageview.c:247
 msgid "Previous _labeled message"
 msgstr "C_olorié précédent"
 
-#: src/mainwindow.c:591 src/messageview.c:246
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Next la_beled message"
 msgstr "_Colorié suivant"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:593 src/messageview.c:250
 msgid "Previous opened message"
 msgstr "Message ouvert précédent"
 
-#: src/mainwindow.c:594 src/messageview.c:249
+#: src/mainwindow.c:594 src/messageview.c:251
 msgid "Next opened message"
 msgstr "Message ouvert suivant"
 
-#: src/mainwindow.c:596 src/messageview.c:251
+#: src/mainwindow.c:596 src/messageview.c:253
 msgid "Parent message"
 msgstr "Message paren_t"
 
-#: src/mainwindow.c:598 src/messageview.c:253
+#: src/mainwindow.c:598 src/messageview.c:255
 msgid "Next unread _folder"
 msgstr "Do_ssier non lu suivant"
 
-#: src/mainwindow.c:599 src/messageview.c:254
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "F_older..."
 msgstr "Dossier..."
 
-#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:200
+#: src/mainwindow.c:601 src/messageview.c:258 src/mimeview.c:201
 msgid "Next part"
 msgstr "Partie suivante"
 
-#: src/mainwindow.c:602 src/messageview.c:257 src/mimeview.c:201
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:202
 msgid "Previous part"
 msgstr "Partie précédente"
 
-#: src/mainwindow.c:605 src/messageview.c:258
+#: src/mainwindow.c:605 src/messageview.c:260
 msgid "Message scroll"
 msgstr "Défilement du message"
 
-#: src/mainwindow.c:606 src/messageview.c:259
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Previous line"
 msgstr "Ligne précédente"
 
-#: src/mainwindow.c:607 src/messageview.c:260
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Next line"
 msgstr "Ligne suivante"
 
-#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:479
+#: src/mainwindow.c:608 src/messageview.c:263 src/printing.c:475
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: src/mainwindow.c:609 src/messageview.c:262 src/printing.c:485
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Next page"
 msgstr "Page suivante"
 
-#: src/mainwindow.c:627 src/messageview.c:280
+#: src/mainwindow.c:627 src/messageview.c:282
 msgid "Decode"
 msgstr "Décoda_ge"
 
@@ -7237,27 +7302,27 @@ msgstr "Décoda_ge"
 msgid "Open in new _window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:635 src/messageview.c:289
 msgid "Mess_age source"
 msgstr "Code _source du message.."
 
-#: src/mainwindow.c:637 src/messageview.c:288
+#: src/mainwindow.c:637 src/messageview.c:290
 msgid "Message part"
 msgstr "Message"
 
-#: src/mainwindow.c:638 src/messageview.c:289
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "View as text"
 msgstr "Afficher comme du texte"
 
-#: src/mainwindow.c:639 src/messageview.c:290 src/toolbar.c:494
+#: src/mainwindow.c:639 src/messageview.c:292 src/toolbar.c:494
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/mainwindow.c:641 src/messageview.c:292
+#: src/mainwindow.c:641 src/messageview.c:294
 msgid "Open with..."
 msgstr "Ouvrir avec.."
 
-#: src/mainwindow.c:645 src/messageview.c:295
+#: src/mainwindow.c:645 src/messageview.c:297
 msgid "Quotes"
 msgstr "_Citations"
 
@@ -7293,16 +7358,16 @@ msgstr "Composer un _nouveau message"
 msgid "Compose a news message"
 msgstr "Composer un _article de groupe de discussion"
 
-#: src/mainwindow.c:664 src/messageview.c:301
-#: src/plugins/notification/notification_banner.c:95
+#: src/mainwindow.c:664 src/messageview.c:303
+#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:428
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: src/mainwindow.c:665 src/messageview.c:302 src/summaryview.c:430
+#: src/mainwindow.c:665 src/messageview.c:304 src/summaryview.c:429
 msgid "Repl_y to"
 msgstr "Rép_ondre à"
 
-#: src/mainwindow.c:668 src/messageview.c:305
+#: src/mainwindow.c:668 src/messageview.c:307 src/summaryview.c:432
 msgid "Mailing _list"
 msgstr "_Liste de diffusion"
 
@@ -7310,15 +7375,18 @@ msgstr "_Liste de diffusion"
 msgid "Follow-up and reply to"
 msgstr "Donner suite _et répondre à"
 
-#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2449
+#: src/mainwindow.c:672 src/messageview.c:310 src/summaryview.c:434
+#: src/toolbar.c:2449
 msgid "_Forward"
 msgstr "_Transférer"
 
-#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2450
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:435
+#: src/toolbar.c:2450
 msgid "For_ward as attachment"
 msgstr "Transférer en _pièce jointe"
 
-#: src/mainwindow.c:674 src/messageview.c:310 src/toolbar.c:2451
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:436
+#: src/toolbar.c:2451
 msgid "Redirec_t"
 msgstr "Rediri_ger"
 
@@ -7374,7 +7442,7 @@ msgstr "S_upprimer la discussion"
 msgid "Cancel a news message"
 msgstr "E_ffacer un article du serveur"
 
-#: src/mainwindow.c:700 src/mainwindow.c:701 src/summaryview.c:431
+#: src/mainwindow.c:700 src/mainwindow.c:701 src/summaryview.c:437
 msgid "_Mark"
 msgstr "_Marquer"
 
@@ -7398,7 +7466,7 @@ msgstr "Marquer _tous comme lus"
 msgid "Mark all unread"
 msgstr "Marquer _tous comme non lus"
 
-#: src/mainwindow.c:711 src/prefs_filtering_action.c:199 src/toolbar.c:242
+#: src/mainwindow.c:711 src/prefs_filtering_action.c:193 src/toolbar.c:242
 #: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr "Ignorer du fil de discussion"
@@ -7407,7 +7475,7 @@ msgstr "Ignorer du fil de discussion"
 msgid "Unignore thread"
 msgstr "Inclure dans fil de discussion"
 
-#: src/mainwindow.c:713 src/prefs_filtering_action.c:200 src/toolbar.c:243
+#: src/mainwindow.c:713 src/prefs_filtering_action.c:194 src/toolbar.c:243
 #: src/toolbar.c:504
 msgid "Watch thread"
 msgstr "Suivre le fil de discussion"
@@ -7424,19 +7492,19 @@ msgstr "Marquer comme _pourriel"
 msgid "Mark as _ham"
 msgstr "Marquer comme courrier _légitime"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:181 src/toolbar.c:507
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:177 src/toolbar.c:507
 msgid "Lock"
 msgstr "Bloquer"
 
-#: src/mainwindow.c:722 src/prefs_filtering_action.c:182 src/toolbar.c:508
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:178 src/toolbar.c:508
 msgid "Unlock"
 msgstr "Débloquer"
 
-#: src/mainwindow.c:724 src/summaryview.c:432
+#: src/mainwindow.c:724 src/summaryview.c:438
 msgid "Color la_bel"
 msgstr "C_olorier"
 
-#: src/mainwindow.c:725 src/summaryview.c:433
+#: src/mainwindow.c:725 src/summaryview.c:439
 msgid "Ta_gs"
 msgstr "La_bels"
 
@@ -7444,11 +7512,11 @@ msgstr "La_bels"
 msgid "Re-_edit"
 msgstr "Rééd_iter"
 
-#: src/mainwindow.c:731 src/messageview.c:311 src/mimeview.c:1015
+#: src/mainwindow.c:731 src/messageview.c:313 src/mimeview.c:1016
 msgid "Check signature"
 msgstr "Vérifier la signature"
 
-#: src/mainwindow.c:736 src/messageview.c:315
+#: src/mainwindow.c:736 src/messageview.c:317
 msgid "Add sender to address boo_k"
 msgstr "A_jouter l'expéditeur·rice au carnet d'adresses"
 
@@ -7476,35 +7544,35 @@ msgstr "Filtrer les messages _sélectionnés"
 msgid "Run folder pr_ocessing rules"
 msgstr "Exéc_uter les règles de traitement du dossier courant"
 
-#: src/mainwindow.c:747 src/messageview.c:318
+#: src/mainwindow.c:747 src/messageview.c:320
 msgid "_Create filter rule"
 msgstr "Créer une _règle de filtrage"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:319
-#: src/messageview.c:325
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
+#: src/messageview.c:327
 msgid "_Automatically"
 msgstr "_Automatiquement"
 
 #: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/messageview.c:322 src/messageview.c:328
 msgid "By _From"
 msgstr "Par « De: »"
 
 #: src/mainwindow.c:750 src/mainwindow.c:756 src/mainwindow.c:860
-#: src/messageview.c:321 src/messageview.c:327
+#: src/messageview.c:323 src/messageview.c:329
 msgid "By _To"
 msgstr "Par « À: »"
 
-#: src/mainwindow.c:751 src/mainwindow.c:757 src/messageview.c:322
-#: src/messageview.c:328
+#: src/mainwindow.c:751 src/mainwindow.c:757 src/messageview.c:324
+#: src/messageview.c:330
 msgid "By _Subject"
 msgstr "Par _Sujet"
 
-#: src/mainwindow.c:753 src/messageview.c:324 src/summaryview.c:436
+#: src/mainwindow.c:753 src/messageview.c:326 src/summaryview.c:442
 msgid "Create processing rule"
 msgstr "Créer une règle de traite_ment"
 
-#: src/mainwindow.c:760 src/messageview.c:331
+#: src/mainwindow.c:760 src/messageview.c:333
 msgid "List _URLs..."
 msgstr "_Liste d'URLs.."
 
@@ -7640,7 +7708,7 @@ msgstr "_En-tête de colonnes"
 msgid "Th_read view"
 msgstr "Vue par _fil de discussion"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:826 src/prefs_summaries.c:646
 msgid "Hide read threads"
 msgstr "Cacher les fils lus"
 
@@ -7648,7 +7716,7 @@ msgstr "Cacher les fils lus"
 msgid "_Hide read messages"
 msgstr "Cacher les messages _lus"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:828 src/prefs_summaries.c:652
 msgid "Hide deleted messages"
 msgstr "Cacher les messages supprimés"
 
@@ -7656,19 +7724,19 @@ msgstr "Cacher les messages supprimés"
 msgid "_Fullscreen"
 msgstr "Plei_n écran"
 
-#: src/mainwindow.c:830 src/messageview.c:343
+#: src/mainwindow.c:830 src/messageview.c:345
 msgid "Show all _headers"
 msgstr "Tous les _en-têtes"
 
-#: src/mainwindow.c:831 src/messageview.c:344
+#: src/mainwindow.c:831 src/messageview.c:346
 msgid "_Collapse all"
 msgstr "Re_plier tout"
 
-#: src/mainwindow.c:832 src/messageview.c:345
+#: src/mainwindow.c:832 src/messageview.c:347
 msgid "Collapse from level _2"
 msgstr "Replier à partir du niveau _2"
 
-#: src/mainwindow.c:833 src/messageview.c:346
+#: src/mainwindow.c:833 src/messageview.c:348
 msgid "Collapse from level _3"
 msgstr "Replier à partir du niveau _3"
 
@@ -7760,100 +7828,104 @@ msgstr "Par _verrouillés"
 msgid "D_on't sort"
 msgstr "Ne pas tr_ier"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:462
+#: src/mainwindow.c:873 src/prefs_summaries.c:633
 msgid "Ascending"
 msgstr "Ascendant"
 
-#: src/mainwindow.c:874 src/prefs_summaries.c:463
+#: src/mainwindow.c:874 src/prefs_summaries.c:634
 msgid "Descending"
 msgstr "Descendant"
 
-#: src/mainwindow.c:916 src/messageview.c:388
+#: src/mainwindow.c:916 src/messageview.c:390
 msgid "_Auto detect"
 msgstr "Détection _automatique"
 
-#: src/mainwindow.c:1294 src/summaryview.c:6423
+#: src/mainwindow.c:1294 src/summaryview.c:6470
 msgid "Apply tags..."
 msgstr "Appliquer des labels.."
 
-#: src/mainwindow.c:1943
+#: src/mainwindow.c:1947
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "Une ou plusieurs erreurs sont survenues. Cliquer ici pour voir les traces."
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1962
 msgid "You are online. Click the icon to go offline"
 msgstr "Vous êtes en ligne. Cliquer sur l'icône pour aller hors-ligne."
 
-#: src/mainwindow.c:1961
+#: src/mainwindow.c:1965
 msgid "You are offline. Click the icon to go online"
 msgstr "Vous êtes hors-ligne. Cliquer sur l'icône pour aller en ligne."
 
-#: src/mainwindow.c:1975
+#: src/mainwindow.c:1979
 msgid "Select account"
 msgstr "Sélectionner un compte"
 
-#: src/mainwindow.c:2002 src/prefs_logging.c:136
+#: src/mainwindow.c:2006 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Traces réseau"
 
-#: src/mainwindow.c:2006
+#: src/mainwindow.c:2010
 msgid "Filtering/Processing debug log"
 msgstr "Traces de débogage du filtrage/traitement"
 
-#: src/mainwindow.c:2025 src/prefs_logging.c:378
+#: src/mainwindow.c:2029 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "Le traçage du filtrage est activé.\n"
 
-#: src/mainwindow.c:2027 src/prefs_logging.c:380
+#: src/mainwindow.c:2031 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "Le traçage du filtrage est désactivé.\n"
 
-#: src/mainwindow.c:2463 src/mainwindow.c:2470 src/mainwindow.c:2513
-#: src/mainwindow.c:2546 src/mainwindow.c:2578 src/mainwindow.c:2623
+#: src/mainwindow.c:2465 src/mainwindow.c:2472 src/mainwindow.c:2515
+#: src/mainwindow.c:2548 src/mainwindow.c:2580 src/mainwindow.c:2625
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1076
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1087
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:2624 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2626 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "rien"
 
-#: src/mainwindow.c:2881 src/mainwindow.c:2886
+#: src/mainwindow.c:2883 src/mainwindow.c:2888
 msgid "Delete all messages in trash folders?"
 msgstr ""
 "Voulez-vous vraiment supprimer tous les messages de toutes les corbeilles ?"
 
-#: src/mainwindow.c:2882
+#: src/mainwindow.c:2884
 msgid "Don't quit"
 msgstr "Ne pas quitter"
 
-#: src/mainwindow.c:2913 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:2914
+#: src/mainwindow.c:2916
 msgid ""
-"Input the location of mailbox.\n"
-"If an existing mailbox is specified, it will be\n"
+"Input the location of the mailbox.\n"
+"The location can be either the full path or relative to the \n"
+"home directory.\n"
+"If the location of an existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
-"Saisir le chemin vers la boîte aux lettres :\n"
+"Saisir le chemin vers la boîte aux lettres.\n"
+"Le chemin peut être absolu ou relatif au dossier personnel\n"
+"de l'utilisateur.\n"
 "Si elle existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La boîte aux lettres '%s' existe déjà."
 
-#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:742
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:2930 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7863,55 +7935,55 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:3411
+#: src/mainwindow.c:3415
 msgid "No posting allowed"
 msgstr "Envoi de message non autorisé"
 
-#: src/mainwindow.c:3993
+#: src/mainwindow.c:3997
 msgid "Mbox import has failed."
 msgstr "L'importation mbox a échoué."
 
-#: src/mainwindow.c:4002 src/mainwindow.c:4011
+#: src/mainwindow.c:4006 src/mainwindow.c:4015
 msgid "Export to mbox has failed."
 msgstr "L'exportation mbox a échoué."
 
-#: src/mainwindow.c:4052 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:4052 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Voulez-vous vraiment quitter Claws Mail ?"
 
-#: src/mainwindow.c:4245
+#: src/mainwindow.c:4257
 msgid "Folder synchronisation"
 msgstr "Synchronisation de dossiers distants"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4258
 msgid "Do you want to synchronise your folders now?"
 msgstr "Voulez-vous vraiment synchroniser vos dossiers distants ?"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4259
 msgid "_Synchronise"
 msgstr "_Synchroniser"
 
-#: src/mainwindow.c:4692
+#: src/mainwindow.c:4704
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double.."
 
-#: src/mainwindow.c:4702
+#: src/mainwindow.c:4714
 msgid "No duplicate message found in selected folder.\n"
 msgstr ""
 "Aucun message en double n'a pu être trouvé dans le dossier sélectionné.\n"
 
-#: src/mainwindow.c:4708
+#: src/mainwindow.c:4720
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "%d message en double supprimé dans le dossier sélectionné.\n"
 msgstr[1] "%d messages en double supprimés dans le dossier sélectionné.\n"
 
-#: src/mainwindow.c:4712
+#: src/mainwindow.c:4724
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
@@ -7920,117 +7992,117 @@ msgstr[0] ""
 msgstr[1] ""
 "%d messages en double marqués pour suppression dans le dossier sélectionné.\n"
 
-#: src/mainwindow.c:4750
+#: src/mainwindow.c:4762
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Suppression des messages en double dans tous les dossiers.."
 
-#: src/mainwindow.c:4756
+#: src/mainwindow.c:4768
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d message en double supprimé dans %d dossier.\n"
 msgstr[1] "%d messages en double supprimés dans %d dossiers.\n"
 
-#: src/mainwindow.c:4761
+#: src/mainwindow.c:4773
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Aucune message en double trouvé dans %d dossiers.\n"
 
-#: src/mainwindow.c:4923 src/messageview.c:2658
+#: src/mainwindow.c:4935 src/messageview.c:2662
 msgid "Select folder to go to"
 msgstr "Sélection du dossier à atteindre"
 
-#: src/mainwindow.c:5024 src/summaryview.c:5866
+#: src/mainwindow.c:5036 src/summaryview.c:5913
 msgid "Processing rules to apply before folder rules"
 msgstr "Règles de traitement à appliquer avant le filtrage des dossiers"
 
-#: src/mainwindow.c:5032
+#: src/mainwindow.c:5044
 msgid "Processing rules to apply after folder rules"
 msgstr "Règles de traitement à appliquer après le filtrage des dossiers"
 
-#: src/mainwindow.c:5040 src/summaryview.c:5877
+#: src/mainwindow.c:5052 src/summaryview.c:5924
 msgid "Filtering configuration"
 msgstr "Règles de filtrage"
 
-#: src/mainwindow.c:5155
+#: src/mainwindow.c:5167
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Impossible d'enregistrer le client par défaut : impossible de récupérer le "
 "chemin du binaire."
 
-#: src/mainwindow.c:5214
+#: src/mainwindow.c:5226
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail est maintenant le client par défaut."
 
-#: src/mainwindow.c:5216
+#: src/mainwindow.c:5228
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Impossible d'enregistrer le client par défaut : écriture impossible dans la "
 "base de registre."
 
-#: src/mainwindow.c:5230 src/setup.c:91
+#: src/mainwindow.c:5242 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Analyse du dossier %s%c%s.."
 
-#: src/mainwindow.c:5374
+#: src/mainwindow.c:5386
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d mot de passe oublié dans %d comptes.\n"
 msgstr[1] "%d mots de passe oubliés dans %d comptes.\n"
 
-#: src/matcher.c:214 src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
-#: src/matcher.c:218 src/matcher.c:219 src/matcher.c:220 src/matcher.c:221
+#: src/matcher.c:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
+#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
 #, c-format
 msgid "%s header"
 msgstr "En-tête %s"
 
-#: src/matcher.c:222
+#: src/matcher.c:225
 msgid "header"
 msgstr "En-tête"
 
-#: src/matcher.c:223
+#: src/matcher.c:226
 msgid "header line"
 msgstr "Ligne d'en-tête"
 
-#: src/matcher.c:224
+#: src/matcher.c:227
 msgid "body line"
 msgstr "Ligne du corps"
 
-#: src/matcher.c:225
+#: src/matcher.c:228
 msgid "tag"
 msgstr "label"
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
-#: src/message_search.c:203 src/prefs_matcher.c:738 src/summary_search.c:456
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/message_search.c:214 src/prefs_matcher.c:748 src/summary_search.c:454
 msgid "Case sensitive"
 msgstr "Sensible à la casse"
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
 msgid "Case insensitive"
 msgstr "Non sensible à la casse"
 
-#: src/matcher.c:1863
+#: src/matcher.c:1903
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "Teste si le message valide la condition [ %s ]\n"
 
-#: src/matcher.c:1934 src/matcher.c:1953 src/matcher.c:1966
+#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
 msgid "message matches\n"
 msgstr "Le message correspond.\n"
 
-#: src/matcher.c:1941 src/matcher.c:1959 src/matcher.c:1968
+#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
 msgid "message does not match\n"
 msgstr "Le message ne correspond pas.\n"
 
-#: src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233 src/matcher.c:2234
-#: src/matcher.c:2235 src/matcher.c:2236 src/matcher.c:2237 src/matcher.c:2238
+#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
+#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
 msgid "(none)"
 msgstr "(aucun)"
 
-#: src/mbox.c:107
+#: src/mbox.c:97
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
@@ -8039,27 +8111,27 @@ msgstr ""
 "Impossible d'ouvrir le fichier mbox :\n"
 "%s\n"
 
-#: src/mbox.c:144
+#: src/mbox.c:134
 #, c-format
 msgid "Importing from mbox... (%d mail imported)"
 msgid_plural "Importing from mbox... (%d mails imported)"
 msgstr[0] "Importation depuis un fichier mbox.. (%d message importé)"
 msgstr[1] "Importation depuis un fichier mbox... (%d messages importés)"
 
-#: src/mbox.c:549
+#: src/mbox.c:539
 msgid "Overwrite mbox file"
 msgstr "Écrasement du fichier mbox"
 
-#: src/mbox.c:550
+#: src/mbox.c:540
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Ce fichier existe déjà. Voulez-vous l'écraser ?"
 
-#: src/mbox.c:551 src/messageview.c:1842 src/mimeview.c:1844
-#: src/prefs_themes.c:598 src/textview.c:3128
+#: src/mbox.c:541 src/messageview.c:1846 src/mimeview.c:1845
+#: src/prefs_themes.c:596 src/textview.c:3129
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: src/mbox.c:560
+#: src/mbox.c:550
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -8068,51 +8140,51 @@ msgstr ""
 "Impossible de créer le fichier mbox :\n"
 "%s\n"
 
-#: src/mbox.c:568
+#: src/mbox.c:554
 msgid "Exporting to mbox..."
 msgstr "Exportation en fichier mbox en cours.."
 
-#: src/message_search.c:162
+#: src/message_search.c:173
 msgid "Find in current message"
 msgstr "Chercher dans le message"
 
-#: src/message_search.c:180
+#: src/message_search.c:191
 msgid "Find text:"
 msgstr "Chercher :"
 
-#: src/message_search.c:306 src/summary_search.c:780
+#: src/message_search.c:317 src/summary_search.c:778
 msgid "Search failed"
 msgstr "Recherche échouée"
 
-#: src/message_search.c:307 src/summary_search.c:781
+#: src/message_search.c:318 src/summary_search.c:779
 msgid "Search string not found."
 msgstr "Texte recherché introuvable."
 
-#: src/message_search.c:316
+#: src/message_search.c:327
 msgid "Beginning of message reached; continue from end?"
 msgstr "Début de message atteint, reprendre depuis la fin ?"
 
-#: src/message_search.c:319
+#: src/message_search.c:330
 msgid "End of message reached; continue from beginning?"
 msgstr "Fin de message atteint, reprendre depuis le début ?"
 
-#: src/message_search.c:322 src/summary_search.c:792
+#: src/message_search.c:333 src/summary_search.c:790
 msgid "Search finished"
 msgstr "Recherche terminée"
 
-#: src/messageview.c:298 src/textview.c:252
+#: src/messageview.c:300 src/textview.c:253
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/messageview.c:713 src/messageview.c:1434 src/messageview.c:1585
+#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Message"
 
-#: src/messageview.c:843
+#: src/messageview.c:845
 msgid "<No Return-Path found>"
 msgstr "< « Return-Path: » introuvable>"
 
-#: src/messageview.c:850
+#: src/messageview.c:852
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8127,51 +8199,51 @@ msgstr ""
 "Return-Path : %s\n"
 "Il est conseillé de ne pas envoyer cet accusé de réception."
 
-#: src/messageview.c:857
+#: src/messageview.c:859
 msgid "_Don't Send"
 msgstr "_Ne pas envoyer"
 
-#: src/messageview.c:1364
+#: src/messageview.c:1366
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Lecture du message (%s) en cours.."
 
-#: src/messageview.c:1400 src/procmime.c:1016
+#: src/messageview.c:1402 src/procmime.c:956
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Déchiffrement impossible : %s"
 
-#: src/messageview.c:1481 src/messageview.c:1489
+#: src/messageview.c:1483 src/messageview.c:1491
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Le message n'est pas conforme au standard MIME. Il pourrait être mal affiché."
 
-#: src/messageview.c:1834 src/messageview.c:1837 src/mimeview.c:2049
-#: src/plugins/fancy/fancy_viewer.c:707 src/summaryview.c:4969
-#: src/summaryview.c:4972 src/textview.c:3116
+#: src/messageview.c:1838 src/messageview.c:1841 src/mimeview.c:2050
+#: src/plugins/fancy/fancy_viewer.c:692 src/summaryview.c:5016
+#: src/summaryview.c:5019 src/textview.c:3117
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: src/messageview.c:1843
+#: src/messageview.c:1847
 msgid "Overwrite existing file?"
 msgstr "Écraser le fichier existant ?"
 
-#: src/messageview.c:1851 src/summaryview.c:4989 src/summaryview.c:4992
-#: src/summaryview.c:5007
+#: src/messageview.c:1855 src/summaryview.c:5036 src/summaryview.c:5039
+#: src/summaryview.c:5054
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:1904
+#: src/messageview.c:1908
 #, c-format
 msgid "Show all %s."
 msgstr "Afficher l'ensemble des %s."
 
-#: src/messageview.c:1906
+#: src/messageview.c:1910
 msgid "Only the first megabyte of text is shown."
 msgstr "Seul le premier méga-octet de texte est affiché."
 
-#: src/messageview.c:1937
+#: src/messageview.c:1941
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8179,19 +8251,19 @@ msgstr ""
 "Vous avez demandé un accusé de réception pour ce message : le message a été "
 "affiché par le/la destinataire."
 
-#: src/messageview.c:1940
+#: src/messageview.c:1944
 msgid "You asked for a return receipt in this message."
 msgstr "Vous avez demandé un accusé de réception pour ce message."
 
-#: src/messageview.c:1946
+#: src/messageview.c:1950
 msgid "This message asks for a return receipt."
 msgstr "Ce message demande l'envoi d'un accusé de réception."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1951
 msgid "Send receipt"
 msgstr "Envoyer"
 
-#: src/messageview.c:1990
+#: src/messageview.c:1994
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8199,7 +8271,7 @@ msgstr ""
 "Ce message a été partiellement récupéré,\n"
 "et a été supprimé du serveur."
 
-#: src/messageview.c:1996
+#: src/messageview.c:2000
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8208,16 +8280,16 @@ msgstr "Ce message a été partiellement récupéré ; il fait %s au total."
 
 # NDT : problème de longueur de la chaîne "Marquer pour téléchargement" :
 # la chaîne est coupée des 2 côtés (bouton trop petit) -> idée : tooltips
-#: src/messageview.c:2000 src/messageview.c:2022
+#: src/messageview.c:2004 src/messageview.c:2026
 msgid "Mark for download"
 msgstr "Télécharger"
 
 # NDT : même pb qu'avec "Mark for download" pr chaîne "Marquer pour suppression"
-#: src/messageview.c:2001 src/messageview.c:2013
+#: src/messageview.c:2005 src/messageview.c:2017
 msgid "Mark for deletion"
 msgstr "Supprimer"
 
-#: src/messageview.c:2006
+#: src/messageview.c:2010
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8226,12 +8298,12 @@ msgstr ""
 "Ce message a été partiellement récupéré ;\n"
 "il fait %s au total et est marqué pour être téléchargé ultérieurement."
 
-#: src/messageview.c:2011 src/messageview.c:2024
-#: src/prefs_filtering_action.c:180 src/toolbar.c:506
+#: src/messageview.c:2015 src/messageview.c:2028
+#: src/prefs_filtering_action.c:176 src/toolbar.c:506
 msgid "Unmark"
 msgstr "Démarquer"
 
-#: src/messageview.c:2017
+#: src/messageview.c:2021
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8240,7 +8312,7 @@ msgstr ""
 "Ce message a été partiellement récupéré ;\n"
 "il fait %s au total et est marqué pour être supprimé ultérieurement."
 
-#: src/messageview.c:2094
+#: src/messageview.c:2098
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -8254,20 +8326,20 @@ msgstr ""
 "destinataire officiel.\n"
 "Il est conseillé de ne pas envoyer cet accusé de réception."
 
-#: src/messageview.c:2102 src/messageview.c:2110
+#: src/messageview.c:2106 src/messageview.c:2114
 msgid "Return Receipt Notification"
 msgstr "Accusé de réception."
 
-#: src/messageview.c:2104 src/messageview.c:2115
+#: src/messageview.c:2108 src/messageview.c:2119
 #: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: src/messageview.c:2104 src/messageview.c:2115
+#: src/messageview.c:2108 src/messageview.c:2119
 msgid "_Send Notification"
 msgstr "_Envoyer"
 
-#: src/messageview.c:2111
+#: src/messageview.c:2115
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8279,11 +8351,11 @@ msgstr ""
 "Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accusé "
 "de réception :"
 
-#: src/messageview.c:2207
+#: src/messageview.c:2211
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossible d'imprimer : le message ne contient pas de texte."
 
-#: src/messageview.c:2968
+#: src/messageview.c:2972
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8291,7 +8363,7 @@ msgstr ""
 "\n"
 " Il n'y a pas de messages dans ce dossier"
 
-#: src/messageview.c:2976
+#: src/messageview.c:2980
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8299,7 +8371,7 @@ msgstr ""
 "\n"
 " Le message a été supprimé"
 
-#: src/messageview.c:2977
+#: src/messageview.c:2981
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8307,16 +8379,16 @@ msgstr ""
 "\n"
 " Le message a été supprimé ou déplacé vers un autre dossier"
 
-#: src/messageview.c:3010 src/messageview.c:3016 src/summaryview.c:4367
-#: src/summaryview.c:7190
+#: src/messageview.c:3014 src/messageview.c:3020 src/summaryview.c:4414
+#: src/summaryview.c:7275
 msgid "An error happened while learning.\n"
 msgstr "Erreur lors de l'opération d'apprentissage du module SpamAssassin.\n"
 
-#: src/mh.c:527
+#: src/mh.c:528
 msgid "Moving messages..."
 msgstr "Déplacement des messages en cours.."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:838
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Suppression des messages en cours.."
 
@@ -8349,60 +8421,60 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Enlèvement de boîte aux lettres"
 
-#: src/mimeview.c:192
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: src/mimeview.c:194
+#: src/mimeview.c:195
 msgid "Open _with..."
 msgstr "Ouvrir a_vec.."
 
-#: src/mimeview.c:196
+#: src/mimeview.c:197
 msgid "Send to..."
 msgstr "Envoyer à.."
 
-#: src/mimeview.c:197
+#: src/mimeview.c:198
 msgid "_Display as text"
 msgstr "_Afficher comme du texte"
 
-#: src/mimeview.c:198
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "Enregi_strer sous.."
 
-#: src/mimeview.c:199
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr "_Enregistrer tout sous.."
 
-#: src/mimeview.c:272
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "Type MIME"
 
-#: src/mimeview.c:1020 src/mimeview.c:1025 src/mimeview.c:1030
-#: src/mimeview.c:1035
+#: src/mimeview.c:1021 src/mimeview.c:1026 src/mimeview.c:1031
+#: src/mimeview.c:1036
 msgid "View full information"
 msgstr "Voir l'ensemble des informations"
 
-#: src/mimeview.c:1041
+#: src/mimeview.c:1042
 msgid "Check again"
 msgstr "Vérifier à nouveau"
 
-#: src/mimeview.c:1053
+#: src/mimeview.c:1054
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Cliquer sur l'icône pour la vérifier."
 
-#: src/mimeview.c:1055
+#: src/mimeview.c:1056
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Cliquer sur l'icône ou presser la touche '%s' pour la vérifier."
 
-#: src/mimeview.c:1065
+#: src/mimeview.c:1066
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Délai d'attente dépassé durant la vérification de la signature. Cliquer sur "
 "l'icône pour essayer à nouveau."
 
-#: src/mimeview.c:1067
+#: src/mimeview.c:1068
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8410,27 +8482,27 @@ msgstr ""
 "Délai d'attente dépassé durant la vérification de la signature. Cliquer sur "
 "l'icône ou appuyer sur '%s' pour essayer à nouveau."
 
-#: src/mimeview.c:1307
+#: src/mimeview.c:1308
 msgid "Checking signature..."
 msgstr "Vérification de la signature en cours.."
 
-#: src/mimeview.c:1348
+#: src/mimeview.c:1349
 msgid "Go back to email"
 msgstr "Revenir à l'email"
 
-#: src/mimeview.c:1762 src/mimeview.c:1854 src/mimeview.c:2096
-#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:447
+#: src/mimeview.c:1763 src/mimeview.c:1855 src/mimeview.c:2097
+#: src/mimeview.c:2133 src/mimeview.c:2245 src/plugins/fancy/fancy_viewer.c:440
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 "Échec lors de l'enregistrement d'une partie d'un message multipart : %s"
 
-#: src/mimeview.c:1841 src/textview.c:3126
+#: src/mimeview.c:1842 src/textview.c:3127
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Écraser le fichier existant « %s » ?"
 
-#: src/mimeview.c:1865
+#: src/mimeview.c:1866
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8439,54 +8511,54 @@ msgstr ""
 "Une erreur est survenue lors de l'enregistrement de la partie #%d du "
 "message. Voulez-vous annuler l'opération, ou ignorer l'erreur et continuer ?"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1869
 msgid "Error saving all message parts"
 msgstr "Erreur lors de l'enregistrement des parties du message"
 
-#: src/mimeview.c:1869
+#: src/mimeview.c:1870
 msgid "Skip"
 msgstr "Ignorer"
 
-#: src/mimeview.c:1869
+#: src/mimeview.c:1870
 msgid "Skip all"
 msgstr "Tout ignorer"
 
-#: src/mimeview.c:1879
+#: src/mimeview.c:1880
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d fichier enregistré avec succès."
 msgstr[1] "%d fichiers enregistrés avec succès."
 
-#: src/mimeview.c:1887
+#: src/mimeview.c:1888
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d fichier enregistré avec succès"
 msgstr[1] "%d fichiers enregistrés avec succès."
 
-#: src/mimeview.c:1892
+#: src/mimeview.c:1893
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d fichier en échec."
 msgstr[1] "%s, %d fichiers en échec."
 
-#: src/mimeview.c:1925 src/plugins/archive/archiver_prefs.c:142
-#: src/prefs_filtering_action.c:1280
+#: src/mimeview.c:1926 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1262
 msgid "Select destination folder"
 msgstr "Sélection du dossier de destination"
 
-#: src/mimeview.c:1932 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1933 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "« %s » n'est pas un dossier."
 
-#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3043
+#: src/mimeview.c:2180 src/mimeview.c:2187 src/textview.c:3044
 msgid "Open with"
 msgstr "Ouvrir avec"
 
-#: src/mimeview.c:2180 src/mimeview.c:2187 src/textview.c:3044
+#: src/mimeview.c:2181 src/mimeview.c:2188 src/textview.c:3045
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8495,7 +8567,7 @@ msgstr ""
 "Sisir la ligne de commande pour ouvrir le fichier :\n"
 "('%s' sera remplacé par le chemin du fichier)"
 
-#: src/mimeview.c:2282
+#: src/mimeview.c:2283
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8506,117 +8578,117 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2290
+#: src/mimeview.c:2291
 msgid "Execute untrusted binary?"
 msgstr "Exécuter un binaire inconnu ?"
 
-#: src/mimeview.c:2291
+#: src/mimeview.c:2292
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
-"dangerous and could probably lead to compromission of your computer.\n"
+"dangerous and could compromise your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
 "Cette pièce jointe est un fichier exécutable. L'exécution de binaires dont "
-"la provenance est inconnue est une opération dangereuse qui pourrait "
-"compromettre votre ordinateur.\n"
+"la provenance est inconnueest une opération dangereuse qui pourrait "
+"compromettre la sécurité de votre ordinateur.\n"
 "\n"
 "Voulez-vous exécuter ce binaire ?"
 
-#: src/mimeview.c:2295
+#: src/mimeview.c:2296
 msgid "Run binary"
 msgstr "Exécuter le binaire"
 
-#: src/mimeview.c:2598 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2599 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "Type :"
 
-#: src/mimeview.c:2599 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:701 src/summaryview.c:2743
+#: src/mimeview.c:2600 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2787
 msgid "Size:"
 msgstr "Taille :"
 
-#: src/mimeview.c:2613 src/plugins/vcalendar/vcalendar.c:1253
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1698
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
+#: src/mimeview.c:2614 src/plugins/vcalendar/vcalendar.c:1254
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 msgid "Description:"
 msgstr "Description :"
 
-#: src/news.c:299
+#: src/news.c:300
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "La connexion NNTP vers %s:%d a été coupée.\n"
 
-#: src/news.c:334
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Compte '%s' : Connexion au serveur SMTP : %s:%d..\n"
 
-#: src/news.c:370
+#: src/news.c:371
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Erreur de connexion à %s:%d..\n"
 
-#: src/news.c:450
+#: src/news.c:451
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan ne supporte pas le code retour 480 donc nous choisissons de "
 "continuer\n"
 
-#: src/news.c:459
+#: src/news.c:460
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Le mode de lecture a échoué, erreur ignorée\n"
 
-#: src/news.c:463
+#: src/news.c:464
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Erreur de création de session avec %s:%d\n"
 
-#: src/news.c:478
+#: src/news.c:479
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Erreur d'authentification à %s:%d..\n"
 
-#: src/news.c:503
+#: src/news.c:504
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail nécessite un accès réseau pour accéder au serveur de groupes de "
 "discussion."
 
-#: src/news.c:874
+#: src/news.c:875
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "Impossible de sélectionner le groupe : %s\n"
 
-#: src/news.c:1066 src/news.c:1244
+#: src/news.c:1067 src/news.c:1245
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "Impossible de définir le groupe : %s\n"
 
-#: src/news.c:1075
+#: src/news.c:1076
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Intervalle d'articles invalide : %d - %d\n"
 
-#: src/news.c:1145 src/news.c:1172 src/news.c:1199
+#: src/news.c:1146 src/news.c:1173 src/news.c:1200
 msgid "couldn't get xhdr\n"
 msgstr "Impossible d'obtenir xhdr\n"
 
-#: src/news.c:1237
+#: src/news.c:1238
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Exécution de xover %d - %d sur %s..\n"
 
-#: src/news.c:1252
+#: src/news.c:1253
 msgid "couldn't get xover\n"
 msgstr "Impossible de faire un xover.\n"
 
-#: src/news.c:1269
+#: src/news.c:1270
 msgid "invalid xover line\n"
 msgstr "Ligne xover invalide\n"
 
-#: src/news.c:1471
+#: src/news.c:1472
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8692,11 +8764,11 @@ msgstr "Nouvelle phrase secrète :"
 msgid "Confirm passphrase:"
 msgstr "Confirmer la phrase secrète :"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:52
+#: src/plugins/acpi_notifier/acpi_notifier.c:53
 msgid "Acpi Notifier"
 msgstr "Agent de notification ACPI"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:68
+#: src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -8705,7 +8777,7 @@ msgstr ""
 "Vous pouvez le trouver à l'adresse suivante :\n"
 " http://www.cakey.de/acerhk/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:70
+#: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -8714,19 +8786,19 @@ msgstr ""
 "Vous pouvez le trouver à l'adresse suivante : \n"
 " http://code.google.com/p/aceracpi/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:72
+#: src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr "Vérifiez que le module 'asus_laptop' est chargé."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr "Vérifiez que le module 'asus_acpi' est chargé."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr "Vérifiez que le module 'ibm_acpi' est chargé."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:75
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -8735,76 +8807,76 @@ msgstr ""
 "Vous pouvez le trouver à l'adresse suivante :\n"
 " http://apanel.sourceforge.net/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:208
-#: src/plugins/acpi_notifier/acpi_notifier.c:214
-#: src/plugins/acpi_notifier/acpi_notifier.c:426
+#: src/plugins/acpi_notifier/acpi_notifier.c:209
+#: src/plugins/acpi_notifier/acpi_notifier.c:215
+#: src/plugins/acpi_notifier/acpi_notifier.c:427
 msgid "Control file doesn't exist."
 msgstr "Le fichier de contrôle n'existe pas."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
 msgid " : no new or unread mail"
 msgstr " : pas de messages nouveaux ou non lus"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
 msgid " : unread mail"
 msgstr " : messages non lus"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:308
+#: src/plugins/acpi_notifier/acpi_notifier.c:309
 msgid " : new mail"
 msgstr " : nouveaux messages"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:310
-#: src/plugins/acpi_notifier/acpi_notifier.c:316
-#: src/plugins/acpi_notifier/acpi_notifier.c:322
+#: src/plugins/acpi_notifier/acpi_notifier.c:311
+#: src/plugins/acpi_notifier/acpi_notifier.c:317
+#: src/plugins/acpi_notifier/acpi_notifier.c:323
 msgid "off"
 msgstr "éteinte"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:312
-#: src/plugins/acpi_notifier/acpi_notifier.c:318
-#: src/plugins/acpi_notifier/acpi_notifier.c:324
+#: src/plugins/acpi_notifier/acpi_notifier.c:313
+#: src/plugins/acpi_notifier/acpi_notifier.c:319
+#: src/plugins/acpi_notifier/acpi_notifier.c:325
 msgid "blinking"
 msgstr "clignotante"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:314
-#: src/plugins/acpi_notifier/acpi_notifier.c:320
-#: src/plugins/acpi_notifier/acpi_notifier.c:326
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
+#: src/plugins/acpi_notifier/acpi_notifier.c:321
+#: src/plugins/acpi_notifier/acpi_notifier.c:327
 msgid "on"
 msgstr "allumée"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:348
-#: src/plugins/acpi_notifier/acpi_notifier.c:357
-#: src/plugins/acpi_notifier/acpi_notifier.c:372
+#: src/plugins/acpi_notifier/acpi_notifier.c:349
+#: src/plugins/acpi_notifier/acpi_notifier.c:358
+#: src/plugins/acpi_notifier/acpi_notifier.c:373
 msgid "LED "
 msgstr "DEL "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:387
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI type: "
 msgstr "Type ACPI : "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:396
+#: src/plugins/acpi_notifier/acpi_notifier.c:397
 msgid "ACPI file: "
 msgstr "Fichier ACPI : "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:407
+#: src/plugins/acpi_notifier/acpi_notifier.c:408
 msgid "values - On: "
 msgstr "valeurs - Allumé : "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:412
+#: src/plugins/acpi_notifier/acpi_notifier.c:413
 msgid " - Off: "
 msgstr " - Éteint : "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:434
+#: src/plugins/acpi_notifier/acpi_notifier.c:435
 msgid "Blink when user interaction is required"
 msgstr ""
 "Faire clignoter lorsque l'interaction de l'utilisateur·rice est requise"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:868
+#: src/plugins/acpi_notifier/acpi_notifier.c:869
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr ""
 "Ce module gère différentes DELs de notification de messages sur certains "
 "portables avec ACPI."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:889
+#: src/plugins/acpi_notifier/acpi_notifier.c:890
 msgid "Laptop LED"
 msgstr "DEL portable"
 
@@ -8842,8 +8914,8 @@ msgstr "Dossier du carnet d'adresses où conserver les adresses"
 #: src/plugins/bogofilter/bogofilter_gtk.c:262
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
 #: src/plugins/spamassassin/spamassassin_gtk.c:463
-#: src/prefs_filtering_action.c:557 src/prefs_filtering_action.c:564
-#: src/prefs_matcher.c:674
+#: src/prefs_filtering_action.c:545 src/prefs_filtering_action.c:552
+#: src/prefs_matcher.c:686
 msgid "Select..."
 msgstr "Sélectionner.."
 
@@ -8925,19 +8997,19 @@ msgstr ""
 msgid "Archiver"
 msgstr "Archivage"
 
-#: src/plugins/archive/archiver_gtk.c:107
+#: src/plugins/archive/archiver_gtk.c:108
 msgid "Archiving"
 msgstr "Archivage"
 
-#: src/plugins/archive/archiver_gtk.c:126
+#: src/plugins/archive/archiver_gtk.c:127
 msgid "Press Cancel button to stop archiving"
 msgstr "Cliquer le bouton Annuler pour interrompre l'archivage"
 
-#: src/plugins/archive/archiver_gtk.c:142
+#: src/plugins/archive/archiver_gtk.c:143
 msgid "Archiving:"
 msgstr "Archivage :"
 
-#: src/plugins/archive/archiver_gtk.c:526
+#: src/plugins/archive/archiver_gtk.c:527
 #, c-format
 msgid ""
 "Some uninitialized data prevents from starting\n"
@@ -8947,7 +9019,7 @@ msgstr ""
 "Des paramètres ne sont pas définis et empêchent dedémarrer l'archivage :\n"
 "%s%s"
 
-#: src/plugins/archive/archiver_gtk.c:529
+#: src/plugins/archive/archiver_gtk.c:530
 msgid ""
 "\n"
 "- the folder to archive is not set"
@@ -8955,7 +9027,7 @@ msgstr ""
 "\n"
 "- le nom du dossier à archiver n'est pas défini"
 
-#: src/plugins/archive/archiver_gtk.c:530
+#: src/plugins/archive/archiver_gtk.c:531
 msgid ""
 "\n"
 "- the name for archive is not set"
@@ -8963,37 +9035,37 @@ msgstr ""
 "\n"
 "- le nom de l'archive à créer n'est pas défini"
 
-#: src/plugins/archive/archiver_gtk.c:553
+#: src/plugins/archive/archiver_gtk.c:554
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s : Existe déjà. Continuer ?"
 
-#: src/plugins/archive/archiver_gtk.c:556
+#: src/plugins/archive/archiver_gtk.c:557
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s : est un lien. Impossible de continuer"
 
-#: src/plugins/archive/archiver_gtk.c:559
+#: src/plugins/archive/archiver_gtk.c:560
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s : est un répertoire. Impossible de continuer"
 
-#: src/plugins/archive/archiver_gtk.c:562
+#: src/plugins/archive/archiver_gtk.c:563
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s : Pas de permissions. Impossible de continuer"
 
-#: src/plugins/archive/archiver_gtk.c:565
+#: src/plugins/archive/archiver_gtk.c:566
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s : Erreur inconnue. Impossible de continuer"
 
-#: src/plugins/archive/archiver_gtk.c:573
-#: src/plugins/archive/archiver_gtk.c:620
+#: src/plugins/archive/archiver_gtk.c:574
+#: src/plugins/archive/archiver_gtk.c:621
 msgid "Creating archive"
 msgstr "Création de l'archive"
 
-#: src/plugins/archive/archiver_gtk.c:586
+#: src/plugins/archive/archiver_gtk.c:587
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -9002,7 +9074,7 @@ msgstr ""
 "Nom de fichier invalide :\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:591
+#: src/plugins/archive/archiver_gtk.c:592
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -9011,7 +9083,7 @@ msgstr ""
 "Ce n'est pas un dossier Claws Mail valide :\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:615
+#: src/plugins/archive/archiver_gtk.c:616
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -9026,7 +9098,7 @@ msgstr ""
 "\n"
 "Continuer ?"
 
-#: src/plugins/archive/archiver_gtk.c:632
+#: src/plugins/archive/archiver_gtk.c:633
 #, c-format
 msgid ""
 "Archive creation error:\n"
@@ -9035,178 +9107,180 @@ msgstr ""
 "Erreur lors de la création de l'archive :\n"
 "%s"
 
-#: src/plugins/archive/archiver_gtk.c:745
+#: src/plugins/archive/archiver_gtk.c:746
 msgid "Archive result"
 msgstr "Rapport d'archivage"
 
-#: src/plugins/archive/archiver_gtk.c:775
+#: src/plugins/archive/archiver_gtk.c:776
 msgid "Values"
 msgstr "Valeurs"
 
-#: src/plugins/archive/archiver_gtk.c:785
+#: src/plugins/archive/archiver_gtk.c:786
 msgid "Archive"
 msgstr "Archive"
 
-#: src/plugins/archive/archiver_gtk.c:791
+#: src/plugins/archive/archiver_gtk.c:792
 msgid "Archive format"
 msgstr "Format d'archive"
 
-#: src/plugins/archive/archiver_gtk.c:798
+#: src/plugins/archive/archiver_gtk.c:799
 msgid "Compression method"
 msgstr "Méthode de compression"
 
-#: src/plugins/archive/archiver_gtk.c:806
+#: src/plugins/archive/archiver_gtk.c:807
 msgid "Number of files"
 msgstr "Nombre de fichiers"
 
-#: src/plugins/archive/archiver_gtk.c:814
+#: src/plugins/archive/archiver_gtk.c:815
 msgid "Archive Size"
 msgstr "Taille de l'archive"
 
-#: src/plugins/archive/archiver_gtk.c:822
+#: src/plugins/archive/archiver_gtk.c:823
 msgid "Folder Size"
 msgstr "Taille du dossier"
 
-#: src/plugins/archive/archiver_gtk.c:831
+#: src/plugins/archive/archiver_gtk.c:832
 msgid "Compression level"
 msgstr "Taux de compression"
 
-#: src/plugins/archive/archiver_gtk.c:836
-#: src/plugins/archive/archiver_gtk.c:844
-#: src/plugins/archive/archiver_gtk.c:852
-#: src/plugins/pdf_viewer/poppler_viewer.c:720 src/prefs_folder_item.c:521
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:525
+#: src/prefs_folder_item.c:1200 src/prefs_folder_item.c:1232
 msgid "Yes"
 msgstr "Oui"
 
-#: src/plugins/archive/archiver_gtk.c:836
-#: src/plugins/archive/archiver_gtk.c:844
-#: src/plugins/archive/archiver_gtk.c:852
-#: src/plugins/pdf_viewer/poppler_viewer.c:723 src/prefs_folder_item.c:520
-#: src/prefs_summaries.c:380
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:724 src/prefs_folder_item.c:524
+#: src/prefs_folder_item.c:1199 src/prefs_folder_item.c:1231
+#: src/prefs_summaries.c:406
 msgid "No"
 msgstr "Non"
 
-#: src/plugins/archive/archiver_gtk.c:839
+#: src/plugins/archive/archiver_gtk.c:840
 msgid "MD5 checksum"
 msgstr "Somme de contrôle MD5"
 
-#: src/plugins/archive/archiver_gtk.c:847
+#: src/plugins/archive/archiver_gtk.c:848
 msgid "Descriptive names"
 msgstr "Noms longs"
 
-#: src/plugins/archive/archiver_gtk.c:855
+#: src/plugins/archive/archiver_gtk.c:856
 msgid "Delete selected files"
 msgstr "Supprimer les fichiers sélectionnés"
 
-#: src/plugins/archive/archiver_gtk.c:864
-#: src/plugins/archive/archiver_gtk.c:1329
+#: src/plugins/archive/archiver_gtk.c:865
+#: src/plugins/archive/archiver_gtk.c:1330
 msgid "Select mails before"
 msgstr "Sélectionner les emails avant"
 
-#: src/plugins/archive/archiver_gtk.c:920
+#: src/plugins/archive/archiver_gtk.c:921
 msgid "Select folder to archive"
 msgstr "Sélection du dossier à archiver"
 
-#: src/plugins/archive/archiver_gtk.c:941
+#: src/plugins/archive/archiver_gtk.c:942
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Nom du fichier archive (il est recommandé d'utiliser\n"
 "un suffixe en rapport avec le format de l'archive, par\n"
 "exemple .tgz)"
 
-#: src/plugins/archive/archiver_gtk.c:989
+#: src/plugins/archive/archiver_gtk.c:990
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld sur %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1042
+#: src/plugins/archive/archiver_gtk.c:1043
 msgid "Create Archive"
 msgstr "Créer une archive"
 
-#: src/plugins/archive/archiver_gtk.c:1057
+#: src/plugins/archive/archiver_gtk.c:1058
 msgid "Enter Archiver arguments"
 msgstr "Paramètres d'archivage"
 
-#: src/plugins/archive/archiver_gtk.c:1071
+#: src/plugins/archive/archiver_gtk.c:1072
 msgid "Folder to archive"
 msgstr "Dossier à archiver"
 
-#: src/plugins/archive/archiver_gtk.c:1078
+#: src/plugins/archive/archiver_gtk.c:1079
 msgid "Folder which is the root of the archive"
 msgstr "Dossier racine de l'archive"
 
-#: src/plugins/archive/archiver_gtk.c:1083
+#: src/plugins/archive/archiver_gtk.c:1084
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "Cliquer ce bouton pour sélectionner un dossier à archiver"
 
-#: src/plugins/archive/archiver_gtk.c:1089
+#: src/plugins/archive/archiver_gtk.c:1090
 msgid "Name for archive"
 msgstr "Nom de l'archive"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1096
 msgid "Archive location and name"
 msgstr "Chemin et nom de l'archive"
 
-#: src/plugins/archive/archiver_gtk.c:1097
+#: src/plugins/archive/archiver_gtk.c:1098
 #: src/plugins/archive/archiver_prefs.c:225
 #: src/plugins/pgpcore/select-keys.c:493
 msgid "_Select"
 msgstr "_Sélectionner"
 
-#: src/plugins/archive/archiver_gtk.c:1100
+#: src/plugins/archive/archiver_gtk.c:1101
 msgid "Click this button to select a name and location for the archive"
 msgstr ""
 "Cliquer ce bouton pour sélectionner un chemin et un nom de fichier pour "
 "l'archive à créer"
 
-#: src/plugins/archive/archiver_gtk.c:1102
+#: src/plugins/archive/archiver_gtk.c:1103
 msgid "Choose compression"
 msgstr "Choix de la compression"
 
-#: src/plugins/archive/archiver_gtk.c:1114
-#: src/plugins/archive/archiver_gtk.c:1120
-#: src/plugins/archive/archiver_gtk.c:1126
-#: src/plugins/archive/archiver_gtk.c:1133
-#: src/plugins/archive/archiver_gtk.c:1139
-#: src/plugins/archive/archiver_gtk.c:1147
-#: src/plugins/archive/archiver_gtk.c:1155
-#: src/plugins/archive/archiver_gtk.c:1161
-#: src/plugins/archive/archiver_gtk.c:1167
-#: src/plugins/archive/archiver_gtk.c:1175
-#: src/plugins/archive/archiver_gtk.c:1182
+#: src/plugins/archive/archiver_gtk.c:1115
+#: src/plugins/archive/archiver_gtk.c:1121
+#: src/plugins/archive/archiver_gtk.c:1127
+#: src/plugins/archive/archiver_gtk.c:1134
+#: src/plugins/archive/archiver_gtk.c:1140
+#: src/plugins/archive/archiver_gtk.c:1148
+#: src/plugins/archive/archiver_gtk.c:1156
+#: src/plugins/archive/archiver_gtk.c:1162
+#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1176
+#: src/plugins/archive/archiver_gtk.c:1183
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Choisir cette option pour compresser l'archive avec %s"
 
-#: src/plugins/archive/archiver_gtk.c:1231
+#: src/plugins/archive/archiver_gtk.c:1232
 msgid "Choose format"
 msgstr "Choix du format"
 
-#: src/plugins/archive/archiver_gtk.c:1243
-#: src/plugins/archive/archiver_gtk.c:1249
-#: src/plugins/archive/archiver_gtk.c:1255
-#: src/plugins/archive/archiver_gtk.c:1261
+#: src/plugins/archive/archiver_gtk.c:1244
+#: src/plugins/archive/archiver_gtk.c:1250
+#: src/plugins/archive/archiver_gtk.c:1256
+#: src/plugins/archive/archiver_gtk.c:1262
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Choisir cette option pour créer une archive au format %s"
 
-#: src/plugins/archive/archiver_gtk.c:1281
+#: src/plugins/archive/archiver_gtk.c:1282
 msgid "Miscellaneous options"
 msgstr "Autres options"
 
-#: src/plugins/archive/archiver_gtk.c:1290
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "_Recursive"
 msgstr "_Récursif"
 
-#: src/plugins/archive/archiver_gtk.c:1294
+#: src/plugins/archive/archiver_gtk.c:1295
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Inclure les sous-dossiers dans l'archive"
 
-#: src/plugins/archive/archiver_gtk.c:1296
+#: src/plugins/archive/archiver_gtk.c:1297
 msgid "_MD5sum"
 msgstr "Somme de contrôle _MD5"
 
-#: src/plugins/archive/archiver_gtk.c:1300
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archive.\n"
 "Be aware though, that this dramatically increases the time it\n"
@@ -9216,11 +9290,11 @@ msgstr ""
 "Attention, activer cette option augmentera le temps nécessaire à la création "
 "de l'archive."
 
-#: src/plugins/archive/archiver_gtk.c:1304
+#: src/plugins/archive/archiver_gtk.c:1305
 msgid "R_ename"
 msgstr "R_enommer"
 
-#: src/plugins/archive/archiver_gtk.c:1308
+#: src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/archive/archiver_prefs.c:427
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9231,7 +9305,7 @@ msgstr ""
 "Les noms longs sont de la forme date_de@à@sujet.\n"
 "Les noms seront tronqués s'ils dépassent 96 caractères"
 
-#: src/plugins/archive/archiver_gtk.c:1316
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9239,11 +9313,11 @@ msgstr ""
 "Choisir cette option pour effacer les emails après archivage\n"
 "(IMAP4, Mbox et POP3)"
 
-#: src/plugins/archive/archiver_gtk.c:1320
+#: src/plugins/archive/archiver_gtk.c:1321
 msgid "Selection options"
 msgstr "Options de sélection"
 
-#: src/plugins/archive/archiver_gtk.c:1336
+#: src/plugins/archive/archiver_gtk.c:1337
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9317,7 +9391,7 @@ msgstr ""
 "de l'archive."
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:769
+#: src/plugins/managesieve/sieve_manager.c:770
 msgid "Rename"
 msgstr "Renommer"
 
@@ -9330,12 +9404,12 @@ msgid "Remove attachments"
 msgstr "Supprimer les pièces jointes"
 
 #: src/plugins/att_remover/att_remover.c:362
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1099
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:451
-#: src/prefs_summary_column.c:79 src/summaryview.c:2837
+#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:622
+#: src/prefs_summary_column.c:79 src/summaryview.c:2881
 msgid "Attachment"
 msgstr "Pièces jointes"
 
@@ -9497,37 +9571,37 @@ msgstr "Exclure"
 msgid "Attach Warner"
 msgstr "Attach Warner"
 
-#: src/plugins/bogofilter/bogofilter.c:81
+#: src/plugins/bogofilter/bogofilter.c:82
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:107
+#: src/plugins/bogofilter/bogofilter.c:108
 #: src/plugins/bogofilter/bogofilter_gtk.c:258
 #: src/plugins/bogofilter/bogofilter_gtk.c:331
 #: src/plugins/bogofilter/bogofilter_gtk.c:408
 #: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
-#: src/plugins/spamassassin/spamassassin.c:117
+#: src/plugins/spamassassin/spamassassin.c:118
 #: src/plugins/spamassassin/spamassassin_gtk.c:459
 #: src/plugins/spamassassin/spamassassin_gtk.c:508
-#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:670
-#: src/prefs_matcher.c:705 src/prefs_matcher.c:1616 src/prefs_matcher.c:1623
-#: src/prefs_matcher.c:1631 src/prefs_matcher.c:1633 src/prefs_matcher.c:2518
-#: src/prefs_matcher.c:2522
+#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:682
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1657 src/prefs_matcher.c:1664
+#: src/prefs_matcher.c:1672 src/prefs_matcher.c:1674 src/prefs_matcher.c:2582
+#: src/prefs_matcher.c:2586
 msgid "Any"
 msgstr "Quelconque"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:457
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter : recupération du corps des messages.."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:470
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter : filtrage des messages.."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:586
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9541,7 +9615,7 @@ msgstr ""
 "légitime » avec quelques centaines de pourriels et courriers légitimes pour "
 "que Bogofilter puisse faire son apprentissage."
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:593
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9550,23 +9624,23 @@ msgstr ""
 "Le module Bogofilter n'a pas pu filtrer un message. La commande `%s %s %s` "
 "n'a pas pû être lancée."
 
-#: src/plugins/bogofilter/bogofilter.c:739
+#: src/plugins/bogofilter/bogofilter.c:740
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter : apprentissage sur un message.."
 
-#: src/plugins/bogofilter/bogofilter.c:752
-#: src/plugins/bogofilter/bogofilter.c:799 src/plugins/bsfilter/bsfilter.c:486
+#: src/plugins/bogofilter/bogofilter.c:753
+#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:486
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr ""
 "Bogofilter : échec de l'apprentissage :\n"
 "La commande `%s` a retourné le code %d."
 
-#: src/plugins/bogofilter/bogofilter.c:767
+#: src/plugins/bogofilter/bogofilter.c:768
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter : apprentissage sur des messages.."
 
-#: src/plugins/bogofilter/bogofilter.c:855
+#: src/plugins/bogofilter/bogofilter.c:856
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -9576,7 +9650,7 @@ msgstr ""
 "La commande `%s %s %s` a retourné l'erreur suivante :\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:983
+#: src/plugins/bogofilter/bogofilter.c:984
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bogofilter. You will need Bogofilter installed "
@@ -9606,13 +9680,13 @@ msgstr ""
 "Ce module est paramétrable via les options situées sous Configuration/"
 "Préférences/Modules/Bogofilter."
 
-#: src/plugins/bogofilter/bogofilter.c:1016 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:642
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:643
 msgid "Spam detection"
 msgstr "Analyse anti-SPAMs"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:643
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
+#: src/plugins/spamassassin/spamassassin.c:644
 msgid "Spam learning"
 msgstr "Apprentissage de SPAMs"
 
@@ -9636,7 +9710,7 @@ msgstr "Les messages d'un volume supérieur ne seront pas analysés."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1640
+#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1636
 msgid "KB"
 msgstr "ko"
 
@@ -10064,7 +10138,7 @@ msgstr ""
 "Clamd ne répond pas au ping.\n"
 "Clamd a-t-il été exécuté ?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:121
+#: src/plugins/clamd/libclamd/clamd-plugin.c:122
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -10073,7 +10147,7 @@ msgstr ""
 "%s : ouverture impossible\n"
 "clamd sera désactivé"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:216
+#: src/plugins/clamd/libclamd/clamd-plugin.c:217
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -10082,30 +10156,30 @@ msgstr ""
 "%s : la collecte des informations nécessaires est impossible\n"
 "clamd sera désactivé"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:250
+#: src/plugins/clamd/libclamd/clamd-plugin.c:251
 msgid "Could not create socket"
 msgstr "Impossible de créer la « socket »"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:441
+#: src/plugins/clamd/libclamd/clamd-plugin.c:442
 msgid ": File does not exist"
 msgstr " : Fichier inexistant"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:454
+#: src/plugins/clamd/libclamd/clamd-plugin.c:455
 msgid ": Unable to open"
 msgstr " : Impossible d'ouvrir le fichier"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:473
-#: src/plugins/clamd/libclamd/clamd-plugin.c:478
-#: src/plugins/clamd/libclamd/clamd-plugin.c:492
+#: src/plugins/clamd/libclamd/clamd-plugin.c:474
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket write error"
 msgstr "Erreur d'écriture sur la « socket »"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:485
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s : Erreur de lecture"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:499
+#: src/plugins/clamd/libclamd/clamd-plugin.c:500
 msgid "Socket read error"
 msgstr "Erreur de lecture sur la « socket »"
 
@@ -10130,65 +10204,65 @@ msgstr ""
 "\n"
 "Il n'est pas vraiment utile."
 
-#: src/plugins/fancy/fancy_prefs.c:146
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Display images"
 msgstr "Afficher les images"
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Display embedded images"
 msgstr "Afficher les images jointes"
 
-#: src/plugins/fancy/fancy_prefs.c:151
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute javascript"
 msgstr "Exécuter les scripts JavaScript"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Execute embedded javascript"
 msgstr "Exécuter les scripts Javascript joints"
 
-#: src/plugins/fancy/fancy_prefs.c:156
+#: src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute Java applets"
 msgstr "Exécuter les applets Java"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:158
 msgid "Execute embedded Java applets"
 msgstr "Exécuter les applets Java jointes"
 
-#: src/plugins/fancy/fancy_prefs.c:161
+#: src/plugins/fancy/fancy_prefs.c:162
 msgid "Render objects using plugins"
 msgstr "Afficher les objets multimédia à l'aide des modules"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Render embedded objects using plugins"
 msgstr "Afficher les objets multimédia joints à l'aide des modules"
 
-#: src/plugins/fancy/fancy_prefs.c:169
+#: src/plugins/fancy/fancy_prefs.c:170
 msgid "Open in viewer (remote content is enabled)"
 msgstr ""
 "Ouvrir dans le module (le chargement des données distantes est activé) "
 
-#: src/plugins/fancy/fancy_prefs.c:172
+#: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "Ne rien faire (le chargement des données distantes est désactivé) "
 
-#: src/plugins/fancy/fancy_prefs.c:209 src/prefs_account.c:3920
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3944
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Serveur mandataire"
 
-#: src/plugins/fancy/fancy_prefs.c:211
+#: src/plugins/fancy/fancy_prefs.c:212
 msgid "Use GNOME's proxy settings"
 msgstr "Utiliser les paramètres de serveur mandataire de GNOME"
 
-#: src/plugins/fancy/fancy_prefs.c:219
+#: src/plugins/fancy/fancy_prefs.c:220
 msgid "Use proxy"
 msgstr "Utiliser un serveur mandataire"
 
-#: src/plugins/fancy/fancy_prefs.c:237
+#: src/plugins/fancy/fancy_prefs.c:238
 msgid "Remote resources"
 msgstr "Ressources distantes"
 
-#: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/fancy/fancy_prefs.c:239
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10203,121 +10277,121 @@ msgstr ""
 "exécution des scripts, applets ou modules peuvent tout de\n"
 "même être activés pour le contenu attaché à l'email."
 
-#: src/plugins/fancy/fancy_prefs.c:244
+#: src/plugins/fancy/fancy_prefs.c:245
 msgid "Enable loading of remote content"
 msgstr "Activer le chargement du contenu distant"
 
-#: src/plugins/fancy/fancy_prefs.c:276
+#: src/plugins/fancy/fancy_prefs.c:277
 msgid "When clicking on a link, by default"
 msgstr "Lorsqu'un lien est cliqué, par défaut"
 
-#: src/plugins/fancy/fancy_prefs.c:284
+#: src/plugins/fancy/fancy_prefs.c:285
 msgid "Open in external browser"
 msgstr "Ouvrir dans le navigateur"
 
-#: src/plugins/fancy/fancy_prefs.c:298
+#: src/plugins/fancy/fancy_prefs.c:299
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "Le CSS de ce fichiers sera appliqué à toutes les parties HTML"
 
-#: src/plugins/fancy/fancy_prefs.c:308
+#: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
 #: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1574 src/prefs_account.c:1663 src/prefs_account.c:2205
-#: src/prefs_customheader.c:234
+#: src/prefs_account.c:1570 src/prefs_account.c:1659 src/prefs_account.c:2210
+#: src/prefs_customheader.c:235
 msgid "Bro_wse"
 msgstr "Pa_rcourir"
 
-#: src/plugins/fancy/fancy_prefs.c:350
+#: src/plugins/fancy/fancy_prefs.c:351
 msgid "Select stylesheet"
 msgstr "Choix de la feuille de style"
 
-#: src/plugins/fancy/fancy_viewer.c:416
+#: src/plugins/fancy/fancy_viewer.c:409
 msgid "Remote content loading is disabled."
 msgstr "Le chargement de données distantes est désactivé."
 
-#: src/plugins/fancy/fancy_viewer.c:495
+#: src/plugins/fancy/fancy_viewer.c:488
 msgid "Load images"
 msgstr "Charger les images"
 
-#: src/plugins/fancy/fancy_viewer.c:497
+#: src/plugins/fancy/fancy_viewer.c:490
 msgid "Enable remote content"
 msgstr "Activer le chargement du contenu distant"
 
-#: src/plugins/fancy/fancy_viewer.c:499
+#: src/plugins/fancy/fancy_viewer.c:492
 msgid "Enable Javascript"
 msgstr "Activer JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:501
+#: src/plugins/fancy/fancy_viewer.c:494
 msgid "Enable Plugins"
 msgstr "Activer les modules"
 
-#: src/plugins/fancy/fancy_viewer.c:503
+#: src/plugins/fancy/fancy_viewer.c:496
 msgid "Enable Java"
 msgstr "Activer Java"
 
-#: src/plugins/fancy/fancy_viewer.c:505
+#: src/plugins/fancy/fancy_viewer.c:498
 msgid "Open links with external browser"
 msgstr "Ouvrir les liens avec le navigateur externe"
 
-#: src/plugins/fancy/fancy_viewer.c:687
+#: src/plugins/fancy/fancy_viewer.c:672
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Une erreur s'est produite : %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:728
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s est un flux invalide ou non supporté"
 
-#: src/plugins/fancy/fancy_viewer.c:754
+#: src/plugins/fancy/fancy_viewer.c:739
 msgid "Search the Web"
 msgstr "Chercher sur le Web"
 
-#: src/plugins/fancy/fancy_viewer.c:766
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open in Viewer"
 msgstr "Ouvrir ici"
 
-#: src/plugins/fancy/fancy_viewer.c:768
+#: src/plugins/fancy/fancy_viewer.c:753
 msgid "Open in Viewer (enable remote content)"
 msgstr "Ouvrir ici (activer le contenu distant)"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:762
 msgid "Open in Browser"
 msgstr "Ouvrir avec le navigateur"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Open Image"
 msgstr "Ouvrir l'image"
 
-#: src/plugins/fancy/fancy_viewer.c:796
+#: src/plugins/fancy/fancy_viewer.c:781
 msgid "Copy Link"
 msgstr "Copier le lien"
 
-#: src/plugins/fancy/fancy_viewer.c:800
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Download Link"
 msgstr "Télécharger le lien"
 
-#: src/plugins/fancy/fancy_viewer.c:811
+#: src/plugins/fancy/fancy_viewer.c:796
 msgid "Save Image As"
 msgstr "Enregistrer l'image sous"
 
-#: src/plugins/fancy/fancy_viewer.c:821
+#: src/plugins/fancy/fancy_viewer.c:806
 msgid "Copy Image"
 msgstr "Copier l'image"
 
-#: src/plugins/fancy/fancy_viewer.c:839
+#: src/plugins/fancy/fancy_viewer.c:846
 msgid "Import feed"
 msgstr "Importer le flux"
 
-#: src/plugins/fancy/fancy_viewer.c:1118
+#: src/plugins/fancy/fancy_viewer.c:1128
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1146
+#: src/plugins/fancy/fancy_viewer.c:1156
 msgid "Fancy HTML Viewer"
 msgstr "Fancy - rendu HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1151
+#: src/plugins/fancy/fancy_viewer.c:1161
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10551,12 +10625,12 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Module GData : tentative de renouvellement de l'authentification\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1936
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1941
 msgid "Authentication"
 msgstr "Authentification"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
 msgid "Username:"
 msgstr "Utilisateur·rice :"
 
@@ -10739,8 +10813,8 @@ msgid "Cache refresh interval"
 msgstr "Intervalle de rafraîchissement du cache"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1619
-#: src/prefs_account.c:1776 src/prefs_matcher.c:335 src/prefs_receive.c:178
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1615
+#: src/prefs_account.c:1772 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "heure(s)"
 
@@ -10943,7 +11017,7 @@ msgstr "Méthode d'authentification non disponible"
 msgid "sending error on Sieve session: %s\n"
 msgstr "erreur d'envoi lors de la session Sieve : %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5763
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5810
 msgid "_Filter"
 msgstr "_Filtrer"
 
@@ -10958,7 +11032,7 @@ msgstr "Rétablir"
 
 #: src/plugins/managesieve/sieve_editor.c:296
 #: src/plugins/managesieve/sieve_editor.c:724
-#: src/plugins/managesieve/sieve_manager.c:182
+#: src/plugins/managesieve/sieve_manager.c:183
 msgid "Unable to get script contents"
 msgstr "Impossible d'obtenir le contenu du script"
 
@@ -11003,57 +11077,57 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - Fitlre Sieve%s"
 
 #: src/plugins/managesieve/sieve_editor.c:744
-#: src/plugins/pdf_viewer/poppler_viewer.c:1304
+#: src/plugins/pdf_viewer/poppler_viewer.c:1315
 msgid "Loading..."
 msgstr "Chargement.."
 
-#: src/plugins/managesieve/sieve_manager.c:159
-#: src/plugins/managesieve/sieve_manager.c:245
+#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:246
 msgid "Add Sieve script"
 msgstr "Ajout d'un filtre Sieve"
 
-#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:161
 msgid "Enter name for a new Sieve filter script."
 msgstr "Saisir le nom du nouveau script Sieve."
 
-#: src/plugins/managesieve/sieve_manager.c:246
+#: src/plugins/managesieve/sieve_manager.c:247
 msgid "Enter new name for the script."
 msgstr "Saisir le nouveau nom pour le script."
 
-#: src/plugins/managesieve/sieve_manager.c:327
+#: src/plugins/managesieve/sieve_manager.c:328
 #, c-format
 msgid "Do you really want to delete the filter '%s'?"
 msgstr "Voulez-vous vraiment supprimer le filtre '%s' ?"
 
-#: src/plugins/managesieve/sieve_manager.c:328
+#: src/plugins/managesieve/sieve_manager.c:329
 msgid "Delete filter"
 msgstr "Suppression du filtre"
 
-#: src/plugins/managesieve/sieve_manager.c:482
+#: src/plugins/managesieve/sieve_manager.c:483
 msgid "Active"
 msgstr "Actif"
 
-#: src/plugins/managesieve/sieve_manager.c:493
+#: src/plugins/managesieve/sieve_manager.c:494
 msgid "An account can only have one active script at a time."
 msgstr "Un compte ne peut avoir qu'un seul script Sieve actif à la fois."
 
-#: src/plugins/managesieve/sieve_manager.c:580
+#: src/plugins/managesieve/sieve_manager.c:581
 msgid "Unable to connect"
 msgstr "Impossible de se connecter"
 
-#: src/plugins/managesieve/sieve_manager.c:627
+#: src/plugins/managesieve/sieve_manager.c:628
 msgid "Listing scripts..."
 msgstr "Établissement de la liste des scripts"
 
-#: src/plugins/managesieve/sieve_manager.c:630
+#: src/plugins/managesieve/sieve_manager.c:631
 msgid "Connecting..."
 msgstr "Connexion.."
 
-#: src/plugins/managesieve/sieve_manager.c:662
+#: src/plugins/managesieve/sieve_manager.c:663
 msgid "Manage Sieve Filters"
 msgstr "Gestion des filtres Sieve"
 
-#: src/plugins/managesieve/sieve_manager.c:804
+#: src/plugins/managesieve/sieve_manager.c:805
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "Afin d'utiliser Sieve, activer le dans les préférences de compte."
 
@@ -11076,7 +11150,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Activer Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1194
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1190
 msgid "Server information"
 msgstr "Configuration des serveurs"
 
@@ -11128,28 +11202,28 @@ msgstr "Utiliser l'authentification"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1389
-#: src/prefs_account.c:1982
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1385
+#: src/prefs_account.c:1987
 msgid "User ID"
 msgstr "Nom d'utilisateur·rice"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1395
-#: src/prefs_account.c:2005 src/prefs_account.c:2733 src/prefs_account.c:2761
-#: src/prefs_account.c:2958 src/prefs_proxy.c:134 src/wizard.c:1215
-#: src/wizard.c:1635
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1391
+#: src/prefs_account.c:2010 src/prefs_account.c:2738 src/prefs_account.c:2766
+#: src/prefs_account.c:2963 src/prefs_proxy.c:134 src/wizard.c:1216
+#: src/wizard.c:1636
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1702
-#: src/prefs_account.c:1954
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1698
+#: src/prefs_account.c:1959
 msgid "Authentication method"
 msgstr "Authentification"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1712
-#: src/prefs_account.c:1963 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1708
+#: src/prefs_account.c:1968 src/prefs_send.c:265 src/prefs_send.c:336
 #: src/prefs_themes.c:1114
 msgid "Automatic"
 msgstr "Automatique"
@@ -11166,20 +11240,20 @@ msgstr "Le serveur Sieve est non spécifié."
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:106 src/plugins/newmail/newmail.c:149
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:111
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Échec lors de la déclaration du hook de newmail"
 
-#: src/plugins/newmail/newmail.c:128
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Impossible d'ouvrir le fichier de log %s : %s\n"
 
-#: src/plugins/newmail/newmail.c:141
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11197,7 +11271,7 @@ msgstr ""
 "\n"
 "Le fichier courant est %s"
 
-#: src/plugins/newmail/newmail.c:175
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Fichier de log"
 
@@ -11402,8 +11476,8 @@ msgstr "Bannière"
 msgid "Popup"
 msgstr "Popup"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:263
-#: src/prefs_receive.c:153
+#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:264
+#: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Commande"
 
@@ -11468,13 +11542,13 @@ msgid "Show banner"
 msgstr "Montrer la bannière"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:229
+#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Jamais"
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:227
-#: src/prefs_summaries.c:493 src/prefs_summaries.c:503
+#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
+#: src/prefs_summaries.c:502 src/prefs_summaries.c:555
 msgid "Always"
 msgstr "Toujours"
 
@@ -11569,14 +11643,6 @@ msgstr "Activer la popup"
 msgid "Popup timeout"
 msgstr "Délai de disparition de la popup"
 
-#: src/plugins/notification/notification_prefs.c:1072
-#: src/plugins/notification/notification_prefs.c:1367
-#: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_other.c:570
-#: src/prefs_receive.c:201 src/prefs_summaries.c:542
-msgid "seconds"
-msgstr "secondes"
-
 #: src/plugins/notification/notification_prefs.c:1101
 msgid "Make popup sticky"
 msgstr "Rendre la popup « collante »"
@@ -11610,7 +11676,7 @@ msgstr "Sélectionner la commande"
 msgid "Enable command"
 msgstr "Activer la commande"
 
-#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:266
+#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "Commande à exécuter"
 
@@ -11759,130 +11825,130 @@ msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "%d nouvel article de flux RSS est arrivé"
 msgstr[1] "%d nouveaux articles de flux RSS sont arrivés"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Title:"
 msgstr "Titre :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Author:"
 msgstr "Auteur·rice :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:707
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Creator:"
 msgstr "Créateur·rice :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:708
+#: src/plugins/pdf_viewer/poppler_viewer.c:709
 msgid "Producer:"
 msgstr "Producteur·rice :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:711
+#: src/plugins/pdf_viewer/poppler_viewer.c:712
 msgid "Created:"
 msgstr "Créé :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:715
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Modified:"
 msgstr "Modifié :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:718
+#: src/plugins/pdf_viewer/poppler_viewer.c:719
 msgid "Format:"
 msgstr "Format :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:720
-#: src/plugins/pdf_viewer/poppler_viewer.c:723
+#: src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/plugins/pdf_viewer/poppler_viewer.c:724
 msgid "Optimized:"
 msgstr "Optimisé :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1206
+#: src/plugins/pdf_viewer/poppler_viewer.c:1217
 msgid "PDF properties"
 msgstr "Propriétés du PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1355
+#: src/plugins/pdf_viewer/poppler_viewer.c:1366
 msgid "Enter password"
 msgstr "Saisie du mot de passe"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1356
+#: src/plugins/pdf_viewer/poppler_viewer.c:1367
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr ""
 "Ce document est verrouillé, son ouverture nécessite la saisie d'un mot de "
 "passe"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1371
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 #, c-format
 msgid "%s Document"
 msgstr "Document %s"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1377
+#: src/plugins/pdf_viewer/poppler_viewer.c:1388
 #, c-format
 msgid "of %d"
 msgstr "sur %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1393
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Le rendu PDF a échoué pour une raison inconnue."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1758
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1776
+#: src/plugins/pdf_viewer/poppler_viewer.c:1993
 msgid "Document Index"
 msgstr "Index du document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1940
+#: src/plugins/pdf_viewer/poppler_viewer.c:1958
 msgid "First Page"
 msgstr "Première page"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1943
+#: src/plugins/pdf_viewer/poppler_viewer.c:1961
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1946
+#: src/plugins/pdf_viewer/poppler_viewer.c:1964
 msgid "Next Page"
 msgstr "Page suivante"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1949
+#: src/plugins/pdf_viewer/poppler_viewer.c:1967
 msgid "Last Page"
 msgstr "Dernière page"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1952
+#: src/plugins/pdf_viewer/poppler_viewer.c:1970
 msgid "Zoom In"
 msgstr "Zoomer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1954
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Zoom Out"
 msgstr "Dézoomer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1957
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Fit Page"
 msgstr "Adapter à la taille"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1960
+#: src/plugins/pdf_viewer/poppler_viewer.c:1978
 msgid "Fit Page Width"
 msgstr "Adapter à la largeur"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1963
+#: src/plugins/pdf_viewer/poppler_viewer.c:1981
 msgid "Rotate Left"
 msgstr "Pivoter à gauche"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1966
+#: src/plugins/pdf_viewer/poppler_viewer.c:1984
 msgid "Rotate Right"
 msgstr "Pivoter à droite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1969
+#: src/plugins/pdf_viewer/poppler_viewer.c:1987
 msgid "Print Document"
 msgstr "Imprimer le document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1990
 msgid "Document Info"
 msgstr "Informations"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1977
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Page Number"
 msgstr "Numéro de page"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1979
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Zoom Factor"
 msgstr "Facteur de zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2089
+#: src/plugins/pdf_viewer/poppler_viewer.c:2108
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11895,13 +11961,13 @@ msgstr ""
 "\n"
 "Retours bienvenus: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2095
-#: src/plugins/pdf_viewer/poppler_viewer.c:2103
-#: src/plugins/pdf_viewer/poppler_viewer.c:2123
+#: src/plugins/pdf_viewer/poppler_viewer.c:2114
+#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2142
 msgid "PDF Viewer"
 msgstr "Lecteur PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2099
+#: src/plugins/pdf_viewer/poppler_viewer.c:2118
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12089,8 +12155,8 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Mettre 0 pour la mémoriser pendant toute la session"
 
 #: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:2071
-#: src/prefs_receive.c:188
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1779
+#: src/prefs_account.c:2076 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minute(s)"
 
@@ -12151,7 +12217,7 @@ msgid "GPG"
 msgstr "GPG"
 
 #: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:917
+#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:918
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -12165,17 +12231,17 @@ msgstr "Pas de correspondance exacte pour '%s' ; veuillez sélectionner la clé.
 msgid "Collecting info for '%s' ... %c"
 msgstr "Récupération d'infos pour '%s' .. %c"
 
-#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:146
 msgid "Undefined"
 msgstr "Indéfinie"
 
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:149
-#: src/plugins/pgpcore/sgpgme.c:165
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/sgpgme.c:166
 msgid "Marginal"
 msgstr "Marginale"
 
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:153
-#: src/plugins/pgpcore/sgpgme.c:169
+#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
+#: src/plugins/pgpcore/sgpgme.c:170
 msgid "Ultimate"
 msgstr "Ultime"
 
@@ -12231,181 +12297,181 @@ msgstr ""
 "\n"
 "Lui faites-vous assez confiance pour pouvoir quand même l'utiliser ?"
 
-#: src/plugins/pgpcore/sgpgme.c:83 src/privacy.c:249 src/privacy.c:253
+#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
 #: src/privacy.c:270 src/privacy.c:274
 msgid "No signature found"
 msgstr "Pas de signature trouvée"
 
-#: src/plugins/pgpcore/sgpgme.c:163
+#: src/plugins/pgpcore/sgpgme.c:164
 msgid "Untrusted"
 msgstr "Inconnu"
 
-#: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
+#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "La signature ne peut être vérifiée - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:241 src/plugins/pgpcore/sgpgme.c:245
+#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
 msgid "The signature has not been checked."
 msgstr "La signature n'a pas été vérifiée."
 
-#: src/plugins/pgpcore/sgpgme.c:251
+#: src/plugins/pgpcore/sgpgme.c:252
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core : Impossible d'obtenir la clé - aucun gpg-agent disponible."
 
-#: src/plugins/pgpcore/sgpgme.c:269
+#: src/plugins/pgpcore/sgpgme.c:270
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Signature correcte de « %s » [ultime]"
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:273
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Signature correcte de « %s » [complète]"
 
-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:276
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Signature correcte de « %s » [marginale]"
 
-#: src/plugins/pgpcore/sgpgme.c:282
+#: src/plugins/pgpcore/sgpgme.c:283
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature correcte de « %s »."
 
-#: src/plugins/pgpcore/sgpgme.c:284 src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr "Clé 0x%s non disponible pour vérifier cette signature"
 
-#: src/plugins/pgpcore/sgpgme.c:290
+#: src/plugins/pgpcore/sgpgme.c:291
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expirée de « %s »."
 
-#: src/plugins/pgpcore/sgpgme.c:293
+#: src/plugins/pgpcore/sgpgme.c:294
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Signature correcte de « %s », mais la clé a expiré"
 
-#: src/plugins/pgpcore/sgpgme.c:296
+#: src/plugins/pgpcore/sgpgme.c:297
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Signature correcte de « %s », mais la clé a été révoquée"
 
-#: src/plugins/pgpcore/sgpgme.c:299
+#: src/plugins/pgpcore/sgpgme.c:300
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Mauvaise signature de « %s »"
 
-#: src/plugins/pgpcore/sgpgme.c:306
+#: src/plugins/pgpcore/sgpgme.c:307
 msgid "The signature has not been checked"
 msgstr "La signature n'a pas été vérifiée"
 
-#: src/plugins/pgpcore/sgpgme.c:325
+#: src/plugins/pgpcore/sgpgme.c:326
 msgid "Error checking signature: no status\n"
 msgstr "Erreur de vérification de la signature : pas de statut\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:344
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Erreur de vérification de la signature : %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:361
+#: src/plugins/pgpcore/sgpgme.c:362
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la clé (type %s) ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:367
+#: src/plugins/pgpcore/sgpgme.c:368
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Signature correcte de « %s » (Confiance : %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:372
+#: src/plugins/pgpcore/sgpgme.c:373
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "UID de clé « %s » expiré\n"
 
-#: src/plugins/pgpcore/sgpgme.c:377
+#: src/plugins/pgpcore/sgpgme.c:378
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Signature expirée de « %s » (Confiance : %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:382
+#: src/plugins/pgpcore/sgpgme.c:383
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "UID de clé « %s » revoqué\n"
 
-#: src/plugins/pgpcore/sgpgme.c:387
+#: src/plugins/pgpcore/sgpgme.c:388
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Mauvaise signature de « %s »\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:401
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid « %s » (Confiance : %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:402
+#: src/plugins/pgpcore/sgpgme.c:403
 msgid "Revoked"
 msgstr "Révoqué"
 
-#: src/plugins/pgpcore/sgpgme.c:407
+#: src/plugins/pgpcore/sgpgme.c:408
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Confiance dans le/la possesseur·euse : %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:408
+#: src/plugins/pgpcore/sgpgme.c:409
 msgid "No key!"
 msgstr "Pas de clé !"
 
-#: src/plugins/pgpcore/sgpgme.c:410
+#: src/plugins/pgpcore/sgpgme.c:411
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de la clé primaire :"
 
-#: src/plugins/pgpcore/sgpgme.c:428
+#: src/plugins/pgpcore/sgpgme.c:429
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "ATTENTION : L'adresse « %s » du signataire ne correspond pas à l'entrée DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:435
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "L'adresse vérifiée du signataire est « %s »\n"
 
-#: src/plugins/pgpcore/sgpgme.c:468
+#: src/plugins/pgpcore/sgpgme.c:469
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Échec lors de la récupération du contenu du message, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:484
+#: src/plugins/pgpcore/sgpgme.c:485
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Échec lors de l'initialisation des données, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:661
+#: src/plugins/pgpcore/sgpgme.c:662
 msgid "Secret key specification is ambiguous"
 msgstr "La spécification de la clé privée est ambiguë."
 
-#: src/plugins/pgpcore/sgpgme.c:671
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Clé privée non trouvée (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:684
+#: src/plugins/pgpcore/sgpgme.c:685
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Échec lors de la mise en place de la clé privée : %s"
 
-#: src/plugins/pgpcore/sgpgme.c:777
+#: src/plugins/pgpcore/sgpgme.c:778
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Le protocole Gpgme '%s' est inutilisable : le moteur '%s' n'est pas "
 "correctement installé."
 
-#: src/plugins/pgpcore/sgpgme.c:783
+#: src/plugins/pgpcore/sgpgme.c:784
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12414,12 +12480,12 @@ msgstr ""
 "Le protocole Gpgme '%s' est inutilisable : la version %s du moteur '%s' est "
 "installée alors que la version %s est nécessaire.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:791
+#: src/plugins/pgpcore/sgpgme.c:792
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Le protocole Gpgme '%s' est inutilisable (problème inconnu)."
 
-#: src/plugins/pgpcore/sgpgme.c:807
+#: src/plugins/pgpcore/sgpgme.c:808
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12427,7 +12493,7 @@ msgstr ""
 "GnuPG n'est pas correctement installé ou doit être mis à jour.\n"
 "Support OpenPGP désactivé."
 
-#: src/plugins/pgpcore/sgpgme.c:884
+#: src/plugins/pgpcore/sgpgme.c:885
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12435,11 +12501,11 @@ msgstr ""
 "Vous devez enregistrer les paramètres du compte par « OK » avant de pouvoir "
 "générer une paire de clé.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:889
+#: src/plugins/pgpcore/sgpgme.c:890
 msgid "No PGP key found"
 msgstr "Pas de clé PGP trouvée"
 
-#: src/plugins/pgpcore/sgpgme.c:890
+#: src/plugins/pgpcore/sgpgme.c:891
 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"
@@ -12449,12 +12515,12 @@ msgstr ""
 "impossible de signer des messages ou en recevoir des chiffrés.\n"
 "Voulez-vous créer maintenant une nouvelle paire de clés ?"
 
-#: src/plugins/pgpcore/sgpgme.c:979 src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:980 src/plugins/pgpcore/sgpgme.c:1002
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Impossible de générer une nouvelle paire de clés : %s"
 
-#: src/plugins/pgpcore/sgpgme.c:989
+#: src/plugins/pgpcore/sgpgme.c:990
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12462,11 +12528,11 @@ msgstr ""
 "Génération de votre nouvelle paire de clés en cours.. Veuillez déplacer "
 "votre souris pour aider à générer de l'entropie.."
 
-#: src/plugins/pgpcore/sgpgme.c:1007
+#: src/plugins/pgpcore/sgpgme.c:1008
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Impossible de générer une nouvelle paire de clés : erreur inconnue"
 
-#: src/plugins/pgpcore/sgpgme.c:1011
+#: src/plugins/pgpcore/sgpgme.c:1012
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12479,62 +12545,62 @@ msgstr ""
 "\n"
 "Voulez-vous l'exporter vers un serveur de clés ?"
 
-#: src/plugins/pgpcore/sgpgme.c:1015
+#: src/plugins/pgpcore/sgpgme.c:1016
 msgid "Key generated"
 msgstr "Clé générée"
 
-#: src/plugins/pgpcore/sgpgme.c:1091
+#: src/plugins/pgpcore/sgpgme.c:1092
 msgid "Key exported."
 msgstr "Clé exportée."
 
-#: src/plugins/pgpcore/sgpgme.c:1093
+#: src/plugins/pgpcore/sgpgme.c:1094
 msgid "Couldn't export key."
 msgstr "Échec lors de l'exportation de la clé."
 
-#: src/plugins/pgpinline/pgpinline.c:155
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "Partie incorrecte"
 
-#: src/plugins/pgpinline/pgpinline.c:159
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "N'est pas une partie texte"
 
-#: src/plugins/pgpinline/pgpinline.c:170 src/plugins/pgpinline/pgpinline.c:322
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "Échec lors de la récupération du texte."
 
-#: src/plugins/pgpinline/pgpinline.c:188
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Échec lors de la conversion du texte dans un jeu de caractère adapté."
 
-#: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
-#: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
-#: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
-#: src/plugins/pgpmime/pgpmime.c:511 src/plugins/pgpmime/pgpmime.c:654
-#: src/plugins/smime/smime.c:417
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
+#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
+#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
+#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:655
+#: src/plugins/smime/smime.c:418
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Impossible d'initialiser le contexte GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:315
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "Impossible d'analyser la partie MIME."
 
-#: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Impossible d'ouvrir le fichier déchiffré %s"
 
-#: src/plugins/pgpinline/pgpinline.c:362 src/plugins/pgpinline/pgpinline.c:371
-#: src/plugins/pgpinline/pgpinline.c:380 src/plugins/pgpinline/pgpinline.c:388
-#: src/plugins/pgpinline/pgpinline.c:398 src/plugins/pgpinline/pgpinline.c:407
-#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Impossible d'écrire dans le fichier déchiffré %s"
 
-#: src/plugins/pgpinline/pgpinline.c:376 src/plugins/pgpinline/pgpinline.c:377
-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12542,54 +12608,54 @@ msgstr ""
 "\n"
 "--- Début des données PGP/Inline chiffrées ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:394 src/plugins/pgpinline/pgpinline.c:395
-#: src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Find des données PGP/Inline chiffrées ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Impossible de fermer le fichier déchiffré %s"
 
-#: src/plugins/pgpinline/pgpinline.c:427
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "Impossible d'analyser le fichier déchiffré."
 
-#: src/plugins/pgpinline/pgpinline.c:435
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "Impossible d'analyser les parties du fichier déchiffré."
 
-#: src/plugins/pgpinline/pgpinline.c:492 src/plugins/pgpinline/pgpinline.c:684
+#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
 msgid "Malformed message"
 msgstr "Message non conforme"
 
-#: src/plugins/pgpinline/pgpinline.c:503 src/plugins/pgpinline/pgpinline.c:695
-#: src/plugins/pgpmime/pgpmime.c:694
+#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
+#: src/plugins/pgpmime/pgpmime.c:695
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Impossible de créer un fichier temporaire, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:538
+#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "La signature des données a échoué, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:565
+#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr ""
 "La signature des données a échoué à cause d'un·e signataire non valide : %s"
 
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:574
+#: src/plugins/pgpinline/pgpinline.c:570 src/plugins/pgpmime/pgpmime.c:575
 msgid "Data signing failed, no results."
 msgstr "La signature des données a échoué. Il n'y a pas de résultats."
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:585
+#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
 msgid "Data signing failed, no contents."
 msgstr "La signature des données a échoué. Il n'y a pas de contenu."
 
-#: src/plugins/pgpinline/pgpinline.c:623
+#: src/plugins/pgpinline/pgpinline.c:624
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -12598,17 +12664,17 @@ msgstr ""
 "le système PGP/Inline, ni les en-têtes de message, comme par exemple l'en-"
 "tête Sujet."
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:664
+#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:665
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Impossible d'ajouter la clé GPG %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:722
+#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:723
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Le chiffrement a échoué, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:795
+#: src/plugins/pgpinline/pgpinline.c:796
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -12644,28 +12710,28 @@ msgstr ""
 "\n"
 "GPGME est copyright 2001 par Werner Koch <dd9jn at gnu.org>."
 
-#: src/plugins/pgpmime/pgpmime.c:203
+#: src/plugins/pgpmime/pgpmime.c:204
 msgid "Signature boundary not found."
 msgstr "Séparateur de signature non trouvé."
 
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:498
+#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:499
 msgid "Couldn't parse decrypted file."
 msgstr "Impossible d'analyser le fichier déchiffré."
 
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:505
+#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:506
 msgid "Couldn't parse decrypted file parts."
 msgstr "Impossible d'analyser les parties du fichier déchiffré."
 
-#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
+#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Impossible de créer un fichier temporaire : %s"
 
-#: src/plugins/pgpmime/pgpmime.c:598
+#: src/plugins/pgpmime/pgpmime.c:599
 msgid "OpenPGP digital signature"
 msgstr "Signature digitale OpenPGP"
 
-#: src/plugins/pgpmime/pgpmime.c:620
+#: src/plugins/pgpmime/pgpmime.c:621
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -12673,7 +12739,7 @@ msgstr ""
 "Veuillez prendre en compte que les en-têtes de message, comme par exemple "
 "l'en-tête Sujet, ne sont pas chiffrés par le système PGP/Mime."
 
-#: src/plugins/pgpmime/pgpmime.c:794
+#: src/plugins/pgpmime/pgpmime.c:795
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12707,38 +12773,38 @@ msgstr ""
 "\n"
 "GPGME est copyright 2001 par Werner Koch <dd9jn at gnu.org>."
 
-#: src/plugins/python/python_plugin.c:358
-#: src/plugins/python/python_plugin.c:502
+#: src/plugins/python/python_plugin.c:359
+#: src/plugins/python/python_plugin.c:503
 msgid "Python scripts"
 msgstr "Scripts Python"
 
-#: src/plugins/python/python_plugin.c:497
+#: src/plugins/python/python_plugin.c:498
 msgid "Show Python console..."
 msgstr "Afficher la console Python.."
 
-#: src/plugins/python/python_plugin.c:503
+#: src/plugins/python/python_plugin.c:504
 #: src/plugins/rssyl/rssyl_feed_props.c:471
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2722
-#: src/prefs_account.c:2750 src/prefs_account.c:3192 src/wizard.c:1205
-#: src/wizard.c:1625
+#: src/plugins/python/python_plugin.c:506 src/prefs_account.c:2727
+#: src/prefs_account.c:2755 src/prefs_account.c:3192 src/wizard.c:1206
+#: src/wizard.c:1626
 msgid "Browse"
 msgstr "Pa_rcourir"
 
-#: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:735
+#: src/plugins/python/python_plugin.c:652
+#: src/plugins/python/python_plugin.c:736
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:657
+#: src/plugins/python/python_plugin.c:658
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr ""
 "Impossible d'enregistrer le connecteur 'compose create hook' dans le module "
 "Python"
 
-#: src/plugins/python/python_plugin.c:740
+#: src/plugins/python/python_plugin.c:741
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12827,7 +12893,7 @@ msgstr ""
 "Les remarques et suggestions sont les bienvenues à l'adresse <berndth at gmx."
 "de>."
 
-#: src/plugins/python/python_plugin.c:791
+#: src/plugins/python/python_plugin.c:792
 msgid "Python integration"
 msgstr "Intégration à Python"
 
@@ -12840,26 +12906,26 @@ msgstr ""
 "Impossible de lire le contenu de l'ancien fichier feeds.xml :\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:110
+#: src/plugins/rssyl/opml_export.c:111
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr ""
 "RSSyl : Erreur lors de l'écriture de '%s' lors de l'export de la liste des "
 "flux.\n"
 
-#: src/plugins/rssyl/opml_export.c:131
+#: src/plugins/rssyl/opml_export.c:132
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl : Impossible de supprimer l'ancien fichier OPML '%s' : %s\n"
 
-#: src/plugins/rssyl/opml_export.c:141
+#: src/plugins/rssyl/opml_export.c:142
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 "RSSyl : Impossible d'ouvrir le fichier '%s' lors de l'export de la liste des "
 "flux : %s\n"
 
-#: src/plugins/rssyl/opml_export.c:182
+#: src/plugins/rssyl/opml_export.c:183
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl : Erreur d'écriture lors de l'export de la liste des flux.\n"
 
@@ -12895,7 +12961,7 @@ msgstr ""
 msgid "RSS feed"
 msgstr "flux RSS"
 
-#: src/plugins/rssyl/rssyl_add_item.c:296
+#: src/plugins/rssyl/rssyl_add_item.c:297
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(vide)"
@@ -12904,36 +12970,36 @@ msgstr "(vide)"
 msgid "Refresh all feeds"
 msgstr "Mettre à jour tous les flux"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:65
+#: src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "S'abonner à un flux"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Saisir l'adresse du flux auquel vous voulez vous abonner :"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:98
+#: src/plugins/rssyl/rssyl_cb_menu.c:99
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:251 src/plugins/rssyl/rssyl_cb_menu.c:298
+#: src/plugins/rssyl/rssyl_cb_menu.c:248 src/plugins/rssyl/rssyl_cb_menu.c:295
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail nécessite un accès réseau pour mettre à jour le flux."
 msgstr[1] "Claws Mail nécessite un accès réseau pour mettre à jour les flux."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:324
+#: src/plugins/rssyl/rssyl_cb_menu.c:321
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Voulez-vous vraiment supprimer le dossier du flux '%s' ?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:325
+#: src/plugins/rssyl/rssyl_cb_menu.c:322
 msgid "Remove feed tree"
 msgstr "Supprimer l'arborescence du flux"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
 msgid "Select an OPML file"
 msgstr "Sélection d'un fichier OPML"
 
@@ -13052,7 +13118,7 @@ msgstr "Récupérer les commentaires des articles de moins de"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1609 src/prefs_folder_item.c:567 src/prefs_matcher.c:336
+#: src/prefs_account.c:1605 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "jour(s)"
 
@@ -13203,17 +13269,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Mise à jour des commentaires pour %s.."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1621
 msgid "401 (Authorisation required)"
 msgstr "401 (Autorisation requise)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:110
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "403 (Unauthorised)"
 msgstr "403 (Non autorisé)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "404 (Not found)"
 msgstr "404 (Non trouvé)"
 
@@ -13259,7 +13325,7 @@ msgstr "RSSyl : flux invalide sans titre '%s'.\n"
 msgid "Updating feed '%s'..."
 msgstr "Mise à jour du flux '%s'.."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:268
+#: src/plugins/rssyl/rssyl_update_feed.c:270
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13272,11 +13338,11 @@ msgstr ""
 "\n"
 "Merci de reporter le problème aux développeur·euse·s."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:352
+#: src/plugins/rssyl/rssyl_update_feed.c:356
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail nécessite un accès réseau pour mettre à jour les flux."
 
-#: src/plugins/rssyl/rssyl_update_format.c:127
+#: src/plugins/rssyl/rssyl_update_format.c:128
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13322,24 +13388,24 @@ msgstr ""
 "\n"
 "GPGME est copyright 2001 par Werner Koch <dd9jn at gnu.org>."
 
-#: src/plugins/smime/smime.c:425
+#: src/plugins/smime/smime.c:426
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Impossible d'initialiser le contexte GPG, %s"
 
-#: src/plugins/smime/smime.c:453
+#: src/plugins/smime/smime.c:454
 msgid "Couldn't open temporary file"
 msgstr "Impossible de créer un fichier temporaire"
 
-#: src/plugins/smime/smime.c:464 src/plugins/smime/smime.c:479
+#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
 msgid "Couldn't write to temporary file"
 msgstr "Impossible d'écrire dans un fichier temporaire"
 
-#: src/plugins/smime/smime.c:490
+#: src/plugins/smime/smime.c:491
 msgid "Couldn't close temporary file"
 msgstr "Impossible de fermer un fichier temporaire"
 
-#: src/plugins/smime/smime.c:712
+#: src/plugins/smime/smime.c:713
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -13347,21 +13413,21 @@ msgstr ""
 "Veuillez prendre en compte que les en-têtes de message, comme par exemple "
 "l'en-tête Sujet, ne sont pas signés par le système S/Mime."
 
-#: src/plugins/spam_report/spam_report.c:301
+#: src/plugins/spam_report/spam_report.c:302
 msgid "Reporting spam..."
 msgstr "Soumission du pourriel.."
 
-#: src/plugins/spam_report/spam_report.c:336
+#: src/plugins/spam_report/spam_report.c:337
 msgid "Report spam online..."
 msgstr "Soumettre le(s) pourriel(s) en ligne"
 
-#: src/plugins/spam_report/spam_report.c:347
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:348
+#: src/plugins/spam_report/spam_report.c:386
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "SpamReport"
 
-#: src/plugins/spam_report/spam_report.c:390
+#: src/plugins/spam_report/spam_report.c:391
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13377,7 +13443,7 @@ msgstr ""
 " * spamcop.net\n"
 " * Système de nomination de lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:415
+#: src/plugins/spam_report/spam_report.c:416
 msgid "Spam reporting"
 msgstr "Soumission de pourriel"
 
@@ -13389,32 +13455,32 @@ msgstr "Activé"
 msgid "Forward to:"
 msgstr "Transférer à :"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1573
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/plugins/spamassassin/spamassassin.c:77
+#: src/plugins/spamassassin/spamassassin.c:78
 #: src/plugins/spamassassin/spamassassin_gtk.c:671
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:181
+#: src/plugins/spamassassin/spamassassin.c:182
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "Le module SpamAssassin ne peut se connecter au serveur spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:197
+#: src/plugins/spamassassin/spamassassin.c:198
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Le filtrage avec le module SpamAssassin a échoué.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:223
+#: src/plugins/spamassassin/spamassassin.c:224
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "Le module SpamAssassin est désactivé par ses propres préférences.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:228
+#: src/plugins/spamassassin/spamassassin.c:229
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin : analyse du(des) message(s).."
 
-#: src/plugins/spamassassin/spamassassin.c:357
+#: src/plugins/spamassassin/spamassassin.c:358
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
@@ -13424,7 +13490,7 @@ msgstr ""
 "cette erreur est sans doute l'inaccessibilité du démon spamd. Veuillez "
 "vérifier qu'il fonctionne bien et est accessible."
 
-#: src/plugins/spamassassin/spamassassin.c:415
+#: src/plugins/spamassassin/spamassassin.c:416
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13432,17 +13498,17 @@ msgstr ""
 "Claws Mail nécessite un accès réseau pour envoyer ce(s) courriel(s) à "
 "l'opérateur d'apprentissage de SpamAssassin."
 
-#: src/plugins/spamassassin/spamassassin.c:560
+#: src/plugins/spamassassin/spamassassin.c:561
 msgid "Failed to get username"
 msgstr "Échec lors de la récupération du nom d'utilisateur·rice"
 
-#: src/plugins/spamassassin/spamassassin.c:577
+#: src/plugins/spamassassin/spamassassin.c:578
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "Le module SpamAssassin est bien chargé mais désactivé par ses propres "
 "préférences.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:611
+#: src/plugins/spamassassin/spamassassin.c:612
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
@@ -13535,7 +13601,7 @@ msgstr ""
 "Temps maximal alloué pour l'analyse d'un message. Au delà, l'analyse est "
 "interrompue et le message est considéré comme légitime."
 
-#: src/plugins/tnef_parse/tnef_parse.c:73
+#: src/plugins/tnef_parse/tnef_parse.c:74
 #, c-format
 msgid ""
 "\n"
@@ -13548,29 +13614,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:130
-#: src/plugins/tnef_parse/tnef_parse.c:137
+#: src/plugins/tnef_parse/tnef_parse.c:131
+#: src/plugins/tnef_parse/tnef_parse.c:138
 msgid "Failed to write the part data."
 msgstr "Impossible d'écrire les données de la pièce."
 
-#: src/plugins/tnef_parse/tnef_parse.c:182
+#: src/plugins/tnef_parse/tnef_parse.c:183
 msgid "Failed to parse VCalendar data."
 msgstr "Impossible de décoder les données VCalendar."
 
-#: src/plugins/tnef_parse/tnef_parse.c:221
+#: src/plugins/tnef_parse/tnef_parse.c:222
 msgid "Failed to parse VTask data."
 msgstr "Impossible de décoder les données VTask."
 
-#: src/plugins/tnef_parse/tnef_parse.c:273
+#: src/plugins/tnef_parse/tnef_parse.c:274
 msgid "Failed to parse VCard data."
 msgstr "Impossible de décoder les données VCard."
 
-#: src/plugins/tnef_parse/tnef_parse.c:413
-#: src/plugins/tnef_parse/tnef_parse.c:437
+#: src/plugins/tnef_parse/tnef_parse.c:414
+#: src/plugins/tnef_parse/tnef_parse.c:438
 msgid "TNEF Parser"
 msgstr "Parseur TNEF"
 
-#: src/plugins/tnef_parse/tnef_parse.c:442
+#: src/plugins/tnef_parse/tnef_parse.c:443
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13731,11 +13797,11 @@ msgstr ""
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: src/plugins/vcalendar/vcalendar.c:99
+#: src/plugins/vcalendar/vcalendar.c:100
 msgid "Create meeting from message..."
 msgstr "Créer un rendez-vous depuis le message.."
 
-#: src/plugins/vcalendar/vcalendar.c:119
+#: src/plugins/vcalendar/vcalendar.c:120
 #, c-format
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
@@ -13743,65 +13809,65 @@ msgstr ""
 "Vous êtes sur le point de créer %d rendez-vous, un par un. Voulez-vous "
 "continuer ?"
 
-#: src/plugins/vcalendar/vcalendar.c:139
+#: src/plugins/vcalendar/vcalendar.c:140
 msgid "Creating meeting..."
 msgstr "Création du rendez-vous.."
 
-#: src/plugins/vcalendar/vcalendar.c:158
+#: src/plugins/vcalendar/vcalendar.c:159
 msgid "no subject"
 msgstr "pas de sujet"
 
-#: src/plugins/vcalendar/vcalendar.c:384
+#: src/plugins/vcalendar/vcalendar.c:385
 msgid "Accept"
 msgstr "Accepter"
 
-#: src/plugins/vcalendar/vcalendar.c:385
+#: src/plugins/vcalendar/vcalendar.c:386
 msgid "Tentatively accept"
 msgstr "Accepter sous réserves"
 
-#: src/plugins/vcalendar/vcalendar.c:386
+#: src/plugins/vcalendar/vcalendar.c:387
 msgid "Decline"
 msgstr "Refuser"
 
-#: src/plugins/vcalendar/vcalendar.c:473
+#: src/plugins/vcalendar/vcalendar.c:474
 msgid "You have a Todo item."
 msgstr "Vous avez une tâche à effectuer."
 
-#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
-#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
-#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:729
+#: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
+#: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
+#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:730
 msgid "Details follow:"
 msgstr "En voici les détails :"
 
-#: src/plugins/vcalendar/vcalendar.c:480
+#: src/plugins/vcalendar/vcalendar.c:481
 msgid "You have created a meeting."
 msgstr "Vous avez créé un rendez-vous."
 
-#: src/plugins/vcalendar/vcalendar.c:485
+#: src/plugins/vcalendar/vcalendar.c:486
 msgid "You have been invited to a meeting."
 msgstr "Vous avez été convié·e à un rendez-vous. "
 
-#: src/plugins/vcalendar/vcalendar.c:493
+#: src/plugins/vcalendar/vcalendar.c:494
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr "Un rendez-vous auquel vous étiez convié·e a été annulé."
 
-#: src/plugins/vcalendar/vcalendar.c:502
+#: src/plugins/vcalendar/vcalendar.c:503
 msgid "You have been forwarded an appointment."
 msgstr "On vous a transmis un rendez-vous."
 
-#: src/plugins/vcalendar/vcalendar.c:556
+#: src/plugins/vcalendar/vcalendar.c:557
 msgid "(this event recurs)"
 msgstr "(cet évènement est récurrent)"
 
-#: src/plugins/vcalendar/vcalendar.c:563
+#: src/plugins/vcalendar/vcalendar.c:564
 msgid "(this event is part of a recurring event)"
 msgstr "(cet évènement fait partie d'un évènement récurrent)"
 
-#: src/plugins/vcalendar/vcalendar.c:728
+#: src/plugins/vcalendar/vcalendar.c:729
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Vous avez reçu une réponse à un rendez-vous inconnu. "
 
-#: src/plugins/vcalendar/vcalendar.c:732
+#: src/plugins/vcalendar/vcalendar.c:733
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13810,35 +13876,35 @@ msgstr ""
 "Vous avez reçu une réponse à un rendez-vous.\n"
 "%s a %s l'invitation dont les détails suivent :"
 
-#: src/plugins/vcalendar/vcalendar.c:811
+#: src/plugins/vcalendar/vcalendar.c:812
 msgid "Error - could not get the calendar MIME part."
 msgstr "Erreur - impossible de trouver la partie MIME calendrier"
 
-#: src/plugins/vcalendar/vcalendar.c:818
+#: src/plugins/vcalendar/vcalendar.c:819
 msgid "Error - no calendar part found."
 msgstr "Erreur - aucune partie calendrier trouvée."
 
-#: src/plugins/vcalendar/vcalendar.c:832
+#: src/plugins/vcalendar/vcalendar.c:833
 msgid "Error - Unknown calendar component type."
 msgstr "Error - Le composant calendrier n'est pas d'un type connu."
 
-#: src/plugins/vcalendar/vcalendar.c:964
+#: src/plugins/vcalendar/vcalendar.c:965
 msgid "Send a notification to the attendees"
 msgstr "Envoyer une notification aux invité·e·s"
 
-#: src/plugins/vcalendar/vcalendar.c:973
+#: src/plugins/vcalendar/vcalendar.c:974
 msgid "Cancel meeting"
 msgstr "Annuler le rendez-vous"
 
-#: src/plugins/vcalendar/vcalendar.c:974
+#: src/plugins/vcalendar/vcalendar.c:975
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Voulez-vous réellement annuler ce rendez-vous ?"
 
-#: src/plugins/vcalendar/vcalendar.c:1069
+#: src/plugins/vcalendar/vcalendar.c:1070
 msgid "No account found"
 msgstr "Pas de compte trouvé"
 
-#: src/plugins/vcalendar/vcalendar.c:1070
+#: src/plugins/vcalendar/vcalendar.c:1071
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13846,128 +13912,128 @@ msgstr ""
 "Vous n'avez pas de compte correspondant à un·e invité·e. Voulez-vous tout de "
 "même répondre ?"
 
-#: src/plugins/vcalendar/vcalendar.c:1072
+#: src/plugins/vcalendar/vcalendar.c:1073
 msgid "Reply anyway"
 msgstr "Répondre tout de même"
 
-#: src/plugins/vcalendar/vcalendar.c:1201
+#: src/plugins/vcalendar/vcalendar.c:1202
 msgid "Answer"
 msgstr "Réponse"
 
-#: src/plugins/vcalendar/vcalendar.c:1202
+#: src/plugins/vcalendar/vcalendar.c:1203
 msgid "Edit meeting..."
 msgstr "Modifier le rendez-vous.."
 
-#: src/plugins/vcalendar/vcalendar.c:1203
+#: src/plugins/vcalendar/vcalendar.c:1204
 msgid "Cancel meeting..."
 msgstr "Annuler le rendez-vous.."
 
-#: src/plugins/vcalendar/vcalendar.c:1204
+#: src/plugins/vcalendar/vcalendar.c:1205
 msgid "Launch website"
 msgstr "Ouvrir le site web"
 
-#: src/plugins/vcalendar/vcalendar.c:1208
+#: src/plugins/vcalendar/vcalendar.c:1209
 msgid "You are already busy at this time."
 msgstr "Vous n'êtes pas disponible actuellement."
 
-#: src/plugins/vcalendar/vcalendar.c:1247
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
+#: src/plugins/vcalendar/vcalendar.c:1248
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Évènement :"
 
-#: src/plugins/vcalendar/vcalendar.c:1248
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1694
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1705
+#: src/plugins/vcalendar/vcalendar.c:1249
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organisateur·rice :"
 
-#: src/plugins/vcalendar/vcalendar.c:1249
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1697
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
+#: src/plugins/vcalendar/vcalendar.c:1250
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Endroit :"
 
-#: src/plugins/vcalendar/vcalendar.c:1250
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1695
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
+#: src/plugins/vcalendar/vcalendar.c:1251
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Résumé :"
 
-#: src/plugins/vcalendar/vcalendar.c:1251
+#: src/plugins/vcalendar/vcalendar.c:1252
 msgid "Starting:"
 msgstr "Début :"
 
-#: src/plugins/vcalendar/vcalendar.c:1252
+#: src/plugins/vcalendar/vcalendar.c:1253
 msgid "Ending:"
 msgstr "Fin :"
 
-#: src/plugins/vcalendar/vcalendar.c:1254
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1699
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
+#: src/plugins/vcalendar/vcalendar.c:1255
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Invité·e·s :"
 
-#: src/plugins/vcalendar/vcalendar.c:1256
+#: src/plugins/vcalendar/vcalendar.c:1257
 msgid "Action:"
 msgstr "Action :"
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_New meeting..."
 msgstr "_Nouveau rendez-vous.."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Export calendar..."
 msgstr "_Exporter le calendrier.."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Subscribe to Webcal..."
 msgstr "_Souscrire à un calendrier en ligne.."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Rename..."
 msgstr "_Renommer.."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "U_pdate subscriptions"
 msgstr "Me_ttre à jour les calendriers"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_List view"
 msgstr "Vue en _liste"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:175
 msgid "_Week view"
 msgstr "Vue _hebdomadaire"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:176
 msgid "_Month view"
 msgstr "Vue _mensuelle"
 
-#: src/plugins/vcalendar/vcal_folder.c:1102
+#: src/plugins/vcalendar/vcal_folder.c:1103
 msgid "Meetings"
 msgstr "Rendez-vous"
 
-#: src/plugins/vcalendar/vcal_folder.c:1501
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "in the past"
 msgstr "dans le passé"
 
-#: src/plugins/vcalendar/vcal_folder.c:1504
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "today"
 msgstr "aujourd'hui"
 
-#: src/plugins/vcalendar/vcal_folder.c:1507
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "tomorrow"
 msgstr "demain"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "this week"
 msgstr "cette semaine"
 
-#: src/plugins/vcalendar/vcal_folder.c:1513
+#: src/plugins/vcalendar/vcal_folder.c:1514
 msgid "later"
 msgstr "plus tard"
 
-#: src/plugins/vcalendar/vcal_folder.c:1517
+#: src/plugins/vcalendar/vcal_folder.c:1518
 #, c-format
 msgid ""
 "\n"
@@ -13976,17 +14042,17 @@ msgstr ""
 "\n"
 "Voici les évènements planifiés %s :\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1611
+#: src/plugins/vcalendar/vcal_folder.c:1612
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Délai d'attente dépassé (%d secondes) lors de la connexion à %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1630
 #, c-format
 msgid "Error %ld"
 msgstr "Erreur %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1812
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13999,7 +14065,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1843
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14010,131 +14076,131 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1873
-#: src/plugins/vcalendar/vcal_folder.c:1876
+#: src/plugins/vcalendar/vcal_folder.c:1874
+#: src/plugins/vcalendar/vcal_folder.c:1877
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Impossible de créer le dossier %s."
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1917
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws Mail nécessite un accès réseau pour accéder au calendrier Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1928
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Récupération du calendrier pour %s.."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1929
 msgid "new subscription"
 msgstr "Nouvelle inscription"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail nécessite un accès réseau pour mettre à jour l'abonnement."
 
-#: src/plugins/vcalendar/vcal_folder.c:1951
+#: src/plugins/vcalendar/vcal_folder.c:1952
 msgid "Subscribe to Webcal"
 msgstr "Souscrire à un calendrier en ligne (Webcal)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1951
-msgid "Enter the WebCal URL:"
-msgstr "Saisir l'URL du calendrier en ligne (WebCal) :"
+#: src/plugins/vcalendar/vcal_folder.c:1952
+msgid "Enter the Webcal URL:"
+msgstr "Saisir l'URL du calendrier en ligne (Webcal) :"
 
-#: src/plugins/vcalendar/vcal_folder.c:1963
+#: src/plugins/vcalendar/vcal_folder.c:1964
 msgid "Could not parse the URL."
 msgstr "Impossible de comprendre l'URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1991
+#: src/plugins/vcalendar/vcal_folder.c:1992
 msgid "Do you really want to unsubscribe?"
 msgstr "Voulez-vous vraiment vous désinscrire ?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1992
+#: src/plugins/vcalendar/vcal_folder.c:1993
 msgid "Delete subscription"
 msgstr "Supprimer la souscription"
 
-#: src/plugins/vcalendar/vcal_manager.c:110
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "accepted"
 msgstr "accepté"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "tentatively accepted"
 msgstr "accepté sous réserves"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "declined"
 msgstr "refusé"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:114
 msgid "did not answer"
 msgstr "n'a pas répondu"
 
-#: src/plugins/vcalendar/vcal_manager.c:144
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "individual"
 msgstr "personne"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "group"
 msgstr "groupe"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "resource"
 msgstr "ressource"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "room"
 msgstr "pièce"
 
-#: src/plugins/vcalendar/vcal_manager.c:559
+#: src/plugins/vcalendar/vcal_manager.c:560
 msgid "Past"
 msgstr "Dans le passé"
 
-#: src/plugins/vcalendar/vcal_manager.c:562
+#: src/plugins/vcalendar/vcal_manager.c:563
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: src/plugins/vcalendar/vcal_manager.c:565
+#: src/plugins/vcalendar/vcal_manager.c:566
 msgid "Tomorrow"
 msgstr "Demain"
 
-#: src/plugins/vcalendar/vcal_manager.c:568
+#: src/plugins/vcalendar/vcal_manager.c:569
 msgid "This week"
 msgstr "Cette semaine"
 
-#: src/plugins/vcalendar/vcal_manager.c:571
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Later"
 msgstr "Plus tard"
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1248
 msgid "Accepted: "
 msgstr "Accepté : "
 
-#: src/plugins/vcalendar/vcal_manager.c:1249
+#: src/plugins/vcalendar/vcal_manager.c:1250
 msgid "Declined: "
 msgstr "Refusé : "
 
-#: src/plugins/vcalendar/vcal_manager.c:1251
+#: src/plugins/vcalendar/vcal_manager.c:1252
 msgid "Tentatively Accepted: "
 msgstr "Accepté sous réserves : "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:307
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Individual"
 msgstr "Personne"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
 msgid "Resource"
 msgstr "Ressource"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:311
 msgid "Room"
 msgstr "Pièce"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324
 msgid "Add..."
 msgstr "Ajouter.."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:779
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:728
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
@@ -14143,62 +14209,62 @@ msgstr ""
 "rendez-vous :\n"
 "- "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:869
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:818
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:904
 msgid "You"
 msgstr "Vous"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:781
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:730
 msgid "You are busy at the time of your planned meeting"
 msgstr "Vous n'êtes pas disponible à l'heure prévue de votre rendez-vous."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:783
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:732
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr "%s n'est pas disponible à l'heure prévue de votre rendez-vous."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:734
 #, c-format
 msgid "%d hour sooner"
 msgstr "%d heure plus tôt"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:736
 #, c-format
 msgid "%d hours sooner"
 msgstr "%d heures plus tôt"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:738
 #, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr "%d heures et %d minutes plus tôt"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:791
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
 #, c-format
 msgid "%d minutes sooner"
 msgstr "%d minutes plus tôt"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:796
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:745
 #, c-format
 msgid "%d hour later"
 msgstr "%d heure après"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:798
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:747
 #, c-format
 msgid "%d hours later"
 msgstr "%d heures après"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:800
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:749
 #, c-format
 msgid "%d hours and %d minutes later"
 msgstr "%d heures et %d minutes après"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:802
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:751
 #, c-format
 msgid "%d minutes later"
 msgstr "%d minutes après"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:808
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
 #, c-format
 msgid ""
 "\n"
@@ -14209,7 +14275,7 @@ msgstr ""
 "\n"
 "Tout le monde sera disponible soit %s, soit %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:810
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
 #, c-format
 msgid ""
 "\n"
@@ -14220,7 +14286,7 @@ msgstr ""
 "\n"
 " Tout le monde sera disponible %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:812
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
 msgid ""
 "\n"
 "\n"
@@ -14232,74 +14298,74 @@ msgstr ""
 "Il ne sera pas possible d'avoir ce rendez-vous avec tout le monde dans les 6 "
 "heures précédentes ou suivantes."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:817
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:766
 #, c-format
 msgid "would be available %s or %s"
 msgstr "sera disponible soit %s, soit %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:819
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:768
 #, c-format
 msgid "would be available %s"
 msgstr "sera disponible %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:821
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:882
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:952
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:770
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:831
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:901
 msgid "not available"
 msgstr "non disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:824
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
 #, c-format
 msgid ", but would be available %s or %s."
 msgstr ", mais serait disponible soit %s, soit %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:826
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:775
 #, c-format
 msgid ", but would be available %s."
 msgstr ", mais serait disponible %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:828
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:777
 msgid ", and isn't available in the previous or next 6 hours."
 msgstr ", et n'est pas disponible dans les 6 heures précédentes ou suivantes."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:885
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:834
 msgid "available"
 msgstr "disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:887
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1138
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:836
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 msgid "Free/busy retrieval failed"
 msgstr "Echec de la vérification de disponibilité"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:969
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:918
 msgid "Not everyone is available"
 msgstr "Tout le monde n'est pas disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:970
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:919
 msgid "Send anyway"
 msgstr "Envoyer tout de même"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:981
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
 "Pas tout le monde n'est disponible. Voir les bulles d'aide pour plus d'info.."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1120
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1069
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Récupération du planning pour %s.."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1147
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
 msgid "Available"
 msgstr "Disponible"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1167
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1175
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1109
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1124
 msgid "Everyone is available."
 msgstr "Tout le monde est disponible."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1176
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -14307,7 +14373,7 @@ msgstr ""
 "Tout le monde semble disponible, mais un ou des statuts de disponibilité "
 "n'ont pu être récupérés."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1346
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14315,61 +14381,61 @@ msgstr ""
 "Impossible d'envoyer l'invitation.\n"
 "Veuillez vérifier les destinataires."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1450
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
 msgid "Save & Send"
 msgstr "Enregistrer & envoyer"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1451
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
 msgid "Check availability"
 msgstr "Vérifier la disponibilité"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1574
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
 msgid "Starts at:"
 msgstr "Débute à :"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1580
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:767
 msgid "on:"
 msgstr "le :"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
 msgid "Ends at:"
 msgstr "Se termine à :"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1639
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
 msgid "New meeting"
 msgstr "Nouveau rendez-vous"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Modifier le rendez-vous"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1696
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "Time:"
 msgstr "Période :"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1853
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1856
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Évènement en instance : %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1868
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14386,39 +14452,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1885
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "M'avertir à nouveau dans %d minute"
 msgstr[1] "M'avertir à nouveau dans %d minutes"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2011
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1897
 msgid "Empty calendar"
 msgstr "Calendrier vide"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2012
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
 msgid "There is nothing to export."
 msgstr "Il n'y a rien à exporter."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2052
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
 msgid "Could not export the calendar."
 msgstr "Impossible d'exporter le calendrier."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2069
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
 msgid "Export calendar to ICS"
 msgstr "Exporter le calendrier au format ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2092
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Impossible d'exporter le calendrier vers '%s'.\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2208
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
 msgid "Could not export the freebusy info."
 msgstr "Impossible d'exporter les informations de disponibilité."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Impossible d'exporter les informations de disponibilité vers '%s'\n"
@@ -14516,107 +14582,107 @@ msgstr ""
 msgid "SSL/TLS options"
 msgstr "Options SSL/TLS"
 
-#: src/pop.c:152
+#: src/pop.c:153
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Le 'timestamp' APOP n'a pas été reçu\n"
 
-#: src/pop.c:159
+#: src/pop.c:160
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erreur de syntaxe du 'timestamp' dans la bannière\n"
 
-#: src/pop.c:166
+#: src/pop.c:167
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Erreur de syntaxe du 'timestamp' dans la bannière (non ASCII)\n"
 
-#: src/pop.c:190 src/pop.c:217
+#: src/pop.c:191 src/pop.c:218
 msgid "POP protocol error\n"
 msgstr "Erreur de protocole POP\n"
 
-#: src/pop.c:263
+#: src/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "Réponse UIDL invalide : %s\n"
 
-#: src/pop.c:841
+#: src/pop.c:842
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP : Suppression du message expiré %d [%s]\n"
 
-#: src/pop.c:857
+#: src/pop.c:858
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP : Message %d ignoré [%s] (%d octets)\n"
 
-#: src/pop.c:889
+#: src/pop.c:890
 msgid "mailbox is locked\n"
 msgstr "la boîte aux lettres est verrouillée\n"
 
-#: src/pop.c:892
+#: src/pop.c:893
 msgid "Session timeout\n"
 msgstr "Session expirée\n"
 
-#: src/pop.c:911
+#: src/pop.c:912
 msgid "command not supported\n"
 msgstr "Commande non supportée\n"
 
-#: src/pop.c:916
+#: src/pop.c:917
 msgid "error occurred on POP session\n"
 msgstr "Erreur pendant la session POP\n"
 
-#: src/pop.c:1111
+#: src/pop.c:1112
 msgid "TOP command unsupported\n"
 msgstr "Commande TOP non supportée\n"
 
-#: src/prefs_account.c:366 src/prefs_account.c:1583 src/prefs_account.c:2650
+#: src/prefs_account.c:364 src/prefs_account.c:1579 src/prefs_account.c:2655
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:367 src/prefs_account.c:1696 src/prefs_account.c:2665
-#: src/wizard.c:1500
+#: src/prefs_account.c:365 src/prefs_account.c:1692 src/prefs_account.c:2670
+#: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP4"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:366
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:369 src/wizard.c:1501
+#: src/prefs_account.c:367 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Fichier mbox local"
 
-#: src/prefs_account.c:370
+#: src/prefs_account.c:368
 msgid "None (SMTP only)"
 msgstr "Aucun (SMTP seulement)"
 
-#: src/prefs_account.c:1132
+#: src/prefs_account.c:1128
 msgid "Name of account"
 msgstr "Nom du compte"
 
-#: src/prefs_account.c:1141
+#: src/prefs_account.c:1137
 msgid "Set as default"
 msgstr "Définir comme compte par défaut"
 
-#: src/prefs_account.c:1149
+#: src/prefs_account.c:1145
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: src/prefs_account.c:1158
+#: src/prefs_account.c:1154
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/prefs_account.c:1164
+#: src/prefs_account.c:1160
 msgid "Mail address"
 msgstr "Adresse email"
 
-#: src/prefs_account.c:1227 src/wizard.c:1524
+#: src/prefs_account.c:1223 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Auto-configurer"
 
-#: src/prefs_account.c:1229 src/wizard.c:1525
+#: src/prefs_account.c:1225 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/prefs_account.c:1246
+#: src/prefs_account.c:1242
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14624,77 +14690,77 @@ msgstr ""
 "Attention : la version de Claws Mail actuellement\n"
 "utilisée a été compilée sans les supports IMAP et NNTP."
 
-#: src/prefs_account.c:1277
+#: src/prefs_account.c:1273
 msgid "This server requires authentication"
 msgstr "Ce serveur nécessite une authentification"
 
-#: src/prefs_account.c:1284
+#: src/prefs_account.c:1280
 msgid "Authenticate on connect"
 msgstr "Authentification à la connexion"
 
-#: src/prefs_account.c:1346
+#: src/prefs_account.c:1342
 msgid "News server"
 msgstr "Serveur de groupes de discussion"
 
-#: src/prefs_account.c:1352
+#: src/prefs_account.c:1348
 msgid "Server for receiving"
 msgstr "Serveur de réception"
 
-#: src/prefs_account.c:1358
+#: src/prefs_account.c:1354
 msgid "Local mailbox"
 msgstr "Fichier mbox local"
 
-#: src/prefs_account.c:1365
+#: src/prefs_account.c:1361
 msgid "SMTP server (send)"
 msgstr "Serveur d'envoi (SMTP)"
 
-#: src/prefs_account.c:1373
+#: src/prefs_account.c:1369
 msgid "Use mail command rather than SMTP server"
 msgstr "Utiliser une commande externe plutôt que le serveur SMTP"
 
-#: src/prefs_account.c:1382
+#: src/prefs_account.c:1378
 msgid "command to send mails"
 msgstr "Commande externe :"
 
-#: src/prefs_account.c:1457
+#: src/prefs_account.c:1453
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1553
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1563 src/prefs_account.c:1652
+#: src/prefs_account.c:1559 src/prefs_account.c:1648
 msgid "Default Inbox"
 msgstr "Dossier de réception par défaut"
 
-#: src/prefs_account.c:1570 src/prefs_account.c:1577 src/prefs_account.c:1659
-#: src/prefs_account.c:1666
+#: src/prefs_account.c:1566 src/prefs_account.c:1573 src/prefs_account.c:1655
+#: src/prefs_account.c:1662
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Les messages non filtrés seront placés dans ce dossier"
 
-#: src/prefs_account.c:1585
+#: src/prefs_account.c:1581
 msgid "Use secure authentication (APOP)"
 msgstr "Authentification sécurisée (APOP)"
 
-#: src/prefs_account.c:1588
+#: src/prefs_account.c:1584
 msgid "Remove messages on server when received"
 msgstr "Suppression des messages du serveur après réception"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1595
 msgid "Remove after"
 msgstr "Suppression après"
 
-#: src/prefs_account.c:1606 src/prefs_account.c:1616
+#: src/prefs_account.c:1602 src/prefs_account.c:1612
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 jour et 0 heure : suppression immédiate"
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1625
 msgid "Receive size limit"
 msgstr "Taille maximale pour la réception"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1628
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14704,105 +14770,97 @@ msgstr ""
 "de les marquer pour un téléchargement complet ou une suppression (effectif "
 "qu'à la relève suivante)."
 
-#: src/prefs_account.c:1672 src/prefs_account.c:2680
+#: src/prefs_account.c:1668 src/prefs_account.c:2685
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1675
 msgid "Maximum number of articles to download"
 msgstr "Nombre maximum d'articles à récupérer"
 
-#: src/prefs_account.c:1689
+#: src/prefs_account.c:1685
 msgid "unlimited if 0 is specified"
 msgstr "pas de limite si 0 est spécifié"
 
-#: src/prefs_account.c:1714
+#: src/prefs_account.c:1710
 msgid "Plain text"
 msgstr "Texte simple"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1723
 msgid "IMAP server directory"
 msgstr "Répertoire sur le serveur IMAP4"
 
-#: src/prefs_account.c:1731
+#: src/prefs_account.c:1727
 msgid "(usually empty)"
 msgstr "(généralement nul)"
 
-#: src/prefs_account.c:1745
+#: src/prefs_account.c:1741
 msgid "Show subscribed folders only"
 msgstr "Afficher seulement les dossiers inscrits"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1748
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Mode économique en bande passante (évite récupération des tags distants)"
 
-#: src/prefs_account.c:1754
+#: src/prefs_account.c:1750
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Ce mode utilise moins de bande passante mais peut apporter un ralentissement "
 "avec certains serveurs."
 
-#: src/prefs_account.c:1761 src/prefs_receive.c:162
+#: src/prefs_account.c:1757 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Relève automatique du courriel"
 
-#: src/prefs_account.c:1764
+#: src/prefs_account.c:1760
 msgid "Use global settings"
 msgstr "Utiliser les paramètres globaux"
 
-#: src/prefs_account.c:1770 src/prefs_receive.c:169
+#: src/prefs_account.c:1766 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Relever automatiquement toutes les"
 
-#: src/prefs_account.c:1783
-msgid "mins"
-msgstr "mins"
-
-#: src/prefs_account.c:1790
-msgid "secs"
-msgstr "secs"
-
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1805
 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages à la réception"
 
-#: src/prefs_account.c:1816
+#: src/prefs_account.c:1821
 msgid "Allow filtering using plugins on receiving"
 msgstr "Autoriser les modules à filtrer les messages à la réception"
 
-#: src/prefs_account.c:1820
+#: src/prefs_account.c:1825
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "Le bouton « Relever » de la barre d'outil principale relève le courrier pour "
 "ce compte"
 
-#: src/prefs_account.c:1909 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:622 src/prefs_matcher.c:1965 src/prefs_matcher.c:1987
+#: src/prefs_account.c:1914 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:633 src/prefs_matcher.c:2010 src/prefs_matcher.c:2038
 msgid "Header"
 msgstr "En-tête"
 
-#: src/prefs_account.c:1911
+#: src/prefs_account.c:1916
 msgid "Generate Message-ID"
 msgstr "Génération de l'en-tête « Message-ID »"
 
-#: src/prefs_account.c:1914
+#: src/prefs_account.c:1919
 msgid "Send account mail address in Message-ID"
 msgstr "Mettre l'adresse email dans le « Message-ID »"
 
-#: src/prefs_account.c:1917
+#: src/prefs_account.c:1922
 msgid "Add user agent header"
 msgstr "Ajouter l'en-tête « User-Agent »"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:1929
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account.c:1939
+#: src/prefs_account.c:1944
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2037
+#: src/prefs_account.c:2042
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14810,173 +14868,173 @@ msgstr ""
 "Laisser ces champs vides pour utiliser le nom d'utilisateur·rice et le mot "
 "de passe spécifiés pour la réception."
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2053
 msgid "Authenticate with POP before sending"
 msgstr "S'authentifier sur le POP avant l'envoi"
 
-#: src/prefs_account.c:2063
+#: src/prefs_account.c:2068
 msgid "POP authentication timeout"
 msgstr "Délai d'attente maximal pour l'authentification POP"
 
-#: src/prefs_account.c:2151 src/prefs_account.c:2197
+#: src/prefs_account.c:2156 src/prefs_account.c:2202
 msgid "Signature"
 msgstr "Signature"
 
-#: src/prefs_account.c:2154
+#: src/prefs_account.c:2159
 msgid "Automatically insert signature"
 msgstr "Insérer automatiquement la signature"
 
-#: src/prefs_account.c:2159
+#: src/prefs_account.c:2164
 msgid "Signature separator"
 msgstr "Séparateur de signature"
 
-#: src/prefs_account.c:2184
+#: src/prefs_account.c:2189
 msgid "Command output"
 msgstr "Résultat d'une commande"
 
-#: src/prefs_account.c:2217
+#: src/prefs_account.c:2222
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
-#: src/prefs_account.c:2269
+#: src/prefs_account.c:2274
 msgid "Spell check dictionaries"
 msgstr "Dictionnaires de correction orthographique"
 
-#: src/prefs_account.c:2279 src/prefs_folder_item.c:1103
+#: src/prefs_account.c:2284 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Dictionnaire par défaut"
 
-#: src/prefs_account.c:2292 src/prefs_folder_item.c:1137
+#: src/prefs_account.c:2297 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Dictionnaire alternatif par défaut"
 
-#: src/prefs_account.c:2378 src/prefs_account.c:3772
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1448
-#: src/prefs_folder_item.c:1841 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_account.c:2383 src/prefs_account.c:3796
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
+#: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Composition"
 
-#: src/prefs_account.c:2393 src/prefs_folder_item.c:1476 src/prefs_quote.c:134
+#: src/prefs_account.c:2398 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/prefs_account.c:2408 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1504 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_account.c:2413 src/prefs_filtering_action.c:185
+#: src/prefs_folder_item.c:1595 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/prefs_account.c:2455
+#: src/prefs_account.c:2460
 msgid "Default privacy system"
 msgstr "Système de confidentialité par défaut"
 
-#: src/prefs_account.c:2484
+#: src/prefs_account.c:2489 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Toujours signer les messages"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2491 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Toujours chiffrer les messages"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2493
 msgid "Always sign messages when replying to a signed message"
 msgstr "Toujours signer la réponse à un message signé"
 
-#: src/prefs_account.c:2491
+#: src/prefs_account.c:2496
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Toujours chiffrer la réponse à un message chiffré"
 
-#: src/prefs_account.c:2494
+#: src/prefs_account.c:2499
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Chiffrer les messages envoyés avec votre propre clé en plus de celle du/de "
 "la destinataire"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2501
 msgid "Save sent encrypted messages as clear text"
 msgstr "Enregistrer les messages chiffrés envoyés en texte clair"
 
-#: src/prefs_account.c:2654 src/prefs_account.c:2669 src/prefs_account.c:2683
+#: src/prefs_account.c:2659 src/prefs_account.c:2674 src/prefs_account.c:2688
 msgid "Don't use SSL/TLS"
 msgstr "Ne pas utiliser SSL/TLS"
 
-#: src/prefs_account.c:2657 src/prefs_account.c:2672 src/prefs_account.c:2692
-#: src/prefs_account.c:2703
+#: src/prefs_account.c:2662 src/prefs_account.c:2677 src/prefs_account.c:2697
+#: src/prefs_account.c:2708
 msgid "Use SSL/TLS"
 msgstr "Utiliser SSL/TLS"
 
-#: src/prefs_account.c:2660 src/prefs_account.c:2675 src/prefs_account.c:2706
+#: src/prefs_account.c:2665 src/prefs_account.c:2680 src/prefs_account.c:2711
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session chiffrée"
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:2701
 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2705
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Ne pas utiliser SSL/TLS (mais utiliser STARTTLS si nécessaire)"
 
-#: src/prefs_account.c:2711
+#: src/prefs_account.c:2716
 msgid "Client certificates"
 msgstr "Certificats client"
 
-#: src/prefs_account.c:2719
+#: src/prefs_account.c:2724
 msgid "Certificate for receiving"
 msgstr "Certificat pour la réception"
 
-#: src/prefs_account.c:2724 src/prefs_account.c:2726 src/prefs_account.c:2752
-#: src/prefs_account.c:2754
+#: src/prefs_account.c:2729 src/prefs_account.c:2731 src/prefs_account.c:2757
+#: src/prefs_account.c:2759
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Fichier certificat client tel qu'un fichier PKCS12 ou PEM"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2752
 msgid "Certificate for sending"
 msgstr "Certificat pour l'envoi"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:2792
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Accepter automatiquement les certificats SSL/TLS valides"
 
-#: src/prefs_account.c:2790
+#: src/prefs_account.c:2795
 msgid "Use non-blocking SSL/TLS"
 msgstr "Utiliser la communication SSL/TLS non bloquante"
 
-#: src/prefs_account.c:2802
+#: src/prefs_account.c:2807
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "À désactiver en cas de problème de connexion SSL/TLS"
 
-#: src/prefs_account.c:2894 src/prefs_proxy.c:73
+#: src/prefs_account.c:2899 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Utiliser un serveur mandataire"
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2908
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Remise à zéro des réglages"
 
-#: src/prefs_account.c:2905
+#: src/prefs_account.c:2910
 msgid "Use global proxy server settings"
 msgstr "Utiliser les paramètres de serveur mandataire globaux"
 
-#: src/prefs_account.c:2942 src/prefs_proxy.c:115 src/wizard.c:1119
+#: src/prefs_account.c:2947 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Utiliser l'authentification (SMTP AUTH)"
 
-#: src/prefs_account.c:2947 src/prefs_proxy.c:123
+#: src/prefs_account.c:2952 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Utilisateur·rice"
 
-#: src/prefs_account.c:2981
+#: src/prefs_account.c:2986
 msgid "Use proxy server for sending"
 msgstr "Utiliser le serveur mandataire pour l'envoi"
 
-#: src/prefs_account.c:2983
+#: src/prefs_account.c:2988
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14984,27 +15042,27 @@ msgstr ""
 "Si l'option est désactivée, les messages seront envoyés directement au "
 "serveur d'envoi, sans utiliser les paramètres de serveur mandataire."
 
-#: src/prefs_account.c:3096
+#: src/prefs_account.c:3099
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:3103
+#: src/prefs_account.c:3106
 msgid "POP port"
 msgstr "Port POP"
 
-#: src/prefs_account.c:3110
+#: src/prefs_account.c:3113
 msgid "IMAP port"
 msgstr "Port IMAP"
 
-#: src/prefs_account.c:3117
+#: src/prefs_account.c:3120
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3126
 msgid "Domain name"
 msgstr "Nom de domaine"
 
-#: src/prefs_account.c:3126
+#: src/prefs_account.c:3129
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15012,11 +15070,11 @@ msgstr ""
 "Le nom de domaine sera utilisé dans la partie droite des identifiants de "
 "messages générés (« Message-ID ») et lors de la connexion aux serveurs SMTP."
 
-#: src/prefs_account.c:3140
+#: src/prefs_account.c:3143
 msgid "Use command to communicate with server"
 msgstr "Utiliser une commande externe pour communiquer avec le serveur"
 
-#: src/prefs_account.c:3149
+#: src/prefs_account.c:3152
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marquer les articles croisés comme lus et les colorier en"
 
@@ -15036,201 +15094,221 @@ msgstr "Sauvegarder les brouillons dans "
 msgid "Put deleted messages in"
 msgstr "Sauvegarder les messages supprimés dans "
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3268
 msgid "Account name is not entered."
 msgstr "Le nom du compte est non spécifié."
 
-#: src/prefs_account.c:3274
+#: src/prefs_account.c:3272
 msgid "Mail address is not entered."
 msgstr "L'adresse email est non spécifiée."
 
-#: src/prefs_account.c:3282
+#: src/prefs_account.c:3280
 msgid "SMTP server is not entered."
 msgstr "Le serveur d'envoi (SMTP) est non spécifié."
 
-#: src/prefs_account.c:3287
+#: src/prefs_account.c:3285
 msgid "User ID is not entered."
 msgstr "Le nom d'utilisateur·rice est non spécifié."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3290
 msgid "POP server is not entered."
 msgstr "Le serveur POP est non spécifié."
 
-#: src/prefs_account.c:3312
+#: src/prefs_account.c:3310
 msgid "The default Inbox folder doesn't exist."
 msgstr "Le dossier de réception par défaut n'existe pas."
 
-#: src/prefs_account.c:3318
+#: src/prefs_account.c:3316
 msgid "IMAP server is not entered."
 msgstr "Le serveur IMAP est non spécifié."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3321
 msgid "NNTP server is not entered."
 msgstr "Le serveur NNTP est non spécifié."
 
-#: src/prefs_account.c:3329
+#: src/prefs_account.c:3327
 msgid "local mailbox filename is not entered."
 msgstr "Le fichier local mbox est non spécifié."
 
-#: src/prefs_account.c:3335
+#: src/prefs_account.c:3333
 msgid "mail command is not entered."
 msgstr "La commande externe d'envoi est non spécifiée."
 
-#: src/prefs_account.c:3345
+#: src/prefs_account.c:3343
 msgid "User ID cannot contain a newline character."
 msgstr ""
-"L'identifiant d'utilisateur·rice ne doit pas contenir de caractère de retour à "
-"la ligne."
+"L'identifiant d'utilisateur·rice ne doit pas contenir de caractère de retour "
+"à la ligne."
 
-#: src/prefs_account.c:3350
+#: src/prefs_account.c:3348
 msgid "Password cannot contain a newline character."
 msgstr ""
 "Le mot de passe ne doit pas contenir de caractère de retour à la ligne."
 
-#: src/prefs_account.c:3378
+#: src/prefs_account.c:3376
 msgid "SMTP user ID cannot contain a newline character."
 msgstr ""
 "L'identifiant d'utilisateur·rice SMTP ne doit pas contenir de caractère de "
 "retour à la ligne."
 
-#: src/prefs_account.c:3383
+#: src/prefs_account.c:3381
 msgid "SMTP password cannot contain a newline character."
 msgstr ""
 "Le mot de passe SMTP ne doit pas contenir de caractère de retour à la ligne."
 
-#: src/prefs_account.c:3736
+#: src/prefs_account.c:3457
+msgid "domain is not specified."
+msgstr "domaine non spécifié."
+
+#: src/prefs_account.c:3462
+msgid "sent folder is not selected."
+msgstr "le dossier 'Envoyés' n'est pas défini."
+
+#: src/prefs_account.c:3467
+msgid "queue folder is not selected."
+msgstr "le dossier 'File d'attente' n'est pas défini."
+
+#: src/prefs_account.c:3472
+msgid "draft folder is not selected."
+msgstr "le dossier 'Brouillons' n'est pas défini."
+
+#: src/prefs_account.c:3477
+msgid "trash folder is not selected."
+msgstr "le dossier 'Corbeille' n'est pas défini."
+
+#: src/prefs_account.c:3760
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account.c:3790 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
+#: src/prefs_account.c:3814 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modèles"
 
-#: src/prefs_account.c:3808
+#: src/prefs_account.c:3832
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: src/prefs_account.c:3938
+#: src/prefs_account.c:3962
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/prefs_account.c:4287
+#: src/prefs_account.c:4311
 msgid "Preferences for new account"
 msgstr "Configuration du nouveau compte"
 
-#: src/prefs_account.c:4289
+#: src/prefs_account.c:4313
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Configuration du compte"
 
-#: src/prefs_account.c:4410 src/wizard.c:1389
+#: src/prefs_account.c:4432 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Échec (adresse incorrecte)"
 
-#: src/prefs_account.c:4495
+#: src/prefs_account.c:4517
 msgid "Select signature file"
 msgstr "Sélection du fichier signature"
 
-#: src/prefs_account.c:4513 src/prefs_account.c:4530 src/wizard.c:1066
+#: src/prefs_account.c:4535 src/prefs_account.c:4552 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Choisir le fichier de certificat"
 
-#: src/prefs_account.c:4626
+#: src/prefs_account.c:4648
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: src/prefs_account.c:4797
+#: src/prefs_account.c:4819
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (module non chargé)"
 
-#: src/prefs_actions.c:223
+#: src/prefs_actions.c:224
 msgid "Actions configuration"
 msgstr "Configuration des actions"
 
-#: src/prefs_actions.c:250
+#: src/prefs_actions.c:251
 msgid "Menu name"
 msgstr "Nom du menu"
 
-#: src/prefs_actions.c:283
+#: src/prefs_actions.c:284
 msgid "Shell command"
 msgstr "Commande externe"
 
-#: src/prefs_actions.c:293
+#: src/prefs_actions.c:294
 msgid "Filter action"
 msgstr "Filtre d'action"
 
-#: src/prefs_actions.c:299
+#: src/prefs_actions.c:300
 msgid "Edit filter action"
 msgstr "Éditer le filtre d'action"
 
-#: src/prefs_actions.c:327
+#: src/prefs_actions.c:328
 msgid "Append the new action above to the list"
 msgstr "Ajoute la nouvelle action ci-dessus à la liste"
 
-#: src/prefs_actions.c:335
+#: src/prefs_actions.c:336
 msgid "Replace the selected action in list with the action above"
 msgstr "Remplace l'action sélectionnée dans la liste par l'action ci-dessus"
 
-#: src/prefs_actions.c:337 src/prefs_filtering_action.c:600
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:775 src/prefs_template.c:319
+#: src/prefs_actions.c:338 src/prefs_filtering_action.c:588
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:800 src/prefs_template.c:319
 #: src/prefs_toolbar.c:1024
 msgid "D_elete"
 msgstr "Supprim_er"
 
-#: src/prefs_actions.c:345
+#: src/prefs_actions.c:346
 msgid "Delete the selected action from the list"
 msgstr "Supprime l'action sélectionnée dans la liste"
 
-#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:337
+#: src/prefs_actions.c:356 src/prefs_filtering.c:503 src/prefs_template.c:337
 msgid "Clear all the input fields in the dialog"
 msgstr "Efface tous les champs de saisie de la boîte de dialogue"
 
-#: src/prefs_actions.c:363
+#: src/prefs_actions.c:364
 msgid "Show information on configuring actions"
 msgstr "Affiche une aide pour la configuration d'actions"
 
-#: src/prefs_actions.c:394
+#: src/prefs_actions.c:395
 msgid "Move the selected action up"
 msgstr "Déplace l'action sélectionnée d'une ligne vers le haut"
 
-#: src/prefs_actions.c:402
+#: src/prefs_actions.c:403
 msgid "Move selected action down"
 msgstr "Déplace l'action sélectionnée d'une ligne vers le bas"
 
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:691
+#: src/prefs_actions.c:536 src/prefs_filtering_action.c:677
 #: src/prefs_filtering.c:838 src/prefs_filtering.c:840
-#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:892
+#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:918
 #: src/prefs_template.c:471
 msgid "(New)"
 msgstr "(Nouveau)"
 
-#: src/prefs_actions.c:600
+#: src/prefs_actions.c:601
 msgid "Menu name is not set."
 msgstr "Le nom du menu n'est pas défini."
 
-#: src/prefs_actions.c:605
+#: src/prefs_actions.c:606
 msgid "A leading '/' is not allowed in the menu name."
 msgstr ""
 "Il n'est pas autorisé à faire débuter un nom de menu par le caractère « / »."
 
-#: src/prefs_actions.c:610
+#: src/prefs_actions.c:611
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Les double-points « : » ne sont pas acceptés dans un nom de menu."
 
-#: src/prefs_actions.c:629
+#: src/prefs_actions.c:630
 msgid "Menu name is too long."
 msgstr "Le nom du menu est trop long."
 
-#: src/prefs_actions.c:638
+#: src/prefs_actions.c:639
 msgid "Command-line not set."
 msgstr "La commande n'est pas définie."
 
-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:644
 msgid "Menu name and command are too long."
 msgstr "Le nom du menu et la commande sont trop longs."
 
-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:650
 #, c-format
 msgid ""
 "The command\n"
@@ -15240,152 +15318,152 @@ msgstr ""
 "Erreur de syntaxe dans la commande :\n"
 "%s"
 
-#: src/prefs_actions.c:707
+#: src/prefs_actions.c:708
 msgid "Delete action"
 msgstr "Supprimer l'action"
 
-#: src/prefs_actions.c:708
+#: src/prefs_actions.c:709
 msgid "Do you really want to delete this action?"
 msgstr "Voulez-vous vraiment supprimer l'action sélectionnée ?"
 
-#: src/prefs_actions.c:728
+#: src/prefs_actions.c:729
 msgid "Delete all actions"
 msgstr "Suppression des actions"
 
-#: src/prefs_actions.c:729
+#: src/prefs_actions.c:730
 msgid "Do you really want to delete all the actions?"
 msgstr "Voulez-vous vraiment supprimer toutes les actions ?"
 
-#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1503
-#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2112 src/prefs_template.c:571
+#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1503
+#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2161 src/prefs_template.c:571
 #: src/prefs_template.c:596
 msgid "Entry not saved"
 msgstr "Règle non ajoutée"
 
-#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1504
+#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
 #: src/prefs_filtering.c:1526 src/prefs_template.c:572 src/prefs_template.c:597
 msgid "The entry was not saved. Close anyway?"
 msgstr "La règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:925
+#: src/prefs_actions.c:895 src/prefs_actions.c:900 src/prefs_actions.c:926
 #: src/prefs_filtering.c:1483 src/prefs_filtering.c:1505
-#: src/prefs_filtering.c:1527 src/prefs_matcher.c:2115 src/prefs_template.c:573
+#: src/prefs_filtering.c:1527 src/prefs_matcher.c:2164 src/prefs_template.c:573
 #: src/prefs_template.c:598 src/prefs_template.c:603
 msgid "_Continue editing"
 msgstr "_Poursuivre l'édition"
 
-#: src/prefs_actions.c:897
+#: src/prefs_actions.c:898
 msgid "Actions list not saved"
 msgstr "Liste des actions non enregistrée"
 
-#: src/prefs_actions.c:898
+#: src/prefs_actions.c:899
 msgid "The actions list has been modified. Close anyway?"
 msgstr ""
 "La liste d'actions a été modifiée mais non enregistrée. Voulez-vous quand "
 "même fermer ?"
 
-#: src/prefs_actions.c:968
+#: src/prefs_actions.c:969
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Nom du menu :</span>"
 
-#: src/prefs_actions.c:969
+#: src/prefs_actions.c:970
 msgid "Use / in menu name to make submenus."
 msgstr "Inclure / dans le nom du menu pour faire des sous-menus."
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:972
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Commande :</span>"
 
-#: src/prefs_actions.c:972
+#: src/prefs_actions.c:973
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Commencer par :</span>"
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:974
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "pour envoyer le texte du message ou une sélection à l'entrée standard de la "
 "commande"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:975
 msgid "to send user provided text to command's standard input"
 msgstr ""
 "pour envoyer un texte fourni par l'utilisateur·rice à l'entrée standard de "
 "la commande"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:976
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "pour envoyer un texte caché fourni par l'utilisateur·rice à l'entrée "
 "standard de la commande"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Terminer par :</span>"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:978
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "pour remplacer le texte du message ou une sélection par la sortie standard "
 "de la commande"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:979
 msgid "to insert command's standard output without replacing old text"
 msgstr "pour ajouter la sortie standard de la commande au texte du message"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:980
 msgid "to run command asynchronously"
 msgstr "pour lancer la commande en arrière plan"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:981
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Utiliser :</span>"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:982
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr ""
 "pour le fichier correspondant au message sélectionné dans le format "
 "RFC822/2822"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:983
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "pour la liste des fichiers correspondants aux messages sélectionnés dans le "
 "format RFC822/2822"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:984
 msgid "for the file of the selected decoded message MIME part"
 msgstr ""
 "pour désigner le fichier temporaire contenant la partie MIME sélectionnée, "
 "décodée"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:985
 msgid "for a user provided argument"
 msgstr "pour un texte fourni par l'utilisateur·rice"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:986
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "pour un texte caché fourni par l'utilisateur·rice (ex : mot de passe)"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:987
 msgid "for the text selection"
 msgstr "pour la partie sélectionnée du texte"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:988
 msgid "apply filtering actions between {} to selected messages"
 msgstr ""
 "appliquer les actions de filtrages entre {} à la liste des messages "
 "sélectionnés"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:989
 msgid "for a literal %"
 msgstr "caractère « % »"
 
-#: src/prefs_actions.c:998 src/prefs_themes.c:1090
+#: src/prefs_actions.c:999 src/prefs_themes.c:1090
 msgid "Actions"
 msgstr "Actions"
 
-#: src/prefs_actions.c:999
+#: src/prefs_actions.c:1000
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -15395,29 +15473,29 @@ msgstr ""
 "possible de manipuler physiquement ou graphiquement (vue du message, fenêtre "
 "de composition) les messages ou une de leurs parties."
 
-#: src/prefs_actions.c:1086 src/prefs_filtering.c:1701
+#: src/prefs_actions.c:1087 src/prefs_filtering.c:1701
 #: src/prefs_template.c:1113
 msgid "D_uplicate"
 msgstr "_Dupliquer"
 
-#: src/prefs_actions.c:1206
+#: src/prefs_actions.c:1207
 msgid "Current actions"
 msgstr "Actions enregistrées"
 
-#: src/prefs_actions.c:1305 src/prefs_filtering.c:1078
+#: src/prefs_actions.c:1306 src/prefs_filtering.c:1078
 #: src/prefs_filtering.c:1136
 msgid "Action string is not valid."
 msgstr "La syntaxe de l'action est incorrecte."
 
-#: src/prefs_common.c:237 src/prefs_quote.c:69
+#: src/prefs_common.c:239 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Bonjour,\\n"
 
-#: src/prefs_common.c:315
+#: src/prefs_common.c:317
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Le %d,\\n%f a écrit :\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:321 src/prefs_quote.c:85
+#: src/prefs_common.c:323 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -15426,7 +15504,7 @@ msgstr ""
 "t{À : %t\\n}?c{Cc : %c\\n}?n{Groupe de discussion : %n\\n}?s{Sujet : %s"
 "\\n}\\n\\n%M"
 
-#: src/prefs_common.c:449
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%a %x %H:%M"
 
@@ -15496,7 +15574,7 @@ msgstr "Le bouton « Répondre » prend en compte les listes"
 msgid "Forwarding"
 msgstr "Transfert"
 
-#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:186
 msgid "Forward as attachment"
 msgstr "Transférer en pièce jointe"
 
@@ -15526,99 +15604,99 @@ msgstr "Adjoindre"
 msgid "Writing"
 msgstr "Composer"
 
-#: src/prefs_customheader.c:183
+#: src/prefs_customheader.c:184
 msgid "Custom header configuration"
 msgstr "Configuration des en-têtes supplémentaires"
 
-#: src/prefs_customheader.c:502 src/prefs_display_header.c:589
-#: src/prefs_matcher.c:1592 src/prefs_matcher.c:1607
+#: src/prefs_customheader.c:503 src/prefs_display_header.c:590
+#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1648
 msgid "Header name is not set."
 msgstr "Le nom de l'en-tête n'est pas défini."
 
-#: src/prefs_customheader.c:512
+#: src/prefs_customheader.c:513
 msgid "This Header name is not allowed as a custom header."
 msgstr "Ce nom d'en-tête n'est pas autorisé en tant qu'en-tête supplémentaire."
 
-#: src/prefs_customheader.c:559
+#: src/prefs_customheader.c:560
 msgid "Choose a PNG file"
 msgstr "Choisir un fichier PNG"
 
-#: src/prefs_customheader.c:561
+#: src/prefs_customheader.c:562
 msgid "Choose an XBM file"
 msgstr "Choisir un fichier XBM"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:564
 msgid "Choose a text file"
 msgstr "Choisir un fichier texte"
 
-#: src/prefs_customheader.c:576
+#: src/prefs_customheader.c:577
 msgid "This file isn't an image."
 msgstr "Ce fichier n'est pas une image."
 
-#: src/prefs_customheader.c:581
+#: src/prefs_customheader.c:582
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "L'image choisie n'a pas une taille correcte (48x48)."
 
-#: src/prefs_customheader.c:587
+#: src/prefs_customheader.c:588
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "L'image est trop volumineuse; elle doit faire 725 octets maximum."
 
-#: src/prefs_customheader.c:592
+#: src/prefs_customheader.c:593
 msgid "The image isn't in the correct format (PNG)."
 msgstr "L'image n'est pas d'un format correct (PNG)."
 
-#: src/prefs_customheader.c:601
+#: src/prefs_customheader.c:602
 msgid "The image isn't in the correct format (XBM)."
 msgstr "L'image n'est pas d'un format correct (XBM)."
 
-#: src/prefs_customheader.c:610
+#: src/prefs_customheader.c:611
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 "Impossible d'atteindre l'utilitaire `compface`. Assurez-vous qu'il se trouve "
 "bien dans votre $PATH."
 
-#: src/prefs_customheader.c:616
+#: src/prefs_customheader.c:617
 #, c-format
 msgid "Compface error: %s"
 msgstr "Erreur compface : %s"
 
-#: src/prefs_customheader.c:669
+#: src/prefs_customheader.c:670
 msgid "This file contains newlines."
 msgstr "Ce fichier contient des retours à la ligne."
 
-#: src/prefs_customheader.c:699
+#: src/prefs_customheader.c:700
 msgid "Delete header"
 msgstr "Supprimer l'en-tête"
 
-#: src/prefs_customheader.c:700
+#: src/prefs_customheader.c:701
 msgid "Do you really want to delete this header?"
 msgstr "Voulez-vous vraiment supprimer l'en-tête sélectionné ?"
 
-#: src/prefs_customheader.c:873
+#: src/prefs_customheader.c:874
 msgid "Current custom headers"
 msgstr "En-têtes supplémentaires"
 
-#: src/prefs_display_header.c:252
+#: src/prefs_display_header.c:253
 msgid "Displayed header configuration"
 msgstr "Configuration de l'affichage des en-têtes"
 
-#: src/prefs_display_header.c:276
+#: src/prefs_display_header.c:277
 msgid "Header name"
 msgstr "En-tête"
 
-#: src/prefs_display_header.c:311
+#: src/prefs_display_header.c:312
 msgid "Displayed Headers"
 msgstr "En-têtes affichés"
 
-#: src/prefs_display_header.c:373
+#: src/prefs_display_header.c:374
 msgid "Hidden headers"
 msgstr "En-têtes cachés"
 
-#: src/prefs_display_header.c:399
+#: src/prefs_display_header.c:400
 msgid "Show all unspecified headers"
 msgstr "Afficher tous les en-têtes non spécifiés"
 
-#: src/prefs_display_header.c:599
+#: src/prefs_display_header.c:600
 msgid "This header is already in the list."
 msgstr "Cet en-tête est déjà dans la liste."
 
@@ -15665,177 +15743,177 @@ msgstr "Vue du message"
 msgid "External Programs"
 msgstr "Programmes externes"
 
-#: src/prefs_filtering_action.c:175
+#: src/prefs_filtering_action.c:171
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/prefs_filtering_action.c:176
+#: src/prefs_filtering_action.c:172
 msgid "Copy"
 msgstr "Copier"
 
-#: src/prefs_filtering_action.c:178
+#: src/prefs_filtering_action.c:174
 msgid "Hide"
 msgstr "Cacher"
 
+#: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
+#: src/prefs_filtering_action.c:177 src/prefs_filtering_action.c:178
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
-#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
 msgid "Message flags"
 msgstr "États de message"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:449
-#: src/prefs_summary_column.c:77 src/summaryview.c:2843 src/toolbar.c:505
+#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:620
+#: src/prefs_summary_column.c:77 src/summaryview.c:2887 src/toolbar.c:505
 msgid "Mark"
 msgstr "Marquer"
 
-#: src/prefs_filtering_action.c:183
+#: src/prefs_filtering_action.c:179
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:180
 msgid "Mark as unread"
 msgstr "Marquer comme non lu"
 
-#: src/prefs_filtering_action.c:185
+#: src/prefs_filtering_action.c:181
 msgid "Mark as spam"
 msgstr "Marquer comme pourriel"
 
-#: src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:182
 msgid "Mark as ham"
 msgstr "Marquer comme courrier légitime"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1418
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1394
 #: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
 msgid "Execute"
 msgstr "Exécuter"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:447
+#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:618
 msgid "Color label"
 msgstr "Couleur"
 
-#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:187
 msgid "Resend"
 msgstr "Renvoi"
 
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:187
 msgid "Redirect"
 msgstr "Rediriger"
 
-#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1422 src/prefs_matcher.c:628
-#: src/prefs_summaries.c:452 src/prefs_summary_column.c:86
-#: src/summaryview.c:451
+#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:1398 src/prefs_matcher.c:639
+#: src/prefs_summaries.c:623 src/prefs_summary_column.c:86
+#: src/summaryview.c:471
 msgid "Score"
 msgstr "Score"
 
-#: src/prefs_filtering_action.c:194
+#: src/prefs_filtering_action.c:188
 msgid "Change score"
 msgstr "Modifier le score"
 
-#: src/prefs_filtering_action.c:195
+#: src/prefs_filtering_action.c:189
 msgid "Set score"
 msgstr "Définir le score"
 
-#: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
-#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:632
-#: src/prefs_summary_column.c:88 src/summaryview.c:453
+#: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
+#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:643
+#: src/prefs_summary_column.c:88 src/summaryview.c:473
 msgid "Tags"
 msgstr "Labels"
 
-#: src/prefs_filtering_action.c:196
+#: src/prefs_filtering_action.c:190
 msgid "Apply tag"
 msgstr "Appliquer le label"
 
-#: src/prefs_filtering_action.c:197
+#: src/prefs_filtering_action.c:191
 msgid "Unset tag"
 msgstr "Enlever le label"
 
-#: src/prefs_filtering_action.c:198
+#: src/prefs_filtering_action.c:192
 msgid "Clear tags"
 msgstr "Effacer les labels"
 
-#: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
+#: src/prefs_filtering_action.c:193 src/prefs_filtering_action.c:194
 msgid "Threads"
 msgstr "Fil de discussion"
 
-#: src/prefs_filtering_action.c:202
+#: src/prefs_filtering_action.c:196
 msgid "Stop filter"
 msgstr "Interrompre le filtrage"
 
-#: src/prefs_filtering_action.c:410
+#: src/prefs_filtering_action.c:400
 msgid "Action configuration"
 msgstr "Configuration de l'action"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1894
-#: src/prefs_matcher.c:585
+#: src/prefs_filtering_action.c:417 src/prefs_filtering.c:1894
+#: src/prefs_matcher.c:596
 msgid "Rule"
 msgstr "Règle"
 
-#: src/prefs_filtering_action.c:440 src/prefs_filtering.c:433
+#: src/prefs_filtering_action.c:430 src/prefs_filtering.c:433
 msgid "Action"
 msgstr "Action"
 
-#: src/prefs_filtering_action.c:922
+#: src/prefs_filtering_action.c:906
 msgid "Command-line not set"
 msgstr "La commande n'a pas été spécifiée."
 
-#: src/prefs_filtering_action.c:923
+#: src/prefs_filtering_action.c:907
 msgid "Destination is not set."
 msgstr "La destination n'a pas été spécifiée."
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:918
 msgid "Recipient is not set."
 msgstr "Destinataire non spécifié."
 
-#: src/prefs_filtering_action.c:952
+#: src/prefs_filtering_action.c:934
 msgid "Score is not set"
 msgstr "Score non spécifié"
 
-#: src/prefs_filtering_action.c:960
+#: src/prefs_filtering_action.c:942
 msgid "Header is not set."
 msgstr "L'en-tête n'est pas défini."
 
-#: src/prefs_filtering_action.c:967
+#: src/prefs_filtering_action.c:949
 msgid "Target addressbook/folder is not set."
 msgstr "Le carnet/dossier de destination n'est pas défini."
 
-#: src/prefs_filtering_action.c:977
+#: src/prefs_filtering_action.c:959
 msgid "Tag name is empty."
 msgstr "Le nom du label n'est pas défini."
 
-#: src/prefs_filtering_action.c:1199
+#: src/prefs_filtering_action.c:1181
 msgid "No action was defined."
 msgstr "Aucune action n'a été spécifiée."
 
-#: src/prefs_filtering_action.c:1237 src/prefs_matcher.c:2159
+#: src/prefs_filtering_action.c:1219 src/prefs_matcher.c:2208
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "caractère « % »"
 
-#: src/prefs_filtering_action.c:1246 src/prefs_matcher.c:2168
+#: src/prefs_filtering_action.c:1228 src/prefs_matcher.c:2217
 msgid "filename (should not be modified)"
 msgstr "Chemin du fichier (ne doit pas être modifié)"
 
-#: src/prefs_filtering_action.c:1247 src/prefs_matcher.c:2169
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2218
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "Retour chariot"
 
-#: src/prefs_filtering_action.c:1248 src/prefs_matcher.c:2170
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2219
 msgid "escape character for quotes"
 msgstr "caractère d'échappement"
 
-#: src/prefs_filtering_action.c:1249 src/prefs_matcher.c:2171
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2220
 msgid "quote character"
 msgstr "Préfixes de citation"
 
-#: src/prefs_filtering_action.c:1258
+#: src/prefs_filtering_action.c:1240
 msgid "Filtering Action: 'Execute'"
 msgstr "Action de filtrage : « Exécuter »"
 
-#: src/prefs_filtering_action.c:1259
+#: src/prefs_filtering_action.c:1241
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -15846,23 +15924,23 @@ msgstr ""
 "externe.\n"
 "Il est possible d'utiliser les symboles suivants :"
 
-#: src/prefs_filtering_action.c:1402
+#: src/prefs_filtering_action.c:1380
 msgid "Recipient"
 msgstr "Destinataire"
 
-#: src/prefs_filtering_action.c:1406
+#: src/prefs_filtering_action.c:1384
 msgid "Book/Folder"
 msgstr "Carnet/dossier"
 
-#: src/prefs_filtering_action.c:1410
+#: src/prefs_filtering_action.c:1388
 msgid "Destination"
 msgstr "Destination"
 
-#: src/prefs_filtering_action.c:1414
+#: src/prefs_filtering_action.c:1391
 msgid "Color"
 msgstr "Colorier"
 
-#: src/prefs_filtering_action.c:1500
+#: src/prefs_filtering_action.c:1476
 msgid "Current action list"
 msgstr "Actions enregistrées"
 
@@ -16000,8 +16078,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Éléments masqués"
 
-#: src/prefs_folder_column.c:299 src/prefs_summaries.c:416
-#: src/prefs_summaries.c:590 src/prefs_summary_column.c:313
+#: src/prefs_folder_column.c:299 src/prefs_summaries.c:383
+#: src/prefs_summaries.c:448 src/prefs_summary_column.c:313
 msgid "Displayed columns"
 msgstr "Éléments affichés"
 
@@ -16010,7 +16088,7 @@ msgstr "Éléments affichés"
 msgid " Use default "
 msgstr " Remise à zéro "
 
-#: src/prefs_folder_item.c:210
+#: src/prefs_folder_item.c:214
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
@@ -16021,7 +16099,7 @@ msgstr ""
 "Cependant, vous pouvez les utiliser pour les appliquer à l'ensemble des sous-"
 "dossiers de la boîte aux lettres en cochant « Appliquer aux sous-dossiers »."
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:885
+#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:896
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -16029,55 +16107,55 @@ msgstr ""
 "Appliquer aux\n"
 "sous-dossiers"
 
-#: src/prefs_folder_item.c:314
+#: src/prefs_folder_item.c:318
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:316
+#: src/prefs_folder_item.c:320
 msgid "Outbox"
 msgstr "Boîte d'envoi"
 
-#: src/prefs_folder_item.c:332
+#: src/prefs_folder_item.c:336
 msgid "Folder type"
 msgstr "Type de dossier"
 
-#: src/prefs_folder_item.c:344
+#: src/prefs_folder_item.c:348
 msgid "Simplify Subject RegExp"
 msgstr "Enlever la RegExp suivante du sujet"
 
-#: src/prefs_folder_item.c:370
+#: src/prefs_folder_item.c:374
 msgid "Test string"
 msgstr "Chaîne de test"
 
-#: src/prefs_folder_item.c:387
+#: src/prefs_folder_item.c:391
 msgid "Result"
 msgstr "Résultat"
 
-#: src/prefs_folder_item.c:402
+#: src/prefs_folder_item.c:406
 msgid "Folder chmod"
 msgstr "Permissions chmod du dossier"
 
-#: src/prefs_folder_item.c:428
+#: src/prefs_folder_item.c:432
 msgid "Folder color"
 msgstr "Couleur du dossier"
 
-#: src/prefs_folder_item.c:440 src/prefs_folder_item.c:1677
+#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
 msgid "Pick color for folder"
 msgstr "Sélection de la couleur pour le(s) dossier(s)"
 
-#: src/prefs_folder_item.c:458
+#: src/prefs_folder_item.c:462
 msgid "Run Processing rules at start-up"
 msgstr "Exécuter les règles de traitement au démarrage"
 
-#: src/prefs_folder_item.c:473
+#: src/prefs_folder_item.c:477
 msgid "Run Processing rules when opening"
 msgstr "Exécuter les règles de traitement à l'ouverture du dossier"
 
-#: src/prefs_folder_item.c:487
+#: src/prefs_folder_item.c:491
 msgid "Scan for new mail"
 msgstr "Relever les nouveaux messages"
 
-#: src/prefs_folder_item.c:489
+#: src/prefs_folder_item.c:493
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -16085,11 +16163,11 @@ msgstr ""
 "Activer cette option si les messages sont acheminés directement dans ce "
 "dossier par un filtrage IMAP depuis le serveur ou par une application externe"
 
-#: src/prefs_folder_item.c:509
+#: src/prefs_folder_item.c:513
 msgid "Select the HTML part of multipart messages"
 msgstr "Préférer la vue HTML pour les messages multipart"
 
-#: src/prefs_folder_item.c:526
+#: src/prefs_folder_item.c:530
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -16097,68 +16175,73 @@ msgstr ""
 "« Par défaut » respectera les préférences globales (modifiables dans /"
 "Préférences/Vue du message/Corps du message)"
 
-#: src/prefs_folder_item.c:536
+#: src/prefs_folder_item.c:540
 msgid "Synchronise for offline use"
 msgstr "Synchroniser pour une utilisation hors-ligne"
 
-#: src/prefs_folder_item.c:557
+#: src/prefs_folder_item.c:561
 msgid "Fetch message bodies from the last"
 msgstr "Récupérer les corps de message des derniers"
 
-#: src/prefs_folder_item.c:564
+#: src/prefs_folder_item.c:568
 msgid "0: all bodies"
 msgstr "0 pour tous les corps de message"
 
-#: src/prefs_folder_item.c:572
+#: src/prefs_folder_item.c:576
 msgid "Remove older messages bodies"
 msgstr "Supprimer les corps de message plus vieux"
 
-#: src/prefs_folder_item.c:589
+#: src/prefs_folder_item.c:593
 msgid "Discard folder cache"
 msgstr "Supprimer le cache du dossier"
 
-#: src/prefs_folder_item.c:894
+#: src/prefs_folder_item.c:905
 msgid "Request Return Receipt"
 msgstr "Demander un accusé de réception"
 
-#: src/prefs_folder_item.c:909
+#: src/prefs_folder_item.c:920
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Enregistrer la copie des messages envoyés dans ce dossier plutôt que dans « "
 "Envoyés »"
 
-#: src/prefs_folder_item.c:923 src/prefs_folder_item.c:975
-#: src/prefs_folder_item.c:1001 src/prefs_folder_item.c:1027
+#: src/prefs_folder_item.c:934 src/prefs_folder_item.c:986
+#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "%s par défaut"
 
-#: src/prefs_folder_item.c:949
+#: src/prefs_folder_item.c:960
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr "%s par défaut pour les réponses"
 
-#: src/prefs_folder_item.c:1052
+#: src/prefs_folder_item.c:1063
 msgid "Default account"
 msgstr "Compte par défaut"
 
-#: src/prefs_folder_item.c:1690
+#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+msgid "\"Default\" will follow the applicable account preference"
+msgstr ""
+"Choisissez \"Par défaut\" pour utiliser les réglages du compte qui s'applique"
+
+#: src/prefs_folder_item.c:1781
 msgid "Discard cache"
 msgstr "Suppression du cache"
 
-#: src/prefs_folder_item.c:1691
+#: src/prefs_folder_item.c:1782
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr ""
 "Voulez-vous vraiment supprimer les données mises localement en cache pour ce "
 "dossier ?"
 
-#: src/prefs_folder_item.c:1824
+#: src/prefs_folder_item.c:1907
 msgid "General"
 msgstr "Général"
 
-#: src/prefs_folder_item.c:1903
+#: src/prefs_folder_item.c:1986
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Options du dossier %s"
@@ -16167,7 +16250,7 @@ msgstr "Options du dossier %s"
 msgid "Folder and Message Lists"
 msgstr "Listes de dossiers et de messages"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2033
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2082
 msgid "Message"
 msgstr "Message"
 
@@ -16193,8 +16276,8 @@ msgstr "Utiliser une police différente pour l'impression"
 msgid "Message Printing"
 msgstr "Impression d'un message"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:773
-#: src/prefs_themes.c:421
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:830
+#: src/prefs_themes.c:422
 msgid "Display"
 msgstr "Affichage"
 
@@ -16202,7 +16285,7 @@ msgstr "Affichage"
 msgid "Fonts"
 msgstr "Polices"
 
-#: src/prefs_gtk.c:908 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -16349,7 +16432,7 @@ msgstr "Messages d'erreur"
 msgid "Status messages for filtering/processing log"
 msgstr "Informations de déboguage du filtrage/traitement"
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:772
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:784
 msgid "Other"
 msgstr "Autres"
 
@@ -16357,247 +16440,259 @@ msgstr "Autres"
 msgid "Logging"
 msgstr "Traçage"
 
-#: src/prefs_matcher.c:330
+#: src/prefs_matcher.c:335
 msgid "more than"
 msgstr "supérieur à"
 
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:336
 msgid "less than"
 msgstr "inférieur à"
 
-#: src/prefs_matcher.c:337
+#: src/prefs_matcher.c:342
 msgid "weeks"
 msgstr "semaine(s)"
 
-#: src/prefs_matcher.c:341
+#: src/prefs_matcher.c:346
+msgid "after"
+msgstr "après"
+
+#: src/prefs_matcher.c:347
+msgid "before"
+msgstr "antérieure à"
+
+#: src/prefs_matcher.c:351
 msgid "higher than"
 msgstr "supérieur à"
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:352
 msgid "lower than"
 msgstr "inférieur à"
 
-#: src/prefs_matcher.c:343 src/prefs_matcher.c:349
+#: src/prefs_matcher.c:353 src/prefs_matcher.c:359
 msgid "exactly"
 msgstr "exactement"
 
-#: src/prefs_matcher.c:347
+#: src/prefs_matcher.c:357
 msgid "greater than"
 msgstr "supérieure à"
 
-#: src/prefs_matcher.c:348
+#: src/prefs_matcher.c:358
 msgid "smaller than"
 msgstr "inférieure à"
 
-#: src/prefs_matcher.c:353
+#: src/prefs_matcher.c:363
 msgid "bytes"
 msgstr "octets"
 
-#: src/prefs_matcher.c:354
+#: src/prefs_matcher.c:364
 msgid "kilobytes"
 msgstr "kilo-octets"
 
-#: src/prefs_matcher.c:355
+#: src/prefs_matcher.c:365
 msgid "megabytes"
 msgstr "méga-octets"
 
-#: src/prefs_matcher.c:359
+#: src/prefs_matcher.c:369
 msgid "contains"
 msgstr "contient"
 
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:370
 msgid "doesn't contain"
 msgstr "ne contient pas"
 
-#: src/prefs_matcher.c:384
+#: src/prefs_matcher.c:394
 msgid "headers part"
 msgstr "en-têtes du message"
 
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:395
 msgid "headers values"
 msgstr "valeurs d'en-tête"
 
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:396
 msgid "body part"
 msgstr "corps du message"
 
-#: src/prefs_matcher.c:387
+#: src/prefs_matcher.c:397
 msgid "whole message"
 msgstr "tout le message"
 
-#: src/prefs_matcher.c:393 src/summaryview.c:6487
+#: src/prefs_matcher.c:403 src/summaryview.c:6534
 msgid "Marked"
 msgstr "Marqué"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6485
+#: src/prefs_matcher.c:404 src/summaryview.c:6532
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: src/prefs_matcher.c:395
+#: src/prefs_matcher.c:405
 msgid "Replied"
 msgstr "Répondu"
 
-#: src/prefs_matcher.c:396 src/summaryview.c:6479
+#: src/prefs_matcher.c:406 src/summaryview.c:6526
 msgid "Forwarded"
 msgstr "Transféré"
 
-#: src/prefs_matcher.c:398 src/summaryview.c:6469 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6516 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Pourriel"
 
-#: src/prefs_matcher.c:399
+#: src/prefs_matcher.c:409
 msgid "Has attachment"
 msgstr "Contient une ou plusieurs pièces jointes"
 
-#: src/prefs_matcher.c:400 src/summaryview.c:6505
+#: src/prefs_matcher.c:410 src/summaryview.c:6552
 msgid "Signed"
 msgstr "Signé"
 
-#: src/prefs_matcher.c:404
+#: src/prefs_matcher.c:414
 msgid "set"
 msgstr "défini"
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:415
 msgid "not set"
 msgstr "non défini"
 
-#: src/prefs_matcher.c:409
+#: src/prefs_matcher.c:419
 msgid "yes"
 msgstr "oui"
 
-#: src/prefs_matcher.c:410
+#: src/prefs_matcher.c:420
 msgid "no"
 msgstr "non"
 
-#: src/prefs_matcher.c:414
+#: src/prefs_matcher.c:424
 msgid "Any tags"
 msgstr "n'importe quel label"
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:425
 msgid "Specific tag"
 msgstr "label précis"
 
-#: src/prefs_matcher.c:419
+#: src/prefs_matcher.c:429
 msgid "ignored"
 msgstr "ignoré"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:430
 msgid "not ignored"
 msgstr "non ignoré"
 
-#: src/prefs_matcher.c:421
+#: src/prefs_matcher.c:431
 msgid "watched"
 msgstr "suivi"
 
-#: src/prefs_matcher.c:422
+#: src/prefs_matcher.c:432
 msgid "not watched"
 msgstr "non suivi"
 
-#: src/prefs_matcher.c:426
+#: src/prefs_matcher.c:436
 msgid "found"
 msgstr "trouvé"
 
-#: src/prefs_matcher.c:427
+#: src/prefs_matcher.c:437
 msgid "not found"
 msgstr "non trouvé"
 
-#: src/prefs_matcher.c:431
+#: src/prefs_matcher.c:441
 msgid "0 (Passed)"
 msgstr "0 (succès)"
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:442
 msgid "non-0 (Failed)"
 msgstr "différent de 0 (échec)"
 
-#: src/prefs_matcher.c:568
+#: src/prefs_matcher.c:579
 msgid "Condition configuration"
 msgstr "Conditions de filtrage"
 
-#: src/prefs_matcher.c:612
+#: src/prefs_matcher.c:623
 msgid "Match criteria"
 msgstr "Critère"
 
-#: src/prefs_matcher.c:621
+#: src/prefs_matcher.c:632
 msgid "All messages"
 msgstr "Tous les messages"
 
-#: src/prefs_matcher.c:623
+#: src/prefs_matcher.c:634
 msgid "Age"
 msgstr "Âge"
 
-#: src/prefs_matcher.c:624
+#: src/prefs_matcher.c:635
 msgid "Phrase"
 msgstr "Expression"
 
-#: src/prefs_matcher.c:625
+#: src/prefs_matcher.c:636
 msgid "Flags"
 msgstr "États"
 
-#: src/prefs_matcher.c:626 src/prefs_msg_colors.c:341
+#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:341
 msgid "Color labels"
 msgstr "Couleurs"
 
-#: src/prefs_matcher.c:627
+#: src/prefs_matcher.c:638
 msgid "Thread"
 msgstr "Fil de discussion"
 
-#: src/prefs_matcher.c:630
+#: src/prefs_matcher.c:641
 msgid "Partially downloaded"
 msgstr "Partiellement téléchargé"
 
-#: src/prefs_matcher.c:633
+#: src/prefs_matcher.c:644
 msgid "External program test"
 msgstr "Test par programme externe"
 
-#: src/prefs_matcher.c:705 src/prefs_matcher.c:1613 src/prefs_matcher.c:1628
-#: src/prefs_matcher.c:2515
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1654 src/prefs_matcher.c:1669
+#: src/prefs_matcher.c:2579
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Tous"
 
-#: src/prefs_matcher.c:739
+#: src/prefs_matcher.c:749
 msgid "Use regexp"
 msgstr "Utiliser des expressions régulières"
 
-#: src/prefs_matcher.c:815
+#: src/prefs_matcher.c:840
 msgid "Message must match"
 msgstr "Le message doit valider"
 
-#: src/prefs_matcher.c:819
+#: src/prefs_matcher.c:844
 msgid "at least one"
 msgstr "au moins une des"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:845
 msgid "all"
 msgstr "toutes les"
 
-#: src/prefs_matcher.c:823
+#: src/prefs_matcher.c:848
 msgid "of above rules"
 msgstr "règles ci-dessus"
 
-#: src/prefs_matcher.c:1531 src/prefs_matcher.c:1597
+#: src/prefs_matcher.c:1560 src/prefs_matcher.c:1638
 msgid "Search pattern is not set."
 msgstr "Le terme cherché n'est pas défini."
 
-#: src/prefs_matcher.c:1540
+#: src/prefs_matcher.c:1574
+msgid "Invalid hour."
+msgstr "Heure invalide."
+
+#: src/prefs_matcher.c:1583
 msgid "Test command is not set."
 msgstr "La commande de test n'est pas définie."
 
-#: src/prefs_matcher.c:1614
+#: src/prefs_matcher.c:1655
 msgid "all addresses in all headers"
 msgstr "toutes les adresses de toutes les en-têtes"
 
-#: src/prefs_matcher.c:1617
+#: src/prefs_matcher.c:1658
 msgid "any address in any header"
 msgstr "n'importe quelle adresse de n'importe quel en-tête"
 
-#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:1660
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "l'(les) adresse(s) de l'en-tête '%s'"
 
-#: src/prefs_matcher.c:1620
+#: src/prefs_matcher.c:1661
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16611,93 +16706,97 @@ msgstr ""
 "d'adresse, vous devez sélectionner '%s' dans la liste déroulante « carnet/"
 "dossier »."
 
-#: src/prefs_matcher.c:1839
+#: src/prefs_matcher.c:1880
 msgid "Headers part"
 msgstr "En-têtes du message"
 
-#: src/prefs_matcher.c:1843
+#: src/prefs_matcher.c:1884
 msgid "Headers values"
 msgstr "Valeurs d'en-tête"
 
-#: src/prefs_matcher.c:1847
+#: src/prefs_matcher.c:1888
 msgid "Body part"
 msgstr "Corps du message"
 
-#: src/prefs_matcher.c:1851
+#: src/prefs_matcher.c:1892
 msgid "Whole message"
 msgstr "Tout le message"
 
-#: src/prefs_matcher.c:1964 src/prefs_matcher.c:2006
+#: src/prefs_matcher.c:2009 src/prefs_matcher.c:2055
 msgid "in"
 msgstr "dans"
 
-#: src/prefs_matcher.c:1966
+#: src/prefs_matcher.c:2011
 msgid "content is"
 msgstr "Le contenu est"
 
-#: src/prefs_matcher.c:1975
+#: src/prefs_matcher.c:2015
+msgid "Date is"
+msgstr "Date"
+
+#: src/prefs_matcher.c:2026
 msgid "Age is"
 msgstr "Âge"
 
-#: src/prefs_matcher.c:1980
+#: src/prefs_matcher.c:2031
 msgid "Flag"
 msgstr "État"
 
-#: src/prefs_matcher.c:1981 src/prefs_matcher.c:1996
+#: src/prefs_matcher.c:2032 src/prefs_matcher.c:2046
 msgid "is"
 msgstr "est"
 
-#: src/prefs_matcher.c:1986
+#: src/prefs_matcher.c:2037
 msgid "Name:"
 msgstr "Nom d'en-tête"
 
-#: src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:2045
 msgid "Label"
 msgstr "Couleur"
 
-#: src/prefs_matcher.c:2001
+#: src/prefs_matcher.c:2050
 msgid "Value:"
 msgstr "Valeur"
 
-#: src/prefs_matcher.c:2016
+#: src/prefs_matcher.c:2065
 msgid "Score is"
 msgstr "Score"
 
-#: src/prefs_matcher.c:2017
+#: src/prefs_matcher.c:2066
 msgid "points"
 msgstr "points"
 
-#: src/prefs_matcher.c:2027
+#: src/prefs_matcher.c:2076
 msgid "Size is"
 msgstr "Taille"
 
-#: src/prefs_matcher.c:2032
+#: src/prefs_matcher.c:2081
 msgid "Scope:"
 msgstr "Portée"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2083
 msgid "tags"
 msgstr "un(des) label(s)."
 
-#: src/prefs_matcher.c:2039
+#: src/prefs_matcher.c:2088
 msgid "type is"
 msgstr "est"
 
-#: src/prefs_matcher.c:2043
+#: src/prefs_matcher.c:2092
 msgid "Program returns"
 msgstr "Retourne"
 
-#: src/prefs_matcher.c:2113
+#: src/prefs_matcher.c:2162
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr "La règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 
-#: src/prefs_matcher.c:2180
+#: src/prefs_matcher.c:2229
 msgid "Match Type: 'Test'"
 msgstr "Condition de filtrage : « Test »"
 
-#: src/prefs_matcher.c:2181
+#: src/prefs_matcher.c:2230
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -16711,7 +16810,7 @@ msgstr ""
 "\n"
 "Il est possible d'utiliser les symboles suivants :"
 
-#: src/prefs_matcher.c:2280
+#: src/prefs_matcher.c:2329
 msgid "Current condition rules"
 msgstr "Conditions enregistrées"
 
@@ -16795,7 +16894,7 @@ msgstr "Traiter ces caractères comme préfixe de citation"
 msgid "Text Options"
 msgstr "Corps du message"
 
-#: src/prefs_migration.c:50
+#: src/prefs_migration.c:51
 #, c-format
 msgid ""
 "Your Claws Mail configuration is from a newer version than the version which "
@@ -16816,7 +16915,7 @@ msgstr ""
 "\n"
 "Voulez-vous quitter maintenant ?"
 
-#: src/prefs_migration.c:59
+#: src/prefs_migration.c:60
 msgid "Configuration warning"
 msgstr "Avertissement configuration"
 
@@ -16907,7 +17006,7 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Sélection de la couleur des signatures"
 
-#: src/prefs_msg_colors.c:311 src/prefs_summaries.c:365
+#: src/prefs_msg_colors.c:311 src/prefs_summaries.c:377
 msgid "Folder list"
 msgstr "Liste des dossiers"
 
@@ -17011,15 +17110,15 @@ msgstr "Sélection de la couleur n°%d"
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:108
 msgid "Choose preset keyboard shortcuts"
 msgstr "Pré-sélections de raccourcis clavier"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:122
 msgid "Select preset:"
 msgstr "Sélectionner une configuration :"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:137
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -17028,35 +17127,35 @@ msgstr ""
 "de menu en pressant une combinaison de touches juste après\n"
 "lui avoir fait prendre le focus (sans cliquer)."
 
-#: src/prefs_other.c:492
+#: src/prefs_other.c:494
 msgid "Add address to destination when double-clicked"
 msgstr "Un double-clic sur une adresse l'ajoute à la liste des destinataires"
 
-#: src/prefs_other.c:495
+#: src/prefs_other.c:497
 msgid "On exit"
 msgstr "En quittant"
 
-#: src/prefs_other.c:498
+#: src/prefs_other.c:500
 msgid "Confirm on exit"
 msgstr "Demander confirmation"
 
-#: src/prefs_other.c:505
+#: src/prefs_other.c:507
 msgid "Empty trash on exit"
 msgstr "Vider la corbeille"
 
-#: src/prefs_other.c:508
+#: src/prefs_other.c:510
 msgid "Warn if there are queued messages"
 msgstr "Avertir s'il y a des messages à envoyer en file d'attente"
 
-#: src/prefs_other.c:510
+#: src/prefs_other.c:512
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: src/prefs_other.c:513
+#: src/prefs_other.c:515
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Permettre de modifier les raccourcis clavier"
 
-#: src/prefs_other.c:516
+#: src/prefs_other.c:518
 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"
@@ -17068,15 +17167,15 @@ msgstr ""
 "Désactivez cette option si vous voulez figer les raccourcis de clavier "
 "existants (et ainsi éviter de les modifier par inadvertance)."
 
-#: src/prefs_other.c:523
+#: src/prefs_other.c:525
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Pré-sélections de raccourcis clavier.."
 
-#: src/prefs_other.c:533
+#: src/prefs_other.c:535
 msgid "Metadata handling"
 msgstr "Gestion des métadonnées"
 
-#: src/prefs_other.c:534
+#: src/prefs_other.c:536
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -17086,33 +17185,45 @@ msgstr ""
 "Ce mode de fonctionnement réduit le risque de pertes de données\n"
 "en cas de crash système, mais peut se montrer plus lent."
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:540
 msgid "Safer"
 msgstr "Moins risqué"
 
-#: src/prefs_other.c:540
+#: src/prefs_other.c:542
 msgid "Faster"
 msgstr "Plus rapide"
 
-#: src/prefs_other.c:558
+#: src/prefs_other.c:560
 msgid "Socket I/O timeout"
 msgstr "Délai d'attente maximal de communication"
 
-#: src/prefs_other.c:579
+#: src/prefs_other.c:581
+msgid "Translate header names"
+msgstr "Traduire les en-têtes"
+
+#: src/prefs_other.c:583
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"L'affichage des en-têtes courants (comme « From: », « Subject: ») sera "
+"traduit dans le language présentement utilisé."
+
+#: src/prefs_other.c:586
 msgid "Ask before emptying trash"
 msgstr "Demander une confirmation pour vider la ou les corbeilles"
 
-#: src/prefs_other.c:581
+#: src/prefs_other.c:588
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Lors d'un filtrage manuel, demander comment appliquer les régles liées à des "
 "comptes"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:593
 msgid "Use secure file deletion if possible"
 msgstr "Utiliser la suppression de fichiers sécurisée si possible"
 
-#: src/prefs_other.c:590
+#: src/prefs_other.c:597
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -17120,7 +17231,7 @@ msgstr ""
 "Utiliser la suppression de fichiers sécurisée si possible\n"
 "(le programme 'shred' n'est pas disponible)"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:602
 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."
@@ -17129,19 +17240,19 @@ msgstr ""
 "aléatoire avant de les effacer. Cela peut ralentir la suppression de façon "
 "significative. Consultez la documentation de shread pour en savoir plus."
 
-#: src/prefs_other.c:599
+#: src/prefs_other.c:606
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchroniser les dossiers en ligne dès que possible"
 
-#: src/prefs_other.c:602
+#: src/prefs_other.c:609
 msgid "Master passphrase"
 msgstr "Phrase secrète principale"
 
-#: src/prefs_other.c:605
+#: src/prefs_other.c:612
 msgid "Use a master passphrase"
 msgstr "Utiliser une phrase secrète principale"
 
-#: src/prefs_other.c:608
+#: src/prefs_other.c:615
 msgid ""
 "If checked, your saved account passwords will be protected by a master "
 "passphrase. If no master passphrase is set, you will be prompted to set one."
@@ -17150,15 +17261,15 @@ msgstr ""
 "principal. Si aucun mot de passe principal n'est défini, il vous sera "
 "demandé de le saisir."
 
-#: src/prefs_other.c:613
+#: src/prefs_other.c:620
 msgid "Change master passphrase"
 msgstr "Changer la phrase secrète principale"
 
-#: src/prefs_other.c:773
+#: src/prefs_other.c:785
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: src/prefs_proxy.c:240 src/prefs_receive.c:413 src/prefs_send.c:419
+#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
 msgid "Mail Handling"
 msgstr "Traitement du courrier"
 
@@ -17166,68 +17277,68 @@ msgstr "Traitement du courrier"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Le %d,\\n%f a écrit :\\n\\n%q"
 
-#: src/prefs_receive.c:143
+#: src/prefs_receive.c:145
 msgid "External incorporation program"
 msgstr "Programme externe pour la réception du courriel"
 
-#: src/prefs_receive.c:146
+#: src/prefs_receive.c:148
 msgid "Use external program for receiving mail"
 msgstr "Utiliser le programme suivant"
 
-#: src/prefs_receive.c:213
+#: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
 msgstr "Relever au démarrage"
 
-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:218
 msgid "Dialogs"
 msgstr "Fenêtres"
 
-#: src/prefs_receive.c:218
+#: src/prefs_receive.c:220
 msgid "Show receive dialog"
 msgstr "Afficher une fenêtre lors de la réception"
 
-#: src/prefs_receive.c:228
+#: src/prefs_receive.c:230
 msgid "Only on manual receiving"
 msgstr "Uniquement lors de la relève manuelle"
 
-#: src/prefs_receive.c:239
+#: src/prefs_receive.c:241
 msgid "Close receive dialog when finished"
 msgstr "Fermer la fenêtre de réception en fin d'opération"
 
-#: src/prefs_receive.c:242
+#: src/prefs_receive.c:244
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne pas afficher de fenêtre lors d'une erreur de réception"
 
-#: src/prefs_receive.c:245
+#: src/prefs_receive.c:247
 msgid "After receiving new mail"
 msgstr "Après réception du courriel"
 
-#: src/prefs_receive.c:247
+#: src/prefs_receive.c:249
 msgid "Go to Inbox"
 msgstr "Aller dans le dossier de réception"
 
-#: src/prefs_receive.c:249
+#: src/prefs_receive.c:251
 msgid "Update all local folders"
 msgstr "Mettre à jour l'ensemble des dossiers locaux"
 
-#: src/prefs_receive.c:251
+#: src/prefs_receive.c:253
 msgid "Run command"
 msgstr "Exécution d'une commande si du courriel arrive"
 
-#: src/prefs_receive.c:256
+#: src/prefs_receive.c:258
 msgid "after automatic check"
 msgstr "après une relève automatique"
 
-#: src/prefs_receive.c:258
+#: src/prefs_receive.c:260
 msgid "after manual check"
 msgstr "après une relève manuelle"
 
-#: src/prefs_receive.c:278
+#: src/prefs_receive.c:280
 #, c-format
 msgid "Use %d as number of new mails"
 msgstr "Utiliser %d pour le nombre de nouveaux messages"
 
-#: src/prefs_receive.c:414
+#: src/prefs_receive.c:416
 msgid "Receiving"
 msgstr "Réception"
 
@@ -17402,8 +17513,8 @@ msgstr ""
 "Spécifier le « Content-Transfer-Encoding » utilisé quand le corps du message "
 "contient des caractères non ASCII."
 
-#: src/prefs_send.c:420 src/send_message.c:519 src/send_message.c:523
-#: src/send_message.c:528
+#: src/prefs_send.c:420 src/send_message.c:520 src/send_message.c:524
+#: src/send_message.c:529
 msgid "Sending"
 msgstr "Envoi"
 
@@ -17459,244 +17570,256 @@ msgstr ""
 msgid "Spell Checking"
 msgstr "Correcteur orthographique"
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:166
 msgid "the abbreviated weekday name"
 msgstr "nom abrégé du jour de la semaine"
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:167
 msgid "the full weekday name"
 msgstr "nom du jour de la semaine"
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:168
 msgid "the abbreviated month name"
 msgstr "nom du mois abrégé"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:169
 msgid "the full month name"
 msgstr "nom du mois"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:170
 msgid "the preferred date and time for the current locale"
 msgstr "le format par défaut de la date et de l'heure"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:171
 msgid "the century number (year/100)"
 msgstr "le 'siècle' (année/100)"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:172
 msgid "the day of the month as a decimal number"
 msgstr "le jour du mois"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:173
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'heure en tant que nombre (0-23)"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:174
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'heure en tant que nombre (1-12)"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:175
 msgid "the day of the year as a decimal number"
 msgstr "le jour de l'année en tant que nombre"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:176
 msgid "the month as a decimal number"
 msgstr "le mois en tant que nombre"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:177
 msgid "the minute as a decimal number"
 msgstr "les minutes en tant que nombre"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:178
 msgid "either AM or PM"
 msgstr "AM (matin) ou PM (après-midi)"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:179
 msgid "the second as a decimal number"
 msgstr "les secondes en tant que nombre"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:180
 msgid "the day of the week as a decimal number"
 msgstr "le jour de la semaine en tant que nombre"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:181
 msgid "the preferred date for the current locale"
 msgstr "le format par défaut de la date"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:182
 msgid "the last two digits of a year"
 msgstr "les deux derniers chiffres de l'année"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:183
 msgid "the year as a decimal number"
 msgstr "l'année"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:184
 msgid "the time zone or name or abbreviation"
 msgstr "le fuseau horaire, son nom ou abréviation"
 
-#: src/prefs_summaries.c:200 src/prefs_summaries.c:248
-#: src/prefs_summaries.c:565
+#: src/prefs_summaries.c:205 src/prefs_summaries.c:253
+#: src/prefs_summaries.c:465
 msgid "Date format"
 msgstr "Format de la date"
 
-#: src/prefs_summaries.c:224
+#: src/prefs_summaries.c:229
 msgid "Specifier"
 msgstr "Symbole"
 
-#: src/prefs_summaries.c:266
+#: src/prefs_summaries.c:271
 msgid "Example"
 msgstr "Exemple"
 
-#: src/prefs_summaries.c:371
+#: src/prefs_summaries.c:397
 msgid "Display message count next to folder name"
 msgstr "Afficher le nombre de messages près du nom de dossier"
 
-#: src/prefs_summaries.c:381
+#: src/prefs_summaries.c:407
 msgid "Unread messages"
 msgstr "Messages non lus"
 
-#: src/prefs_summaries.c:382
+#: src/prefs_summaries.c:408
 msgid "Unread and Total messages"
 msgstr "Messages non lus et total"
 
-#: src/prefs_summaries.c:392
+#: src/prefs_summaries.c:414
 msgid "Open last opened folder at start-up"
 msg