[Commits] [SCM] claws branch, master, updated. 3.13.2-55-g5bef3ae

ticho at claws-mail.org ticho at claws-mail.org
Sat Feb 20 00:28:48 CET 2016


The branch, master has been updated
       via  5bef3aecedf1f062cc9ddf9a3b819841a5d989f8 (commit)
       via  77971f2acb378bb70e7e98dc5de5e092df87dbac (commit)
      from  18ccbd586fec890cab70ce34c94c580d69fffdd0 (commit)

Summary of changes:
 po/ca.po    |19258 +++++++++++++++++++++++++++++------------------------------
 po/cs.po    | 2196 ++++---
 po/de.po    | 2152 ++++---
 po/en_GB.po | 2006 +++----
 po/es.po    | 2108 ++++---
 po/fi.po    | 2242 ++++---
 po/fr.po    | 2315 ++++---
 po/he.po    | 2286 ++++---
 po/hu.po    | 2235 ++++---
 po/it.po    | 2246 ++++---
 po/lt.po    | 2200 ++++---
 po/nb.po    | 2196 ++++---
 po/nl.po    | 2149 ++++---
 po/pt_BR.po | 2016 +++----
 po/ru.po    | 2196 ++++---
 po/sk.po    | 2149 ++++---
 po/sv.po    | 2088 ++++---
 po/zh_TW.po | 2222 ++++---
 18 files changed, 27468 insertions(+), 28792 deletions(-)


- Log -----------------------------------------------------------------
commit 5bef3aecedf1f062cc9ddf9a3b819841a5d989f8
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Feb 20 00:27:47 2016 +0100

    Made the gnutls password encryption work on Win32.

diff --git a/src/mh.c b/src/mh.c
index 0736e58..913a41c 100644
--- a/src/mh.c
+++ b/src/mh.c
@@ -791,7 +791,7 @@ static gint mh_create_tree(Folder *folder)
 	rootpath = LOCAL_FOLDER(folder)->rootpath;
 #ifdef G_OS_UNIX
 	if (*rootpath == '/') {
-#elif G_OS_WIN32
+#elif defined G_OS_WIN32
 	if (g_ascii_isalpha(*rootpath) && !strncmp(rootpath + 1, "\:", 2)) {
 #endif
 		/* Folder path is absolute. */
diff --git a/src/password.c b/src/password.c
index 4f9ee16..7e37e28 100644
--- a/src/password.c
+++ b/src/password.c
@@ -30,9 +30,12 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#ifdef G_OS_UNIX
+#if defined G_OS_UNIX
 #include <fcntl.h>
 #include <unistd.h>
+#elif defined G_OS_WIN32
+#include <windows.h>
+#include <wincrypt.h>
 #endif
 
 #include "common/passcrypt.h"
@@ -271,8 +274,10 @@ gchar *password_encrypt_gnutls(const gchar *password,
 	gnutls_datum_t key, iv;
 	int ivlen, keylen, digestlen, blocklen, ret, i;
 	unsigned char hashbuf[BUFSIZE], *buf, *encbuf, *base, *output;
-#ifdef G_OS_UNIX
+#if defined G_OS_UNIX
 	int rnd;
+#elif defined G_OS_WIN32
+	HCRYPTPROV rnd;
 #endif
 
 	g_return_val_if_fail(password != NULL, NULL);
@@ -299,38 +304,48 @@ gchar *password_encrypt_gnutls(const gchar *password,
 	memcpy(key.data, &hashbuf, keylen);
 	key.size = keylen;
 
-#ifdef G_OS_UNIX
 	/* Prepare our source of random data. */
+#if defined G_OS_UNIX
 	rnd = open("/dev/urandom", O_RDONLY);
 	if (rnd == -1) {
 		perror("fopen on /dev/urandom");
+#elif defined G_OS_WIN32
+	if (!CryptAcquireContext(&rnd, NULL, NULL, PROV_RSA_FULL, 0) &&
+			!CryptAcquireContext(&rnd, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
+		debug_print("Could not acquire a CSP handle.\n");
+#endif
 		g_free(key.data);
 		g_free(iv.data);
 		return NULL;
 	}
-#endif
 
 	/* Prepare random IV for cipher */
 	iv.data = malloc(ivlen);
 	iv.size = ivlen;
-#ifdef G_OS_UNIX
+#if defined G_OS_UNIX
 	ret = read(rnd, iv.data, ivlen);
 	if (ret != ivlen) {
 		perror("read into iv");
+		close(rnd);
+#elif defined G_OS_WIN32
+	if (!CryptGenRandom(rnd, ivlen, iv.data)) {
+		debug_print("Could not read random data for IV\n");
+		CryptReleaseContext(rnd, 0);
+#endif
 		g_free(key.data);
 		g_free(iv.data);
-		close(rnd);
 		return NULL;
 	}
-#endif
 
 	/* Initialize the encryption */
 	ret = gnutls_cipher_init(&handle, algo, &key, &iv);
 	if (ret < 0) {
 		g_free(key.data);
 		g_free(iv.data);
-#ifdef G_OS_UNIX
+#if defined G_OS_UNIX
 		close(rnd);
+#elif defined G_OS_WIN32
+		CryptReleaseContext(rnd, 0);
 #endif
 		return NULL;
 	}
@@ -339,20 +354,28 @@ gchar *password_encrypt_gnutls(const gchar *password,
 	 * rest with zero bytes. */
 	buf = malloc(BUFSIZE + blocklen);
 	memset(buf, 0, BUFSIZE);
-#ifdef G_OS_UNIX
+#if defined G_OS_UNIX
 	ret = read(rnd, buf, blocklen);
 	if (ret != blocklen) {
 		perror("read into buffer");
+		close(rnd);
+#elif defined G_OS_WIN32
+	if (!CryptGenRandom(rnd, blocklen, buf)) {
+		debug_print("Could not read random data for IV\n");
+		CryptReleaseContext(rnd, 0);
+#endif
 		g_free(buf);
 		g_free(key.data);
 		g_free(iv.data);
-		close(rnd);
 		gnutls_cipher_deinit(handle);
 		return NULL;
 	}
 
 	/* We don't need any more random data. */
+#if defined G_OS_UNIX
 	close(rnd);
+#elif defined G_OS_WIN32
+	CryptReleaseContext(rnd, 0);
 #endif
 
 	memcpy(buf + blocklen, password, strlen(password));
@@ -398,8 +421,10 @@ gchar *password_decrypt_gnutls(const gchar *password,
 	int ivlen, keylen, digestlen, blocklen, ret, i;
 	gsize len;
 	unsigned char hashbuf[BUFSIZE], *buf;
-#ifdef G_OS_UNIX
+#if defined G_OS_UNIX
 	int rnd;
+#elif defined G_OS_WIN32
+	HCRYPTPROV rnd;
 #endif
 
 	g_return_val_if_fail(password != NULL, NULL);
@@ -452,34 +477,46 @@ gchar *password_decrypt_gnutls(const gchar *password,
 	memcpy(key.data, &hashbuf, keylen);
 	key.size = keylen;
 
-#ifdef G_OS_UNIX
 	/* Prepare our source of random data. */
+#if defined G_OS_UNIX
 	rnd = open("/dev/urandom", O_RDONLY);
 	if (rnd == -1) {
 		perror("fopen on /dev/urandom");
+#elif defined G_OS_WIN32
+	if (!CryptAcquireContext(&rnd, NULL, NULL, PROV_RSA_FULL, 0) &&
+			!CryptAcquireContext(&rnd, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
+		debug_print("Could not acquire a CSP handle.\n");
+#endif
 		g_free(key.data);
 		g_free(iv.data);
 		g_strfreev(tokens);
 		return NULL;
 	}
-#endif
 
 	/* Prepare random IV for cipher */
 	iv.data = malloc(ivlen);
 	iv.size = ivlen;
-#ifdef G_OS_UNIX
+#if defined G_OS_UNIX
 	ret = read(rnd, iv.data, ivlen);
 	if (ret != ivlen) {
 		perror("read into iv");
+		close(rnd);
+#elif defined G_OS_WIN32
+	if (!CryptGenRandom(rnd, ivlen, iv.data)) {
+		debug_print("Could not read random data for IV\n");
+		CryptReleaseContext(rnd, 0);
+#endif
 		g_free(key.data);
 		g_free(iv.data);
 		g_strfreev(tokens);
-		close(rnd);
 		return NULL;
 	}
 
 	/* We don't need any more random data. */
+#if defined G_OS_UNIX
 	close(rnd);
+#elif defined G_OS_WIN32
+	CryptReleaseContext(rnd, 0);
 #endif
 
 	/* Prepare encrypted password string for decryption. */
diff --git a/src/password_gtk.c b/src/password_gtk.c
index 683acbe..41bb7f5 100644
--- a/src/password_gtk.c
+++ b/src/password_gtk.c
@@ -218,8 +218,6 @@ void master_password_change_dialog()
 	while (!ctx->done)
 		gtk_main_iteration();
 
-	manage_window_focus_out(dialog, NULL, NULL);
-
 	if (ctx->dialog != NULL)
 		gtk_widget_destroy(ctx->dialog);
 

commit 77971f2acb378bb70e7e98dc5de5e092df87dbac
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Feb 20 00:27:24 2016 +0100

    Revert "Made the gnutls password encryption work on Win32."
    
    This reverts commit 18ccbd586fec890cab70ce34c94c580d69fffdd0.
    I committed more than I expected, files in po/ snuck in, sorry!

diff --git a/po/ca.po b/po/ca.po
index 897f0e2..da09957 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.7.8\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-07-12 20:01+0200\n"
 "PO-Revision-Date: 2015-07-14 20:52+0200\n"
 "Last-Translator: Carles Tubio <c at rles-tub.io>\n"
 "Language-Team: Miquel Oliete i Baliarda <ktalanet at yahoo.es>\n"
@@ -26,7 +26,7 @@ msgstr ""
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -34,15 +34,15 @@ msgstr ""
 "Hi ha finestres de composició obertes.\n"
 "Tanqueu totes les finestres de composició abans d'editar els comptes."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "No s'ha pogut crear la carpeta."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Editar els comptes"
 
-#: src/account.c:744
+#: src/account.c:741
 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,60 +52,60 @@ msgstr ""
 "donat, la casella de selecció indicarà quins comptes seran inclosos. El text "
 "en negreta indica la compte per defecte."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " E_stablir com a compte primari "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Els comptes amb carpetes remotes no es poden copiar"
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Còpia de %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Realment vols esborrar el compte '%s'?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Sense títol)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Esborrar el compte"
 
-#: src/account.c:1557
+#: src/account.c:1544
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1563
+#: src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Rebre' recupera el correu desde els comptes marcats"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
-#: src/editaddress.c:1322 src/editaddress.c:1342
+#: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7213 src/editaddress.c:1263
+#: src/editaddress.c:1320 src/editaddress.c:1340
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:427
-#: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
-#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1807
+#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
+#: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:479
+#: src/plugins/pdf_viewer/poppler_viewer.c:1796
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1565 src/prefs_account.c:1102 src/prefs_account.c:4060
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1573 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Servidor"
 
@@ -156,12 +156,12 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
+#: src/action.c:990 src/ldaputil.c:326 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
-#: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1805
+#: src/plugins/vcalendar/vcal_folder.c:1809
+#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1823 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -227,7 +227,7 @@ msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 "No es pot moure la carpeta en si mateixa o en una de les seves subcarpetes."
 
-#: src/addr_compl.c:689 src/addressbook.c:4947
+#: src/addr_compl.c:685 src/addressbook.c:4873
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Grup"
@@ -300,9 +300,9 @@ msgstr ""
 "Realment vols reemplaçar tots els noms de l' atribut\n"
 "amb el valor per defecte?"
 
-#: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
-#: src/addressbook.c:483 src/edittags.c:272
-#: src/plugins/archive/archiver_gtk.c:1186 src/prefs_actions.c:1090
+#: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
+#: src/addressbook.c:480 src/edittags.c:272
+#: src/plugins/archive/archiver_gtk.c:1182 src/prefs_actions.c:1090
 #: src/prefs_filtering.c:1693 src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "_Esborrar"
@@ -373,11 +373,11 @@ msgstr "Adreça"
 msgid "Address book path"
 msgstr "Ruta del llibre d'adreces"
 
-#: src/addrduplicates.c:793 src/addressbook.c:1438 src/addressbook.c:1491
+#: src/addrduplicates.c:793 src/addressbook.c:1433 src/addressbook.c:1486
 msgid "Delete address(es)"
 msgstr "Esborrar la/les adreça/es"
 
-#: src/addrduplicates.c:794 src/addressbook.c:1492
+#: src/addrduplicates.c:794 src/addressbook.c:1487
 msgid "Really delete the address(es)?"
 msgstr "Esborrar realment la/les adreça/es?"
 
@@ -385,7 +385,7 @@ msgstr "Esborrar realment la/les adreça/es?"
 msgid "Delete address"
 msgstr "Esborrar adreça"
 
-#: src/addrduplicates.c:843 src/addressbook.c:1439
+#: src/addrduplicates.c:843 src/addressbook.c:1434
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Aquesta adreça és només de lectura i no es pot esborrar."
 
@@ -397,8 +397,8 @@ msgstr "Afegir al llibre d'adreces"
 msgid "Contact"
 msgstr "Contacte"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1057
-#: src/editaddress.c:1132 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
+#: src/editaddress.c:1130 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Notes"
 
@@ -406,7 +406,17 @@ msgstr "Notes"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar la carpeta del llibre d'adreces"
 
-#: src/addressadd.c:535 src/addressbook.c:3217 src/addressbook.c:3268
+#: src/addressadd.c:485 src/editaddress.c:1582 src/headerview.c:280
+#: src/textview.c:2042
+#, c-format
+msgid ""
+"Failed to save image: \n"
+"%s"
+msgstr ""
+"Error al desar l'imatge: \n"
+"%s"
+
+#: src/addressadd.c:535 src/addressbook.c:3209 src/addressbook.c:3260
 msgid "Add address(es)"
 msgstr "Afegir adreça/es"
 
@@ -414,263 +424,262 @@ msgstr "Afegir adreça/es"
 msgid "Can't add the specified address"
 msgstr "No s'ha pogut afegir l'adreça especificada"
 
-#: src/addressbook.c:126 src/addressbook.c:4935 src/editaddress.c:1054
-#: src/editaddress.c:1115 src/editgroup.c:289 src/expldifdlg.c:517
-#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
+#: src/addressbook.c:126 src/addressbook.c:4861 src/editaddress.c:1052
+#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:518
+#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:763
 msgid "Email Address"
 msgstr "Adreça de Correu"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:402
 msgid "_Book"
 msgstr "Lli_bre"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
+#: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:404 src/compose.c:586 src/mainwindow.c:509
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "E_ines"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:405 src/compose.c:587 src/mainwindow.c:511
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "A_juda"
 
-#: src/addressbook.c:411 src/addressbook.c:468
+#: src/addressbook.c:408 src/addressbook.c:465
 msgid "New _Book"
 msgstr "Nou Lli_bre"
 
-#: src/addressbook.c:412 src/addressbook.c:469
+#: src/addressbook.c:409 src/addressbook.c:466
 msgid "New _Folder"
 msgstr "Nova _Carpeta"
 
-#: src/addressbook.c:413
+#: src/addressbook.c:410
 msgid "New _vCard"
 msgstr "Nova _vCard"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:414
 msgid "New _JPilot"
 msgstr "Nou _JPilot"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:417
 msgid "New LDAP _Server"
 msgstr "Nou _servidor LDAP"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:421
 msgid "_Edit book"
 msgstr "_Editar Llibre"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:422
 msgid "_Delete book"
 msgstr "_Esborrar llibre"
 
-#: src/addressbook.c:427 src/compose.c:604
-#: src/plugins/managesieve/sieve_editor.c:85
-#: src/plugins/managesieve/sieve_editor.c:433
-#: src/plugins/managesieve/sieve_editor.c:631
+#: src/addressbook.c:424 src/compose.c:598
+#: src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
 msgstr "De_sar"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
-#: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:629
+#: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
 msgstr "Tan_car"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:227
 msgid "_Select all"
 msgstr "_Seleccionar-ho tot"
 
-#: src/addressbook.c:433 src/addressbook.c:472 src/addressbook.c:488
+#: src/addressbook.c:430 src/addressbook.c:469 src/addressbook.c:485
 msgid "C_ut"
 msgstr "T_allar"
 
-#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
-#: src/plugins/managesieve/sieve_editor.c:96
+#: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
+#: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:617 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "_Enganxar"
 
-#: src/addressbook.c:440 src/addressbook.c:485
+#: src/addressbook.c:437 src/addressbook.c:482
 msgid "New _Address"
 msgstr "Nova _Adreça"
 
-#: src/addressbook.c:441 src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:438 src/addressbook.c:467 src/addressbook.c:483
 msgid "New _Group"
 msgstr "Nou _Grup"
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:440 src/addressbook.c:489
 msgid "_Mail To"
 msgstr "_Correu per"
 
-#: src/addressbook.c:447
+#: src/addressbook.c:444
 msgid "Import _LDIF file..."
 msgstr "Importar fitxer _LDIF..."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:445
 msgid "Import M_utt file..."
 msgstr "Importar fitxer M_utt..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:446
 msgid "Import _Pine file..."
 msgstr "Importar fitxer _Pine..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:448
 msgid "Export _HTML..."
 msgstr "Exportar _HTML..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:449
 msgid "Export LDI_F..."
 msgstr "Exportar LDI_F..."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:451
 msgid "Find duplicates..."
 msgstr "Buscar duplicats..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:452
 msgid "Edit custom attributes..."
 msgstr "Editar atributs personalitzats..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:455 src/compose.c:690 src/mainwindow.c:803
+#: src/messageview.c:339
 msgid "_About"
 msgstr "Qu_ant a"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:491
 msgid "_Browse Entry"
 msgstr "_Cerca Entrada"
 
-#: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:139
-#: src/plugins/pgpcore/sgpgme.c:167 src/plugins/vcalendar/day-view.c:402
+#: src/addressbook.c:504 src/crash.c:457 src/crash.c:476 src/importldif.c:115
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
+#: src/plugins/pgpcore/sgpgme.c:168 src/plugins/vcalendar/day-view.c:402
 #: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:683
 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/addressbook.c:514 src/addressbook.c:533 src/importldif.c:121
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:122
 msgid "Success"
 msgstr "Correcte"
 
-#: src/addressbook.c:515 src/importldif.c:122
+#: src/addressbook.c:512 src/importldif.c:123
 msgid "Bad arguments"
 msgstr "Arguments incorrectes"
 
-#: src/addressbook.c:516 src/importldif.c:123
+#: src/addressbook.c:513 src/importldif.c:124
 msgid "File not specified"
 msgstr "No s'ha especificat l' arxiu"
 
-#: src/addressbook.c:517 src/importldif.c:124
+#: src/addressbook.c:514 src/importldif.c:125
 msgid "Error opening file"
 msgstr "Error obrint l'arxiu"
 
-#: src/addressbook.c:518 src/importldif.c:125
+#: src/addressbook.c:515 src/importldif.c:126
 msgid "Error reading file"
 msgstr "Error llegint l'arxiu"
 
-#: src/addressbook.c:519 src/importldif.c:126
+#: src/addressbook.c:516 src/importldif.c:127
 msgid "End of file encountered"
 msgstr "S'ha trobat el final de l'arxiu"
 
-#: src/addressbook.c:520 src/importldif.c:127
+#: src/addressbook.c:517 src/importldif.c:128
 msgid "Error allocating memory"
 msgstr "Error reservant memòria"
 
-#: src/addressbook.c:521 src/importldif.c:128
+#: src/addressbook.c:518 src/importldif.c:129
 msgid "Bad file format"
 msgstr "Format d'arxiu erroni"
 
-#: src/addressbook.c:522 src/importldif.c:129
+#: src/addressbook.c:519 src/importldif.c:130
 msgid "Error writing to file"
 msgstr "Error escrivint en l'arxiu"
 
-#: src/addressbook.c:523 src/importldif.c:130
+#: src/addressbook.c:520 src/importldif.c:131
 msgid "Error opening directory"
 msgstr "Error obrint el directori"
 
-#: src/addressbook.c:524 src/importldif.c:131
+#: src/addressbook.c:521 src/importldif.c:132
 msgid "No path specified"
 msgstr "No s'ha especificat cap ruta"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:531
 msgid "Error connecting to LDAP server"
 msgstr "Error connectant al servidor LDAP"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:532
 msgid "Error initializing LDAP"
 msgstr "Error inicializant LDAP"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:533
 msgid "Error binding to LDAP server"
 msgstr "Error enllaçant amb el servidor LDAP"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:534
 msgid "Error searching LDAP database"
 msgstr "Error buscant a la base de dades LDAP"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:535
 msgid "Timeout performing LDAP operation"
 msgstr "Fora de temps a la operació LDAP"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:536
 msgid "Error in LDAP search criteria"
 msgstr "Error en el criteri de búsqueda LDAP"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:537
 msgid "No LDAP entries found for search criteria"
 msgstr "No s'ha trobat entrades LDAP per al criteri de búsqueda"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:538
 msgid "LDAP search terminated on request"
 msgstr "S'ha sol·licitat concloure la búsqueda LDAP"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:539
 msgid "Error starting TLS connection"
 msgstr "Error iniciant la connexió TLS"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:540
 msgid "Distinguished Name (dn) is missing"
 msgstr "Nom distingit (dn) no informat"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:541
 msgid "Missing required information"
 msgstr "Informació requerida no s'ha informat"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:542
 msgid "Another contact exists with that key"
 msgstr "Existeix un altre contacte amb aquesta clau"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:543
 msgid "Strong(er) authentication required"
 msgstr "Es requereix una autentificació més forta"
 
-#: src/addressbook.c:913
+#: src/addressbook.c:910
 msgid "Sources"
 msgstr "Fonts"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:914 src/prefs_matcher.c:632 src/prefs_other.c:475
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Llibre d'adreces"
 
-#: src/addressbook.c:1112 src/editldap.c:779
-msgid "Search"
-msgstr "Cercar"
+#: src/addressbook.c:1109
+msgid "Lookup name:"
+msgstr "Nom de búsqueda:"
 
-#: src/addressbook.c:1483
+#: src/addressbook.c:1478
 msgid "Delete group"
 msgstr "Esborrar grup"
 
-#: src/addressbook.c:1484
+#: src/addressbook.c:1479
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -678,27 +687,27 @@ msgstr ""
 "Realment vols esborrar el/s grup/s?\n"
 "Les adreces que conté/contenen es perdran."
 
-#: src/addressbook.c:2195
+#: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 "No es pot enganxar. El llibre d'adreces de destinació és només de lectura."
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
 msgstr "No es pot enganxar dins d'un grup d'adreces."
 
-#: src/addressbook.c:2914
+#: src/addressbook.c:2906
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Vols esborrar els resultats de la búsqueda i adreces en `%s' ?"
 
-#: src/addressbook.c:2917 src/addressbook.c:2943 src/addressbook.c:2950
+#: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
 #: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
 #: src/toolbar.c:415
 msgid "Delete"
 msgstr "Esborrar"
 
-#: src/addressbook.c:2926
+#: src/addressbook.c:2918
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -707,22 +716,21 @@ msgstr ""
 "Vols esborrar '%s' ? Si només esborras la carpeta, les adreces que conté es "
 "mouran a la carpeta mare."
 
-#: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:157
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Delete folder"
 msgstr "Esborrar carpeta"
 
-#: src/addressbook.c:2930
-#, fuzzy
-msgid "Delete _folder only"
+#: src/addressbook.c:2922
+msgid "+Delete _folder only"
 msgstr "+Esborrar només la _carpeta"
 
-#: src/addressbook.c:2930
+#: src/addressbook.c:2922
 msgid "Delete folder and _addresses"
 msgstr "Esborrar la carpeta i les _adreces"
 
-#: src/addressbook.c:2941
+#: src/addressbook.c:2933
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -731,7 +739,7 @@ msgstr ""
 "Vols esborrar '%s'?\n"
 "Les adreces que conté no es perdran."
 
-#: src/addressbook.c:2948
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -740,28 +748,28 @@ msgstr ""
 "Vols esborrar '%s'?\n"
 "Les adreces que conté es perdran."
 
-#: src/addressbook.c:3062
+#: src/addressbook.c:3054
 #, c-format
 msgid "Search '%s'"
 msgstr " Buscar '%s'"
 
-#: src/addressbook.c:3200 src/addressbook.c:3249
+#: src/addressbook.c:3192 src/addressbook.c:3241
 msgid "New Contacts"
 msgstr "Nous Contactes"
 
-#: src/addressbook.c:4088
+#: src/addressbook.c:4022
 msgid "New user, could not save index file."
 msgstr "Nou usuari, no s'ha pogut desar l'arxiu d'índex."
 
-#: src/addressbook.c:4092
+#: src/addressbook.c:4026
 msgid "New user, could not save address book files."
 msgstr "Nou usuari, no s'han pogut desar els arxius d'adreces"
 
-#: src/addressbook.c:4102
+#: src/addressbook.c:4036
 msgid "Old address book converted successfully."
 msgstr "Agenda antiga d'adreces convertida amb èxit"
 
-#: src/addressbook.c:4107
+#: src/addressbook.c:4041
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -769,7 +777,7 @@ msgstr ""
 "L'antiga agenda d'adreces convertida,\n"
 "no s'ha pogut desar el nou arxiu índex."
 
-#: src/addressbook.c:4120
+#: src/addressbook.c:4054
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -777,7 +785,7 @@ msgstr ""
 "No s'ha pogut convertir l'agenda antiga,\n"
 "pero s'han creat nous arxius d'adreces buits."
 
-#: src/addressbook.c:4126
+#: src/addressbook.c:4060
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -785,7 +793,7 @@ msgstr ""
 "No s'ha pogut convertir l'agenda d'adrecess,\n"
 "No s'ha pogut desar el nou arxiu índex."
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4065
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -793,53 +801,53 @@ msgstr ""
 "No s'ha pogut convertir l'agenda antiga\n"
 "i no s'han pogut crear els arxius per la nova."
 
-#: src/addressbook.c:4138 src/addressbook.c:4144
+#: src/addressbook.c:4072 src/addressbook.c:4078
 msgid "Addressbook conversion error"
 msgstr "Error en la conversió de l'agenda"
 
-#: src/addressbook.c:4258
+#: src/addressbook.c:4192
 msgid "Addressbook Error"
 msgstr "Error en l'agenda"
 
-#: src/addressbook.c:4259
+#: src/addressbook.c:4193
 msgid "Could not read address index"
 msgstr "No s'ha pogut llegir l'índex d'adreces"
 
-#: src/addressbook.c:4590
+#: src/addressbook.c:4524
 msgid "Busy searching..."
 msgstr "Buscant..."
 
-#: src/addressbook.c:4899
+#: src/addressbook.c:4825
 msgid "Interface"
 msgstr "Interficie"
 
-#: src/addressbook.c:4911 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
-#: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
+#: src/addressbook.c:4837 src/addressbook_foldersel.c:182 src/exphtmldlg.c:372
+#: src/expldifdlg.c:389 src/exporthtml.c:984 src/importldif.c:658
 msgid "Address Book"
 msgstr "Agenda d'adreces"
 
-#: src/addressbook.c:4923
+#: src/addressbook.c:4849
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/addressbook.c:4885 src/exporthtml.c:884 src/folderview.c:345
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:4971
+#: src/addressbook.c:4897
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4983 src/addressbook.c:4995
+#: src/addressbook.c:4909 src/addressbook.c:4921
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5007
+#: src/addressbook.c:4933
 msgid "LDAP servers"
 msgstr "Servidors LDAP"
 
-#: src/addressbook.c:5019
+#: src/addressbook.c:4945
 msgid "LDAP Query"
 msgstr "Petició LDAP"
 
@@ -851,86 +859,86 @@ msgstr "Petició LDAP"
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:117
-#: src/plugins/spamassassin/spamassassin_gtk.c:442
-#: src/plugins/spamassassin/spamassassin_gtk.c:489
-#: src/plugins/spamassassin/spamassassin_gtk.c:612 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1625
-#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1635 src/prefs_matcher.c:2519
-#: src/prefs_matcher.c:2523
+#: src/plugins/spamassassin/spamassassin_gtk.c:443
+#: src/plugins/spamassassin/spamassassin_gtk.c:490
+#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1619 src/prefs_matcher.c:1626
+#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1636 src/prefs_matcher.c:2524
+#: src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Qualsevol"
 
-#: src/addrgather.c:173
+#: src/addrgather.c:172
 msgid "Please specify name for address book."
 msgstr "Especifiqueu el nom de l'agenda, si us plau."
 
-#: src/addrgather.c:180
+#: src/addrgather.c:179
 msgid "No available address book."
 msgstr "No hi ha cap llibre d'adreces disponible."
 
-#: src/addrgather.c:201
+#: src/addrgather.c:200
 msgid "Please select the mail headers to search."
 msgstr "Seleccioneu les capçaleres a buscar si us plau."
 
-#: src/addrgather.c:208
+#: src/addrgather.c:207
 msgid "Collecting addresses..."
 msgstr "Recopilant adreces..."
 
-#: src/addrgather.c:248
+#: src/addrgather.c:247
 msgid "address added by claws-mail"
 msgstr "adreça afegida per claws-mail"
 
-#: src/addrgather.c:276
+#: src/addrgather.c:275
 msgid "Addresses collected successfully."
 msgstr "Adreces recopilades amb èxit."
 
-#: src/addrgather.c:351
+#: src/addrgather.c:357
 msgid "Current folder:"
 msgstr "Carpeta actual:"
 
-#: src/addrgather.c:362
+#: src/addrgather.c:368
 msgid "Address book name:"
 msgstr "Nom de l'agenda d'adreces:"
 
-#: src/addrgather.c:389
+#: src/addrgather.c:395
 msgid "Address book folder size:"
 msgstr "Tamany de la carpeta de l'agenda d'adresses:"
 
-#: src/addrgather.c:393 src/addrgather.c:403
+#: src/addrgather.c:399 src/addrgather.c:409
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr "Número màxim d'entrades per carpeta dins de la nova agenda creada"
 
-#: src/addrgather.c:407
+#: src/addrgather.c:413
 msgid "Process these mail header fields"
 msgstr "Processar les següents capçaleres"
 
-#: src/addrgather.c:426
+#: src/addrgather.c:432
 msgid "Include subfolders"
 msgstr "Incloure subcarpetes"
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1425
+#: src/addrgather.c:456 src/prefs_filtering_action.c:1425
 msgid "Header Name"
 msgstr "Nom de capçalera"
 
-#: src/addrgather.c:451
+#: src/addrgather.c:457
 msgid "Address Count"
 msgstr "Comptador d'adreces"
 
-#: src/addrgather.c:561
+#: src/addrgather.c:567
 msgid "Header Fields"
 msgstr "Camps de capçalera"
 
-#: src/addrgather.c:562 src/exphtmldlg.c:658 src/expldifdlg.c:722
-#: src/importldif.c:1022
+#: src/addrgather.c:568 src/exphtmldlg.c:659 src/expldifdlg.c:723
+#: src/importldif.c:1023
 msgid "Finish"
 msgstr "Finalitzar"
 
-#: src/addrgather.c:620
+#: src/addrgather.c:626
 msgid "Collect email addresses from selected messages"
 msgstr "Recopilar adreces de correu dels missatges seleccionats"
 
-#: src/addrgather.c:624
+#: src/addrgather.c:630
 msgid "Collect email addresses from folder"
 msgstr "Recopilar adreces de correu de la carpeta"
 
@@ -958,19 +966,20 @@ msgstr "Modificació d'adreça/es"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Modificació fallida. Canvis no escrits al directori."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "Notificació"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
+#: src/compose.c:11779 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4871
 msgid "Warning"
 msgstr "Avís"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5615 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:270
 msgid "Error"
 msgstr "Error"
 
@@ -982,6 +991,10 @@ msgstr "_Veure la traça"
 msgid "Show this message next time"
 msgstr "Mostrar aquest missatge la propera vegada"
 
+#: src/avatars.c:102
+msgid "Failed to register avatars internal rendering hook"
+msgstr "Ha fallat el registre intern de renderització de l'avatar"
+
 #: src/browseldap.c:218
 msgid "Browse Directory Entry"
 msgstr "Veure entrada del directori"
@@ -1002,68 +1015,68 @@ msgstr "Nom LDAP"
 msgid "Attribute Value"
 msgstr "Valor de l'atribut"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:65
 msgid "Nothing"
 msgstr "Res"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:66
 msgid "a viewer"
 msgstr "un visor"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:67
 msgid "a MIME parser"
 msgstr "un parsejador MIME"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:68
 msgid "folders"
 msgstr "carpetes"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:69
 msgid "filtering"
 msgstr "filtrant"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:70
 msgid "a privacy interface"
 msgstr "una interfície de privacitat"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:71
 msgid "a notifier"
 msgstr "un notificador"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:72
 msgid "an utility"
 msgstr "una utilitat"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:73
 msgid "things"
 msgstr "coses"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:334
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 "Aquest mòdul proporciona %s (%s), que ja és proporcionat per el mòdul %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:436
 msgid "Plugin already loaded"
 msgstr "Connector ja carregat"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:447
 msgid "Failed to allocate memory for Plugin"
 msgstr "Error en petició de memòria per al plug-in"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:481
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Aquest mòdul no està llicenciat sota la GPL v3 ni cap llicència compatible "
 "posterior."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:490
 msgid "This module is for Claws Mail GTK1."
 msgstr "Aquest mòdul es per Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:772
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1072,7 +1085,7 @@ msgstr ""
 "La vostra versió de Claws Mail és més nova que la versió amb la que el mòdul "
 "'%s' fou linkat."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:775
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1080,16 +1093,16 @@ msgstr ""
 "La vostra versió de Claws Mail és més nova que la versió amb la que el mòdul "
 "fou linkat."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:784
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "La vostra versió de Claws Mail és massa antiga per al mòdul '%s'."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:786
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "La vostra versió de Claws Mail és massa antiga per al mòdul."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "Negociació SSL fallida\n"
 
@@ -1122,30 +1135,40 @@ msgstr "El missatge és massa gran (Tamany màxim %s)\n"
 msgid "couldn't start TLS session\n"
 msgstr "no es pot iniciar la sessió TLS\n"
 
-#: src/common/socket.c:569
+#: src/common/socket.c:573
 msgid "Socket IO timeout.\n"
 msgstr "Temps d'espera excedit per Socket E/S.\n"
 
-#: src/common/socket.c:598
+#: src/common/socket.c:602
 msgid "Connection timed out.\n"
 msgstr "La connexió ha excedit el temps d'espera.\n"
 
-#: src/common/socket.c:732
+#: src/common/socket.c:630
+#, c-format
+msgid "%s: host lookup timed out.\n"
+msgstr "%s: la cerca de l'amfitrió a superat el temps d'espera\n"
+
+#: src/common/socket.c:643
+#, c-format
+msgid "%s: unknown host.\n"
+msgstr "%s amfitrió desconegut.\n"
+
+#: src/common/socket.c:831
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: Connexió fallida (%s).\n"
 
-#: src/common/socket.c:972
+#: src/common/socket.c:1071
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: amfitrió desconegut.\n"
 
-#: src/common/socket.c:1064
+#: src/common/socket.c:1166
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: la cerca de l'amfitrió ha fallat (%s).\n"
 
-#: src/common/socket.c:1368
+#: src/common/socket.c:1515
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escrit a fd%d: %s\n"
@@ -1231,585 +1254,585 @@ msgstr "El fitxer del certificat P12 %s no s'ha trobat (%s)\n"
 msgid "<not in certificate>"
 msgstr "<no en el certificat>"
 
-#: src/common/string_match.c:81
+#: src/common/string_match.c:83
 msgid "(Subject cleared by RegExp)"
 msgstr "(Assumpte buit per Exp.reg.)"
 
-#: src/common/utils.c:257
+#: src/common/utils.c:355
 #, c-format
 msgid "%dB"
 msgstr "%d B"
 
-#: src/common/utils.c:258
+#: src/common/utils.c:356
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:357
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:260
+#: src/common/utils.c:358
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4806
+#: src/common/utils.c:4971
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: src/common/utils.c:4807
+#: src/common/utils.c:4972
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Dilluns"
 
-#: src/common/utils.c:4808
+#: src/common/utils.c:4973
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: src/common/utils.c:4809
+#: src/common/utils.c:4974
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: src/common/utils.c:4810
+#: src/common/utils.c:4975
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Dijous"
 
-#: src/common/utils.c:4811
+#: src/common/utils.c:4976
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Divendres"
 
-#: src/common/utils.c:4812
+#: src/common/utils.c:4977
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4979
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Gener"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4980
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrer"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4981
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Març"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4982
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4983
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maig"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4984
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juny"
 
-#: src/common/utils.c:4820
+#: src/common/utils.c:4985
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juliol"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4986
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agost"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4987
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Setembre"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4988
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4989
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembre"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4990
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Desembre"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4992
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dm"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4993
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Dl"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4994
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Dm"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4995
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Dx"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4996
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Dj"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4997
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Dv"
 
-#: src/common/utils.c:4833
+#: src/common/utils.c:4998
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Ds"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:5000
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Gen"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:5001
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:5002
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:5003
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:5004
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:5005
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4841
+#: src/common/utils.c:5006
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:5007
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:5008
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Set"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:5009
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:5010
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:5011
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Des"
 
-#: src/common/utils.c:4857
+#: src/common/utils.c:5022
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4858
+#: src/common/utils.c:5023
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4859
+#: src/common/utils.c:5024
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4860
+#: src/common/utils.c:5025
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:576
+#: src/compose.c:570
 msgid "_Add..."
 msgstr "_Afegir..."
 
-#: src/compose.c:577 src/mh_gtk.c:368 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:318
+#: src/compose.c:571 src/mh_gtk.c:369 src/plugins/mailmbox/plugin_gtk.c:302
+#: src/plugins/rssyl/rssyl_cb_menu.c:320
 msgid "_Remove"
 msgstr "_Esborrar"
 
-#: src/compose.c:579 src/folderview.c:241
+#: src/compose.c:573 src/folderview.c:241
 msgid "_Properties..."
 msgstr "_Propietats..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:580 src/mainwindow.c:508 src/messageview.c:212
 msgid "_Message"
 msgstr "_Missatge"
 
-#: src/compose.c:589
+#: src/compose.c:583
 msgid "_Spelling"
 msgstr "_Ortografia"
 
-#: src/compose.c:591 src/compose.c:658
+#: src/compose.c:585 src/compose.c:652
 msgid "_Options"
 msgstr "_Opcions"
 
-#: src/compose.c:595
+#: src/compose.c:589
 msgid "S_end"
 msgstr "_Enviar"
 
-#: src/compose.c:596
+#: src/compose.c:590
 msgid "Send _later"
 msgstr "Enviar _després"
 
-#: src/compose.c:599
+#: src/compose.c:593
 msgid "_Attach file"
 msgstr "_Adjuntar arxiu"
 
-#: src/compose.c:600
+#: src/compose.c:594
 msgid "_Insert file"
 msgstr "_Insertar arxiu"
 
-#: src/compose.c:601
+#: src/compose.c:595
 msgid "Insert si_gnature"
 msgstr "Insertar si_gnatura"
 
-#: src/compose.c:602
+#: src/compose.c:596
 msgid "_Replace signature"
 msgstr "_Reemplaçar signatura"
 
-#: src/compose.c:606
+#: src/compose.c:600
 msgid "_Print"
 msgstr "Im_primir"
 
-#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "_Desfer"
 
-#: src/compose.c:612 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "_refer"
 
-#: src/compose.c:615 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "_Tallar"
 
-#: src/compose.c:619
+#: src/compose.c:613
 msgid "_Special paste"
 msgstr "Enganxat e_special"
 
-#: src/compose.c:620
+#: src/compose.c:614
 msgid "As _quotation"
 msgstr "Com a _citació"
 
-#: src/compose.c:621
+#: src/compose.c:615
 msgid "_Wrapped"
 msgstr "_A_justar"
 
-#: src/compose.c:622
+#: src/compose.c:616
 msgid "_Unwrapped"
 msgstr "_Desa_justar"
 
-#: src/compose.c:624 src/mainwindow.c:547
-#: src/plugins/managesieve/sieve_editor.c:99
+#: src/compose.c:618 src/mainwindow.c:541
+#: src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "Seleccion_ar tot"
 
-#: src/compose.c:626
+#: src/compose.c:620
 msgid "A_dvanced"
 msgstr "Avança_des"
 
-#: src/compose.c:627
+#: src/compose.c:621
 msgid "Move a character backward"
 msgstr "Anar al caràcter anterior"
 
-#: src/compose.c:628
+#: src/compose.c:622
 msgid "Move a character forward"
 msgstr "Anar al caràcter següent"
 
-#: src/compose.c:629
+#: src/compose.c:623
 msgid "Move a word backward"
 msgstr "Anar a la paraula anterior"
 
-#: src/compose.c:630
+#: src/compose.c:624
 msgid "Move a word forward"
 msgstr "Anar a la paraula següent"
 
-#: src/compose.c:631
+#: src/compose.c:625
 msgid "Move to beginning of line"
 msgstr "Anar a l'inici de la línia"
 
-#: src/compose.c:632
+#: src/compose.c:626
 msgid "Move to end of line"
 msgstr "Anar al final de la línia"
 
-#: src/compose.c:633
+#: src/compose.c:627
 msgid "Move to previous line"
 msgstr "Anar a la línia anterior"
 
-#: src/compose.c:634
+#: src/compose.c:628
 msgid "Move to next line"
 msgstr "Anar a la línia següent"
 
-#: src/compose.c:635
+#: src/compose.c:629
 msgid "Delete a character backward"
 msgstr "Esborrar el caràcter anterior"
 
-#: src/compose.c:636
+#: src/compose.c:630
 msgid "Delete a character forward"
 msgstr "Esborrar el caràcter següent"
 
-#: src/compose.c:637
+#: src/compose.c:631
 msgid "Delete a word backward"
 msgstr "Esborrar la paraula anterior"
 
-#: src/compose.c:638
+#: src/compose.c:632
 msgid "Delete a word forward"
 msgstr "Esborrar la paraula següent"
 
-#: src/compose.c:639
+#: src/compose.c:633
 msgid "Delete line"
 msgstr "Esborrar línia"
 
-#: src/compose.c:640
+#: src/compose.c:634
 msgid "Delete to end of line"
 msgstr "Esborrar fins a final de línia"
 
-#: src/compose.c:643 src/messageview.c:228
-#: src/plugins/managesieve/sieve_editor.c:102
+#: src/compose.c:637 src/messageview.c:229
+#: src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "_Buscar"
 
-#: src/compose.c:646
+#: src/compose.c:640
 msgid "_Wrap current paragraph"
 msgstr "_Retallar paragraf actual"
 
-#: src/compose.c:647
+#: src/compose.c:641
 msgid "Wrap all long _lines"
 msgstr "Tallar totes les _línies llargues"
 
-#: src/compose.c:649
+#: src/compose.c:643
 msgid "Edit with e_xternal editor"
 msgstr "Editar amb un editor e_xtern"
 
-#: src/compose.c:652
+#: src/compose.c:646
 msgid "_Check all or check selection"
 msgstr "_Comprovar tot o la selecció"
 
-#: src/compose.c:653
+#: src/compose.c:647
 msgid "_Highlight all misspelled words"
 msgstr "_Ressaltar totes les faltes ortogràfiques"
 
-#: src/compose.c:654
+#: src/compose.c:648
 msgid "Check _backwards misspelled word"
 msgstr "Comprovar faltes d'ortografia cap _enrera"
 
-#: src/compose.c:655
+#: src/compose.c:649
 msgid "_Forward to next misspelled word"
 msgstr "Avançar fins a la següent _falta d'ortografia"
 
-#: src/compose.c:663
+#: src/compose.c:657
 msgid "Reply _mode"
 msgstr "Mode de resposta"
 
-#: src/compose.c:665
+#: src/compose.c:659
 msgid "Privacy _System"
 msgstr "_Sistema de privacitat"
 
-#: src/compose.c:670
+#: src/compose.c:664
 msgid "_Priority"
 msgstr "_Prioritat"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:666 src/mainwindow.c:605 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Codificació d_e caràcters"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:671 src/mainwindow.c:610 src/messageview.c:270
 msgid "Western European"
 msgstr "Europeu Occidental"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:672 src/mainwindow.c:611 src/messageview.c:271
 msgid "Baltic"
 msgstr "Bàltic"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:673 src/mainwindow.c:612 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:674 src/mainwindow.c:613 src/messageview.c:273
 msgid "Arabic"
 msgstr "Àrab"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:675 src/mainwindow.c:614 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Ciríl·lic "
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:676 src/mainwindow.c:615 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonès"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:677 src/mainwindow.c:616 src/messageview.c:276
 msgid "Chinese"
 msgstr "Xinès"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:678 src/mainwindow.c:617 src/messageview.c:277
 msgid "Korean"
 msgstr "Coreà"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:679 src/mainwindow.c:618 src/messageview.c:278
 msgid "Thai"
 msgstr "Tailandès"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:682 src/mainwindow.c:725 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Agenda d'adreces"
 
-#: src/compose.c:690
+#: src/compose.c:684
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:686 src/mainwindow.c:753 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Accio_ns"
 
-#: src/compose.c:701
+#: src/compose.c:695
 msgid "Aut_o wrapping"
 msgstr "Aut_o-retallar"
 
-#: src/compose.c:702
+#: src/compose.c:696
 msgid "Auto _indent"
 msgstr "Auto _sagnat"
 
-#: src/compose.c:703
+#: src/compose.c:697
 msgid "Si_gn"
 msgstr "Si_gnar"
 
-#: src/compose.c:704
+#: src/compose.c:698
 msgid "_Encrypt"
 msgstr "_Encriptat"
 
-#: src/compose.c:705
+#: src/compose.c:699
 msgid "_Request Return Receipt"
 msgstr "Sollicitar justificant de _recepció"
 
-#: src/compose.c:706
+#: src/compose.c:700
 msgid "Remo_ve references"
 msgstr "Esb_orrar referències"
 
-#: src/compose.c:707
+#: src/compose.c:701
 msgid "Show _ruler"
 msgstr "Mostrar gestor de _regles"
 
-#: src/compose.c:712 src/compose.c:722
+#: src/compose.c:706 src/compose.c:716
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:707 src/mainwindow.c:659 src/messageview.c:303
 msgid "_All"
 msgstr "_Tothom"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:708 src/mainwindow.c:660 src/messageview.c:304
 msgid "_Sender"
 msgstr "_Remitent"
 
-#: src/compose.c:715
+#: src/compose.c:709
 msgid "_Mailing-list"
 msgstr "_Llista-Correu"
 
-#: src/compose.c:720
+#: src/compose.c:714
 msgid "_Highest"
 msgstr "Més _alta"
 
-#: src/compose.c:721
+#: src/compose.c:715
 msgid "Hi_gh"
 msgstr "A_lta"
 
-#: src/compose.c:723
+#: src/compose.c:717
 msgid "Lo_w"
 msgstr "Bai_xa"
 
-#: src/compose.c:724
+#: src/compose.c:718
 msgid "_Lowest"
 msgstr "Més _baixa"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:723 src/mainwindow.c:868 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automàtic"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:724 src/mainwindow.c:869 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:725 src/mainwindow.c:870 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:729 src/mainwindow.c:874 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centreeuropeu (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:732 src/mainwindow.c:877 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grec (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:737 src/mainwindow.c:882 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turc (ISO-8859-_9)"
 
-#: src/compose.c:1072
+#: src/compose.c:1066
 msgid "New message From format error."
 msgstr "Nou error de format al 'Des de' del nou missatge."
 
-#: src/compose.c:1164
+#: src/compose.c:1158
 msgid "New message subject format error."
 msgstr "Error de format a l'assumpte' del nou missatge."
 
-#: src/compose.c:1195 src/quote_fmt.c:569
+#: src/compose.c:1189 src/quote_fmt.c:569
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "El cos de la plantilla \" Nou missatge\" té un error a la línia %d."
 
-#: src/compose.c:1456
+#: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "No es por respondre. Probablement el missatge original no existeix."
 
-#: src/compose.c:1639 src/quote_fmt.c:586
+#: src/compose.c:1633 src/quote_fmt.c:586
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1817,12 +1840,12 @@ msgstr ""
 "El camp \"Des de\" de la plantilla \"Respondre\" conté una adreça d'email "
 "errònia "
 
-#: src/compose.c:1687 src/quote_fmt.c:589
+#: src/compose.c:1681 src/quote_fmt.c:589
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "El cos de la plantilla \"Respondre\" té un error a la línia %d."
 
-#: src/compose.c:1823 src/compose.c:2015 src/quote_fmt.c:606
+#: src/compose.c:1817 src/compose.c:2009 src/quote_fmt.c:606
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1830,56 +1853,56 @@ msgstr ""
 "El camp \"Des de\" de la plantilla \"Reenviar\" conté una adreça d'email "
 "errònia "
 
-#: src/compose.c:1883 src/quote_fmt.c:609
+#: src/compose.c:1877 src/quote_fmt.c:609
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "El cos de la plantilla \"Reenviar\" conté un error a la línia %d."
 
-#: src/compose.c:2057
+#: src/compose.c:2051
 msgid "Fw: multiple emails"
 msgstr "Fw: multiples emails"
 
-#: src/compose.c:2540
+#: src/compose.c:2531
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "El cos de la plantilla \"Redireccionar\" conté un error a la línia %d."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2598 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2601 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2604 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Respondre a:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2607 src/compose.c:4929 src/compose.c:4931
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grups de notícies:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2610 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Enviar a:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2613 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En-Resposta-A:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2617 src/compose.c:4926 src/compose.c:4934
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Per a:"
 
-#: src/compose.c:2835
+#: src/compose.c:2826
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "No s'ha pogut adjuntar l'arxiu (conversió de joc de caràcters fallida)."
 
-#: src/compose.c:2841
+#: src/compose.c:2832
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1894,16 +1917,16 @@ msgstr[1] ""
 "Els següents arxius han estat adjuntats:\n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3105
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "El \"símbol de cometa\" de la plantilla és erroni."
 
-#: src/compose.c:3605
+#: src/compose.c:3596
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "No s'ha pogut obtenir el tamany de l'arxiu '%s'."
 
-#: src/compose.c:3616
+#: src/compose.c:3607
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1912,58 +1935,56 @@ msgstr ""
 "Estàs a punt d'insertar un arxiu de %s al cos del missatge. Estàs segur de "
 "que ho vols continuar?"
 
-#: src/compose.c:3619
+#: src/compose.c:3610
 msgid "Are you sure?"
 msgstr "Estàs segur?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
-msgid "_Insert"
-msgstr "_Insertar"
+#: src/compose.c:3611 src/compose.c:11261
+msgid "+_Insert"
+msgstr "+_Insertar"
 
-#: src/compose.c:3744
+#: src/compose.c:3735
 #, c-format
 msgid "File %s is empty."
 msgstr "L'arxiu %s es buit."
 
-#: src/compose.c:3745
+#: src/compose.c:3736
 msgid "Empty file"
 msgstr "Fitxer buit"
 
-#: src/compose.c:3746
-#, fuzzy
-msgid "_Attach anyway"
+#: src/compose.c:3737
+msgid "+_Attach anyway"
 msgstr "+_Adjuntar de totes maneres"
 
-#: src/compose.c:3755
+#: src/compose.c:3746
 #, c-format
 msgid "Can't read %s."
 msgstr "No es pot llegir %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3773
 #, c-format
 msgid "Message: %s"
 msgstr "Missatge: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
-#: src/plugins/python/composewindowtype.c:421
+#: src/compose.c:4766 src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Editat]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4773 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composar missatge%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4776 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sense assumpte] - Composar missatge%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4778 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Composar missatge"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4805 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1971,54 +1992,53 @@ msgstr ""
 "No heu especificar cap compte per a enviar.\n"
 "Seleccioneu algun compte abans d'enviar."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5025 src/compose.c:5057 src/compose.c:5099
+#: src/plugins/attachwarner/attachwarner.c:217 src/prefs_account.c:3270
+#: src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:5035
+#: src/compose.c:5026
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "L'unic destinatari és l'adreça CC per defecte. Enviar de totes maneres?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
-#: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
-msgid "_Send"
-msgstr "_Enviar"
+#: src/compose.c:5027 src/compose.c:5059 src/compose.c:5092 src/compose.c:5615
+#: src/plugins/attachwarner/attachwarner.c:209
+msgid "+_Send"
+msgstr "+_Enviar"
 
-#: src/compose.c:5067
+#: src/compose.c:5058
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "L'unic destinatari és l'adreça BCC per defecte. Enviar de totes maneres?"
 
-#: src/compose.c:5084
+#: src/compose.c:5075
 msgid "Recipient is not specified."
 msgstr "No heu especificat el destinatari."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
-#, fuzzy
-msgid "_Queue"
+#: src/compose.c:5094 src/plugins/attachwarner/attachwarner.c:211
+msgid "+_Queue"
 msgstr "+_Cua"
 
-#: src/compose.c:5104
+#: src/compose.c:5095
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "L'assumpte es buit. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5096
 msgid "Send it anyway?"
 msgstr "Enviar-lo de totes maneres?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5097
 msgid "Queue it anyway?"
 msgstr "Encuar-lo de totes maneres?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5099 src/toolbar.c:425
 msgid "Send later"
 msgstr "Enviar després"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2028,7 +2048,7 @@ msgstr ""
 "\n"
 "Conversió de joc de caràcters fallida."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2038,7 +2058,7 @@ msgstr ""
 "\n"
 "No s'ha pogut obtenir la clau d'encriptament per al recipient."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2049,7 +2069,7 @@ msgstr ""
 "\n"
 "Signatura fallida: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5164
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2060,11 +2080,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5166
 msgid "Could not queue message for sending."
 msgstr "No s'ha pogut encuar el missatge per enviar."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5181 src/compose.c:5241
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2072,7 +2092,7 @@ msgstr ""
 "El missatge està en cua però no s'ha pogut enviar.\n"
 "Useu \"Enviar missatge(s) en cua\" en la finestra principal per enviar-lo"
 
-#: src/compose.c:5246
+#: src/compose.c:5237
 #, c-format
 msgid ""
 "%s\n"
@@ -2081,7 +2101,7 @@ msgstr ""
 "%s\n"
 "Useu \"Enviar missatge(s) en cua\" en la finestra principal per reenviar-lo"
 
-#: src/compose.c:5621
+#: src/compose.c:5612
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2092,7 +2112,7 @@ msgstr ""
 "al joc de caràcters %s especificat.\n"
 "Enviar-lo com a %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2105,101 +2125,100 @@ msgstr ""
 "\n"
 "Vols enviar-lo de totes maneres?"
 
-#: src/compose.c:5790
+#: src/compose.c:5780
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "No s'ha pogut encriptar el correu: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5901
 msgid "Encryption warning"
 msgstr "Avís d'encriptació"
 
-#: src/compose.c:5912
-#, fuzzy
-msgid "C_ontinue"
+#: src/compose.c:5902
+msgid "+C_ontinue"
 msgstr "+C_ontinuar"
 
-#: src/compose.c:5961
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
 msgstr "No hi ha cap compte disponible per enviar correus!"
 
-#: src/compose.c:5970
+#: src/compose.c:5960
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 "El compte seleccionat no és de tipus NNTP: La publicació no es possible."
 
-#: src/compose.c:6205
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "L'adjunt %s ja no existeix. Ignorar-lo?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Cancel·lar l'enviament"
 
-#: src/compose.c:6206
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "Ignorar l'adjunt"
 
-#: src/compose.c:6246
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
 msgstr "Part %s original"
 
-#: src/compose.c:6824
+#: src/compose.c:6818
 msgid "Add to address _book"
 msgstr "Afegir al lli_bre d'adresses"
 
-#: src/compose.c:6985
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "Esborrar el contingut"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Useu <tab> per autocompletar desde el llibre d'adresses"
 
-#: src/compose.c:7204
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:434
-#: src/prefs_summary_column.c:85 src/summaryview.c:444
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "Tamany"
 
-#: src/compose.c:7273
+#: src/compose.c:7270
 msgid "Save Message to "
 msgstr "Desar el missatge en "
 
-#: src/compose.c:7310 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:1025
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518
+#: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
+#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
 #: src/plugins/clamd/clamav_plugin_gtk.c:299
-#: src/plugins/spamassassin/spamassassin_gtk.c:417
+#: src/plugins/spamassassin/spamassassin_gtk.c:418
 msgid "_Browse"
 msgstr "_Veure"
 
-#: src/compose.c:7783
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "Ca_pçalera"
 
-#: src/compose.c:7788
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "_Adjunts"
 
-#: src/compose.c:7802
+#: src/compose.c:7799
 msgid "Othe_rs"
 msgstr "Alt_res"
 
-#: src/compose.c:7817
+#: src/compose.c:7814
 msgid "S_ubject:"
 msgstr "Ass_umpte:"
 
-#: src/compose.c:8041
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2208,19 +2227,24 @@ msgstr ""
 "No s'ha pogut iniciar el corrector ortogràfic.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8146
+#, c-format
+msgid "<i>%s</i>"
+msgstr "<i>%s</i>"
+
+#: src/compose.c:8176
 msgid "_From:"
 msgstr "_De:"
 
-#: src/compose.c:8197
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "Compte a usar per aquest correu electrònic"
 
-#: src/compose.c:8199
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "Adreça del remitent a usar"
 
-#: src/compose.c:8365
+#: src/compose.c:8361
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2229,68 +2253,68 @@ msgstr ""
 "El sistema de privacitat '%s' no s'ha pogut carregar. No podreu signar o "
 "encriptar aquest missatge."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "_Cap"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "El cos de la plantilla té un error a la línia %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "Error de format el 'Des de' de la plantilla."
 
-#: src/compose.c:8701
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "Error de format en el Per a de la plantilla."
 
-#: src/compose.c:8719
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "Error de format en el Cc de la plantilla."
 
-#: src/compose.c:8737
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "Error de format en el Bcc de la plantilla."
 
-#: src/compose.c:8755
+#: src/compose.c:8751
 msgid "Template Reply-To format error."
 msgstr "Hi ha un error en la plantilla de Respondre-a"
 
-#: src/compose.c:8774
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "Error de format en l'assumpte de la plantilla."
 
-#: src/compose.c:9043
+#: src/compose.c:9039
 msgid "Invalid MIME type."
 msgstr "Tipus MIME invàlid."
 
-#: src/compose.c:9058
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "L'arxiu no existeix o és buit."
 
-#: src/compose.c:9132
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "Propietats"
 
-#: src/compose.c:9149
+#: src/compose.c:9145
 msgid "MIME type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:9190
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "Codificació"
 
-#: src/compose.c:9210
+#: src/compose.c:9206
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:9211
+#: src/compose.c:9207
 msgid "File name"
 msgstr "Nom d'arxiu"
 
-#: src/compose.c:9462
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2301,15 +2325,15 @@ msgstr ""
 "Vols acabar el procés?\n"
 "Id. de procés: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9824 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mails necessita accés a la xarxa per enviar aquest correu."
 
-#: src/compose.c:9977
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "No s'ha pogut encuar el missatge."
 
-#: src/compose.c:9979
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2320,15 +2344,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10030
 msgid "Could not save draft."
 msgstr "No s'ha pogut desar el borrador."
 
-#: src/compose.c:10161
+#: src/compose.c:10034
 msgid "Could not save draft"
 msgstr "No s'ha pogut desar el borrador"
 
-#: src/compose.c:10162
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2336,24 +2360,24 @@ msgstr ""
 "No es pot desar l'esborrany.\n"
 "Vols cancel·lar la sortida o descartar aquest missatge?"
 
-#: src/compose.c:10164
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "_Cancel·lar sortir"
 
-#: src/compose.c:10164
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_Descartar el correu"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "Seleccionar arxiu"
 
-#: src/compose.c:10352
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No s'ha pogut llegir l'arxiu '%s'."
 
-#: src/compose.c:10354
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2362,54 +2386,62 @@ msgstr ""
 "L'arxiu '%s' contenia caràcters invàlids per a\n"
 "la codificació actual, la inserció pot ser incorrecta."
 
-#: src/compose.c:10441
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "Descartar missatge"
 
-#: src/compose.c:10442
+#: src/compose.c:10315
 msgid "This message has been modified. Discard it?"
 msgstr "Aquest missatge ha estat modificat. Vols descartar-lo?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10316
 msgid "_Save to Drafts"
 msgstr "De_sar en Borradors"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
 msgstr "Desar els canvis"
 
-#: src/compose.c:10446
+#: src/compose.c:10319
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Aquest missatge ha estat modificat. Vols desar els últims canvis?"
 
-#: src/compose.c:10447
+#: src/compose.c:10320
 msgid "_Don't save"
 msgstr "No _desar"
 
-#: src/compose.c:10518
+#: src/compose.c:10320
+msgid "+_Save to Drafts"
+msgstr "+De_sar en Esborranys"
+
+#: src/compose.c:10390
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vols aplicar la plantilla '%s'?"
 
-#: src/compose.c:10520
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10393 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Reemplaçar"
 
-#: src/compose.c:11379
+#: src/compose.c:10393
+msgid "_Insert"
+msgstr "_Insertar"
+
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "Insertar o adjuntar?"
 
-#: src/compose.c:11380
+#: src/compose.c:11259
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2417,16 +2449,16 @@ msgstr ""
 "Vols insertar el contingut de/dels arxius(s) dins el cos del missatge, o "
 "adjuntar-lo al correu?"
 
-#: src/compose.c:11382
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: src/compose.c:11599
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de format de la cita a la línia %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11773
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2435,16 +2467,16 @@ msgstr ""
 "Estàs a punt de contestar a %d missatges. Obrir la finestra pot trigar una "
 "mica. Vols continuar?"
 
-#: src/crash.c:140
+#: src/crash.c:141
 #, c-format
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr "El procés Claws Mail (%ld) ha rebut el senyal %ld"
 
-#: src/crash.c:186
+#: src/crash.c:187
 msgid "Claws Mail has crashed"
 msgstr "Claws Mail ha acabat incorrectament"
 
-#: src/crash.c:202
+#: src/crash.c:203
 #, c-format
 msgid ""
 "%s.\n"
@@ -2453,23 +2485,23 @@ msgstr ""
 "%s.\n"
 "Per favor, ompliu un informe d'error i incloeu la informació següent."
 
-#: src/crash.c:207
+#: src/crash.c:208
 msgid "Debug log"
 msgstr "Traça de depuració"
 
-#: src/crash.c:251 src/toolbar.c:422
+#: src/crash.c:252 src/toolbar.c:422
 msgid "Close"
 msgstr "Tancar"
 
-#: src/crash.c:256
+#: src/crash.c:257
 msgid "Save..."
 msgstr "Desar..."
 
-#: src/crash.c:261
+#: src/crash.c:262
 msgid "Create bug report"
 msgstr "Crear informe d'error"
 
-#: src/crash.c:311
+#: src/crash.c:312
 msgid "Save crash information"
 msgstr "Desar l'informació de la fallada"
 
@@ -2538,7 +2570,7 @@ msgstr "S'ha d'especificar una Adreça de Correu."
 msgid "A Name and Value must be supplied."
 msgstr "S'ha d'especificar un Nom i un Valor"
 
-#: src/editaddress.c:676 src/prefs_folder_item.c:1675
+#: src/editaddress.c:676
 msgid "Discard"
 msgstr "Descartar"
 
@@ -2575,54 +2607,45 @@ msgstr "_Desassignar imatge"
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
-#: src/exporthtml.c:761 src/ldif.c:746
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:517
+#: src/exporthtml.c:761 src/ldif.c:747
 msgid "Display Name"
 msgstr "Nom mostrat"
 
-#: src/editaddress.c:963 src/editaddress.c:967 src/ldif.c:754
+#: src/editaddress.c:961 src/editaddress.c:965 src/ldif.c:755
 msgid "Last Name"
 msgstr "Cognoms"
 
-#: src/editaddress.c:964 src/editaddress.c:966 src/ldif.c:750
+#: src/editaddress.c:962 src/editaddress.c:964 src/ldif.c:751
 msgid "First Name"
 msgstr "Nom"
 
-#: src/editaddress.c:970 src/editaddress.c:972
+#: src/editaddress.c:968 src/editaddress.c:970
 msgid "Nickname"
 msgstr "Motiu (nick)"
 
-#: src/editaddress.c:1056 src/editaddress.c:1124
+#: src/editaddress.c:1054 src/editaddress.c:1122
 msgid "Alias"
 msgstr "Alies"
 
-#: src/editaddress.c:1266 src/editaddress.c:1335 src/editaddress.c:1355
+#: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
 #: src/editaddress_other_attributes_ldap.c:303
 #: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:222
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1426
+#: src/editaddress.c:1424
 msgid "_User Data"
 msgstr "Dades d'Us_uari"
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1425
 msgid "_Email Addresses"
 msgstr "Adr_eces de Correu"
 
-#: src/editaddress.c:1430 src/editaddress.c:1433
+#: src/editaddress.c:1428 src/editaddress.c:1431
 msgid "O_ther Attributes"
 msgstr "Al_tres Atributs"
 
-#: src/editaddress.c:1584
-#, c-format
-msgid ""
-"Failed to save image: \n"
-"%s"
-msgstr ""
-"Error al desar l'imatge: \n"
-"%s"
-
 #: src/editbook.c:109
 msgid "File appears to be OK."
 msgstr "L'arxiu sembla estar bé."
@@ -2644,8 +2667,8 @@ msgid " Check File "
 msgstr " Comprovar arxiu "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1959
+#: src/wizard.c:1187 src/wizard.c:1602
 msgid "File"
 msgstr "Arxiu"
 
@@ -2693,13 +2716,13 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nom de la nova carpeta:"
 
-#: src/editgroup.c:556 src/foldersel.c:585 src/imap_gtk.c:194 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
+#: src/editgroup.c:556 src/foldersel.c:585 src/imap_gtk.c:195 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:557 src/foldersel.c:586 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: src/editgroup.c:557 src/foldersel.c:586 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Nom de la nova carpeta:"
 
@@ -2723,62 +2746,62 @@ msgstr "Element(s) adicional(s) de l'adreça"
 msgid "Add New JPilot Entry"
 msgstr "Afegir nova entrada JPilot"
 
-#: src/editldap_basedn.c:137
+#: src/editldap_basedn.c:138
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Seleccionar base de búsqueda"
 
-#: src/editldap_basedn.c:156 src/editldap.c:440
+#: src/editldap_basedn.c:157 src/editldap.c:441
 msgid "Hostname"
 msgstr "Nom de màquina"
 
-#: src/editldap_basedn.c:166 src/editldap.c:457
+#: src/editldap_basedn.c:167 src/editldap.c:458
 #: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:110
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap_basedn.c:176 src/editldap.c:501
+#: src/editldap_basedn.c:177 src/editldap.c:502
 msgid "Search Base"
 msgstr "Base de búsqueda"
 
-#: src/editldap_basedn.c:197
+#: src/editldap_basedn.c:198
 msgid "Available Search Base(s)"
 msgstr "Base(s) de búsqueda disponible(s)"
 
-#: src/editldap_basedn.c:287
+#: src/editldap_basedn.c:288
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "No s'ha pogut llegir la base de búsqueda del servidor - configureu-la "
 "manualment"
 
-#: src/editldap_basedn.c:291 src/editldap.c:280
+#: src/editldap_basedn.c:292 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "No s'ha pogut connectar al servidor"
 
-#: src/editldap.c:151
+#: src/editldap.c:152
 msgid "A Name must be supplied."
 msgstr "Heu de proporcionar un nom."
 
-#: src/editldap.c:163
+#: src/editldap.c:164
 msgid "A Hostname must be supplied for the server."
 msgstr "Heu de proporcionar un nom de màquina per al servidor."
 
-#: src/editldap.c:176
+#: src/editldap.c:177
 msgid "At least one LDAP search attribute should be supplied."
 msgstr "Heu de proporcionar almenys un atribut de búsqueda LDAP."
 
-#: src/editldap.c:277
+#: src/editldap.c:278
 msgid "Connected successfully to server"
 msgstr "Connectat amb èxit al servidor"
 
-#: src/editldap.c:335 src/editldap.c:973
+#: src/editldap.c:336 src/editldap.c:974
 msgid "Edit LDAP Server"
 msgstr "Editar servidor LDAP"
 
-#: src/editldap.c:436
+#: src/editldap.c:437
 msgid "A name that you wish to call the server."
 msgstr "Un nomb amb el que denominar al servidor."
 
-#: src/editldap.c:449
+#: src/editldap.c:450
 msgid ""
 "This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
 "be appropriate for the \"mydomain.com\" organization. An IP address may also "
@@ -2790,15 +2813,15 @@ msgstr ""
 "una adreça IP. Podeu especificar \"localhost\" si el servidor LDAP està "
 "executant-se en la mateixa màquina que Claws Mail."
 
-#: src/editldap.c:469
+#: src/editldap.c:470
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:471 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
-#: src/editldap.c:474
+#: src/editldap.c:475
 msgid ""
 "Enable secure connection to the LDAP server via TLS. If connection fails, be "
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
@@ -2808,7 +2831,7 @@ msgstr ""
 "assegureu-vos que la configuració a l'arxiu ldap.conf és correcta (camps "
 "TLS_CACERTDIR i TLS_REQCERT)."
 
-#: src/editldap.c:478
+#: src/editldap.c:479
 msgid ""
 "Enable secure connection to the LDAP server via SSL. If connection fails, be "
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
@@ -2818,19 +2841,19 @@ msgstr ""
 "assegureu-vos que la configuració a l'arxiu ldap.conf és correcta (camps "
 "TLS_CACERTDIR i TLS_REQCERT)."
 
-#: src/editldap.c:490
+#: src/editldap.c:491
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "El número de port en el que escolta el servidor. Per omissió el 389."
 
-#: src/editldap.c:493
+#: src/editldap.c:494
 msgid " Check Server "
 msgstr " Comprovar servidor "
 
-#: src/editldap.c:497
+#: src/editldap.c:498
 msgid "Press this button to test the connection to the server."
 msgstr "Polseu aquest botó per a provar la connexió amb el servidor."
 
-#: src/editldap.c:510
+#: src/editldap.c:511
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2844,7 +2867,7 @@ msgstr ""
 "  ou=gent,dc=nomdomini,dc=com\n"
 "  o=Nom Organització,c=País\n"
 
-#: src/editldap.c:521
+#: src/editldap.c:522
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
@@ -2852,11 +2875,11 @@ msgstr ""
 "Polseu aquest botó per buscar el nom dels noms de directori disponibles al "
 "servidor."
 
-#: src/editldap.c:577
+#: src/editldap.c:578
 msgid "Search Attributes"
 msgstr "Atributs de búsqueda"
 
-#: src/editldap.c:586
+#: src/editldap.c:587
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
@@ -2864,11 +2887,11 @@ msgstr ""
 "Una llista de noms d'atributs LDAP que hauran de buscar-se quan es vagi a "
 "trobar un nomb o adreça."
 
-#: src/editldap.c:589
+#: src/editldap.c:590
 msgid " Defaults "
 msgstr " Per omissió"
 
-#: src/editldap.c:593
+#: src/editldap.c:594
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
@@ -2876,11 +2899,11 @@ msgstr ""
 "Reinicia els noms d'atribut al valor per omissió que s'haurien de trobar la "
 "majoria de nom i adreces durant un procés de búsqueda."
 
-#: src/editldap.c:599
+#: src/editldap.c:600
 msgid "Max Query Age (secs)"
 msgstr "Espera màx. per petició (seg.)"
 
-#: src/editldap.c:614
+#: src/editldap.c:615
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2904,11 +2927,11 @@ msgstr ""
 "bsquedes. Això és útil per a servidors lents a canvi de més memòria per "
 "emmagatzemar els resultats."
 
-#: src/editldap.c:631
+#: src/editldap.c:632
 msgid "Include server in dynamic search"
 msgstr "Incloure el servidor en la cerca dinàmica"
 
-#: src/editldap.c:636
+#: src/editldap.c:637
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
@@ -2916,11 +2939,11 @@ msgstr ""
 "Marqueu aquesta opció per incloure aquest servidor en les cerques dinàmiques "
 "al usar autocompletat d'adreces."
 
-#: src/editldap.c:642
+#: src/editldap.c:643
 msgid "Match names 'containing' search term"
 msgstr "Coincideix amb noms 'contenint' el terme cercat"
 
-#: src/editldap.c:647
+#: src/editldap.c:648
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2934,11 +2957,11 @@ msgstr ""
 "se. Noteu que per raons de rendiment, totes les cerques d'autocompletat "
 "contra altres interfícies d'adreces useu \"començar-amb\"."
 
-#: src/editldap.c:700
+#: src/editldap.c:701
 msgid "Bind DN"
 msgstr "Associar DN"
 
-#: src/editldap.c:709
+#: src/editldap.c:710
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2950,47 +2973,50 @@ msgstr ""
 "com \"cn=usuari,dc=claws-mail,dc=org\". Normalment es deixa buit al "
 "realitzar la cerca."
 
-#: src/editldap.c:716
+#: src/editldap.c:717
 msgid "Bind Password"
 msgstr "Associar contrasenya"
 
-#: src/editldap.c:726
+#: src/editldap.c:727
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "La contrasenya a usar al connectar com a usuari \"Associar DN\"."
 
-#: src/editldap.c:731
+#: src/editldap.c:732
 msgid "Timeout (secs)"
 msgstr "Temps límit (seg.)"
 
-#: src/editldap.c:745
+#: src/editldap.c:746
 msgid "The timeout period in seconds."
 msgstr "El temps mínim en segons."
 
-#: src/editldap.c:749
+#: src/editldap.c:750
 msgid "Maximum Entries"
 msgstr "Nº d'entrades màximes"
 
-#: src/editldap.c:763
+#: src/editldap.c:764
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 "El número mínim d'entrades que s'haurien de retornar en els resultats de la "
 "cerca."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:779 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Bàsiques"
 
-#: src/editldap.c:780 src/gtk/quicksearch.c:680
+#: src/editldap.c:780
+msgid "Search"
+msgstr "Cercar"
+
+#: src/editldap.c:781 src/gtk/quicksearch.c:680
 msgid "Extended"
 msgstr "Extès"
 
-#: src/editldap.c:978
+#: src/editldap.c:979
 msgid "Add New LDAP Server"
 msgstr "Afegir nou servidor LDAP"
 
 #: src/edittags.c:187 src/prefs_filtering_action.c:1446
-#: src/prefs_summaries.c:441
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -3054,19 +3080,19 @@ msgstr "Afegir nova entrada vCard"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Ès impossible definir el certificat del client.\n"
 
-#: src/exphtmldlg.c:105
+#: src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
 msgstr "Especifiqueu el directori de sortida i l'arxiu a crear."
 
-#: src/exphtmldlg.c:108
+#: src/exphtmldlg.c:109
 msgid "Select stylesheet and formatting."
 msgstr "Seleccioneu el full d'estils i el format."
 
-#: src/exphtmldlg.c:111 src/expldifdlg.c:113
+#: src/exphtmldlg.c:112 src/expldifdlg.c:114
 msgid "File exported successfully."
 msgstr "Arxiu exportat amb èxit."
 
-#: src/exphtmldlg.c:177
+#: src/exphtmldlg.c:178
 #, c-format
 msgid ""
 "The HTML output directory '%s'\n"
@@ -3075,11 +3101,11 @@ msgstr ""
 "El directori de sortida HTML '%s'\n"
 "no existeix. Vols crear-lo?"
 
-#: src/exphtmldlg.c:180
+#: src/exphtmldlg.c:181
 msgid "Create directory"
 msgstr "Crear directori"
 
-#: src/exphtmldlg.c:189
+#: src/exphtmldlg.c:190
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
@@ -3088,122 +3114,122 @@ msgstr ""
 "No s'ha pogut crear el directori de sortida per a l'arxiu HTML:\n"
 "%s"
 
-#: src/exphtmldlg.c:191 src/expldifdlg.c:201
+#: src/exphtmldlg.c:192 src/expldifdlg.c:202
 msgid "Failed to Create Directory"
 msgstr "No s'ha pogut crear el directori"
 
-#: src/exphtmldlg.c:233
+#: src/exphtmldlg.c:234
 msgid "Error creating HTML file"
 msgstr "Error creant l'arxiu HTML"
 
-#: src/exphtmldlg.c:319
+#: src/exphtmldlg.c:320
 msgid "Select HTML output file"
 msgstr "Seleccionar arxiu HTML de sortida"
 
-#: src/exphtmldlg.c:383
+#: src/exphtmldlg.c:384
 msgid "HTML Output File"
 msgstr "Arxiu HTML de sortida"
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
-#: src/importldif.c:684
+#: src/exphtmldlg.c:393 src/expldifdlg.c:410 src/export.c:171 src/import.c:170
+#: src/importldif.c:685
 msgid "B_rowse"
 msgstr "M_ostrar"
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:300
+#: src/exphtmldlg.c:446 src/plugins/fancy/fancy_prefs.c:300
 msgid "Stylesheet"
 msgstr "Full d'estils"
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/exphtmldlg.c:454 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1178
 #: src/plugins/archive/archiver_prefs.c:235
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:948
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6016
 msgid "None"
 msgstr "Cap"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:455 src/prefs_folder_item.c:512 src/prefs_other.c:116
+#: src/prefs_other.c:408
 msgid "Default"
 msgstr "Per omissió"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
-#: src/plugins/pgpcore/sgpgme.c:147 src/plugins/pgpcore/sgpgme.c:163
+#: src/exphtmldlg.c:456 src/plugins/pgpcore/select-keys.c:244
+#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Complet"
 
-#: src/exphtmldlg.c:456
+#: src/exphtmldlg.c:457
 msgid "Custom"
 msgstr "Adequat"
 
-#: src/exphtmldlg.c:457
+#: src/exphtmldlg.c:458
 msgid "Custom-2"
 msgstr "Adequat-2"
 
-#: src/exphtmldlg.c:458
+#: src/exphtmldlg.c:459
 msgid "Custom-3"
 msgstr "Adequat-3"
 
-#: src/exphtmldlg.c:459
+#: src/exphtmldlg.c:460
 msgid "Custom-4"
 msgstr "Adequat-4"
 
-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:467
 msgid "Full Name Format"
 msgstr "Format de nom complet"
 
-#: src/exphtmldlg.c:474
+#: src/exphtmldlg.c:475
 msgid "First Name, Last Name"
 msgstr "Nom, Cognoms"
 
-#: src/exphtmldlg.c:475
+#: src/exphtmldlg.c:476
 msgid "Last Name, First Name"
 msgstr "Cognoms, Nom"
 
-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:483
 msgid "Color Banding"
 msgstr "Bandes de color"
 
-#: src/exphtmldlg.c:488
+#: src/exphtmldlg.c:489
 msgid "Format Email Links"
 msgstr "Formatejar Enllaços de Correu Electrònic"
 
-#: src/exphtmldlg.c:494
+#: src/exphtmldlg.c:495
 msgid "Format User Attributes"
 msgstr "Formatejar atributs de l'usuari"
 
-#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
+#: src/exphtmldlg.c:540 src/expldifdlg.c:613 src/importldif.c:892
 msgid "Address Book:"
 msgstr "Agenda d'adreces :"
 
-#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
+#: src/exphtmldlg.c:550 src/expldifdlg.c:623 src/importldif.c:902
 msgid "File Name:"
 msgstr "Nom d'arxiu :"
 
-#: src/exphtmldlg.c:559
+#: src/exphtmldlg.c:560
 msgid "Open with Web Browser"
 msgstr "Obrir amb el navegador web"
 
-#: src/exphtmldlg.c:591
+#: src/exphtmldlg.c:592
 msgid "Export Address Book to HTML File"
 msgstr "Exportar agenda a un arxiu HTML"
 
-#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:1020
+#: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:1021
 msgid "File Info"
 msgstr "Informació d'arxiu"
 
-#: src/exphtmldlg.c:657
+#: src/exphtmldlg.c:658
 msgid "Format"
 msgstr "Format"
 
-#: src/expldifdlg.c:107
+#: src/expldifdlg.c:108
 msgid "Please specify output directory and LDIF filename to create."
 msgstr "Especifiqueu el directori de sortida i el nom de l'arxiu LDIF a crear."
 
-#: src/expldifdlg.c:110
+#: src/expldifdlg.c:111
 msgid "Specify parameters to format distinguished name."
 msgstr "Especifiqueu els paràmetres per donar format al nom distingit."
 
-#: src/expldifdlg.c:187
+#: src/expldifdlg.c:188
 #, c-format
 msgid ""
 "LDIF Output Directory '%s'\n"
@@ -3212,11 +3238,11 @@ msgstr ""
 "El directori de sortida LDIF '%s'\n"
 "no existeix. Crear-ne un de nou?"
 
-#: src/expldifdlg.c:190
+#: src/expldifdlg.c:191
 msgid "Create Directory"
 msgstr "Crear directori"
 
-#: src/expldifdlg.c:199
+#: src/expldifdlg.c:200
 #, c-format
 msgid ""
 "Could not create output directory for LDIF file:\n"
@@ -3225,11 +3251,11 @@ msgstr ""
 "No s'ha pogut crear el directori de sortida per a l'arxiu LDIF:\n"
 "%s"
 
-#: src/expldifdlg.c:241
+#: src/expldifdlg.c:242
 msgid "Suffix was not supplied"
 msgstr "No s'ha proporcionat un sufixe"
 
-#: src/expldifdlg.c:243
+#: src/expldifdlg.c:244
 msgid ""
 "A suffix is required if data is to be used for an LDAP server. Are you sure "
 "you wish to proceed without a suffix?"
@@ -3237,19 +3263,19 @@ msgstr ""
 "Es necessari un sufixe si les dades s'han d'usar en un servidor LDAP. Estàs "
 "segur que vols continuar sense un sufixe?"
 
-#: src/expldifdlg.c:261
+#: src/expldifdlg.c:262
 msgid "Error creating LDIF file"
 msgstr "Error creant l'arxiu LDIF"
 
-#: src/expldifdlg.c:336
+#: src/expldifdlg.c:337
 msgid "Select LDIF output file"
 msgstr "Seleccioneu l'arxiu LDIF de sortida"
 
-#: src/expldifdlg.c:400
+#: src/expldifdlg.c:401
 msgid "LDIF Output File"
 msgstr "Arxiu LDIF de sortida"
 
-#: src/expldifdlg.c:431
+#: src/expldifdlg.c:432
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
@@ -3258,7 +3284,7 @@ msgstr ""
 "L'ID únic de l'agenda és usat per crear un DN amb format de l'estil de:\n"
 "  uid=102376,ou=gent,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:437
+#: src/expldifdlg.c:438
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
@@ -3267,7 +3293,7 @@ msgstr ""
 "El nom mostrat de l'agenda s'usa per crear un DN amb format de l'estil de:\n"
 "  cn=Joan Tal,ou=gent,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:443
+#: src/expldifdlg.c:444
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
@@ -3277,11 +3303,11 @@ msgstr ""
 "de l'estil de:\n"
 "  mail=joan.tal at domini.com,ou=gent,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:489
+#: src/expldifdlg.c:490
 msgid "Suffix"
 msgstr "Sufixe"
 
-#: src/expldifdlg.c:499
+#: src/expldifdlg.c:500
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
@@ -3295,15 +3321,15 @@ msgstr ""
 "  ou=gent,dc=nomdomini,dc=com\n"
 "  o=Nom d'Organització,c=País\n"
 
-#: src/expldifdlg.c:507
+#: src/expldifdlg.c:508
 msgid "Relative DN"
 msgstr "DN relatiu"
 
-#: src/expldifdlg.c:515
+#: src/expldifdlg.c:516
 msgid "Unique ID"
 msgstr "ID únic"
 
-#: src/expldifdlg.c:523
+#: src/expldifdlg.c:524
 msgid ""
 "The LDIF file contains several data records that are usually loaded into an "
 "LDAP server. Each data record in the LDIF file is uniquely identified by a "
@@ -3317,11 +3343,11 @@ msgstr ""
 "Relatiu\" (o RDN) per crear el DN. Per favor, seleccioneu una de les opcions "
 "de RDN disponibles per usar-la en la creació del DN."
 
-#: src/expldifdlg.c:543
+#: src/expldifdlg.c:544
 msgid "Use DN attribute if present in data"
 msgstr "Useu l'atribut DN si està present en les dades"
 
-#: src/expldifdlg.c:548
+#: src/expldifdlg.c:549
 msgid ""
 "The addressbook may contain entries that were previously imported from an "
 "LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
@@ -3333,11 +3359,11 @@ msgstr ""
 "dades de l'agenda, es pot usar en l'arxiu LDIF exportat. S'usarà el RDN "
 "seleccionat adalt si no es troba l'atribut DN."
 
-#: src/expldifdlg.c:558
+#: src/expldifdlg.c:559
 msgid "Exclude record if no Email Address"
 msgstr "Excloure el registre si no té Adreça de Correu"
 
-#: src/expldifdlg.c:563
+#: src/expldifdlg.c:564
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
@@ -3345,15 +3371,15 @@ msgstr ""
 "Una agenda pot contenir entrades sense Adreces de Correu. Marqueu aquesta "
 "opció per ignorar aquests registres."
 
-#: src/expldifdlg.c:655
+#: src/expldifdlg.c:656
 msgid "Export Address Book to LDIF File"
 msgstr "Exportar agenda a un arxiu LDIF"
 
-#: src/expldifdlg.c:721
+#: src/expldifdlg.c:722
 msgid "Distinguished Name"
 msgstr "Nom distingit"
 
-#: src/export.c:113 src/summaryview.c:8190
+#: src/export.c:113 src/summaryview.c:8128
 msgid "Export to mbox file"
 msgstr "Exportar a arxiu mbox"
 
@@ -3389,8 +3415,8 @@ msgstr "Seleccioneu l'arxiu d'exportació"
 msgid "Full Name"
 msgstr "Nom complert"
 
-#: src/exporthtml.c:771 src/importldif.c:1021
-#: src/plugins/archive/archiver_gtk.c:735
+#: src/exporthtml.c:771 src/importldif.c:1022
+#: src/plugins/archive/archiver_gtk.c:731
 msgid "Attributes"
 msgstr "Atributs"
 
@@ -3608,7 +3634,7 @@ msgstr ""
 "filtrant missatge (%s%s%s)\n"
 "%sfitxer del missatge: %s\n"
 
-#: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:300
+#: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:306
 msgid "Inbox"
 msgstr "Entrada"
 
@@ -3616,39 +3642,40 @@ msgstr "Entrada"
 msgid "Sent"
 msgstr "Enviat"
 
-#: src/folder.c:1573 src/foldersel.c:411 src/prefs_folder_item.c:303
+#: src/folder.c:1573 src/foldersel.c:411
+#: src/plugins/attachwarner/attachwarner.c:217 src/prefs_folder_item.c:309
 msgid "Queue"
 msgstr "Cua"
 
-#: src/folder.c:1577 src/foldersel.c:415 src/prefs_folder_item.c:304
+#: src/folder.c:1577 src/foldersel.c:415 src/prefs_folder_item.c:310
 msgid "Trash"
 msgstr "Paperera"
 
-#: src/folder.c:1581 src/foldersel.c:419 src/prefs_folder_item.c:302
+#: src/folder.c:1581 src/foldersel.c:419 src/prefs_folder_item.c:308
 msgid "Drafts"
 msgstr "Esborranys"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Processant (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiant %s a %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movent %s a %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualitzant memòria cauper %s ..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Processant missatges..."
 
@@ -3665,31 +3692,31 @@ msgstr "Un nom de carpeta no pot començar o acabar amb un punt."
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:587 src/imap_gtk.c:198 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: src/foldersel.c:587 src/imap_gtk.c:199 src/mh_gtk.c:147
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/foldersel.c:595 src/imap_gtk.c:210 src/imap_gtk.c:216
+#: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:264
+#: src/news_gtk.c:315 src/plugins/mailmbox/plugin_gtk.c:255
+#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:208
+#: src/plugins/vcalendar/vcal_folder.c:2042
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "No s'ha pogut incloure '%c' en el nom de la carpeta."
 
-#: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
-#: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/foldersel.c:610 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:168
+#: src/mh_gtk.c:274 src/news_gtk.c:322 src/plugins/mailmbox/plugin_gtk.c:270
+#: src/plugins/mailmbox/plugin_gtk.c:437 src/plugins/rssyl/rssyl_cb_menu.c:221
+#: src/plugins/vcalendar/vcal_folder.c:2049
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta '%s' ja existeix."
 
-#: src/foldersel.c:617 src/imap_gtk.c:231 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/foldersel.c:617 src/imap_gtk.c:232 src/mh_gtk.c:174
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
+#: src/plugins/rssyl/rssyl_cb_menu.c:126
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "No s'ha pogut crear la carpeta '%s'."
@@ -3706,7 +3733,7 @@ msgstr "Marca tots lo llegit recursi_vament"
 msgid "R_un processing rules"
 msgstr "Exec_utar regles de processament"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:546
 msgid "_Search folder..."
 msgstr "_Cerca en la carpeta..."
 
@@ -3724,13 +3751,13 @@ msgstr "Enviar _cua..."
 
 #: src/folderview.c:387 src/folderview.c:434
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6316
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:391 src/summaryview.c:6292
 msgid "New"
 msgstr "Nous"
 
 #: src/folderview.c:388 src/folderview.c:435
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6318
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:390 src/summaryview.c:6294
 msgid "Unread"
 msgstr "No llegits"
 
@@ -3740,7 +3767,7 @@ msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:437 src/summaryview.c:445
+#: src/folderview.c:437 src/summaryview.c:446
 msgid "#"
 msgstr "#"
 
@@ -3756,100 +3783,104 @@ msgstr ""
 "Realment vols marcar tots els missatges en aquesta carpeta i les seves "
 "subcarpetes com a llegits?"
 
-#: src/folderview.c:841 src/summaryview.c:4134
+#: src/folderview.c:841 src/summaryview.c:4128
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Realment vols marcar tots els correus d'aquesta carpeta com a llegits?"
 
-#: src/folderview.c:845 src/summaryview.c:4133
+#: src/folderview.c:845 src/summaryview.c:4127
 msgid "Mark all as read"
 msgstr "Marcar tot  com a llegit"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Revisant la carpeta %s%c%s..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Revisant la carpeta %s..."
 
-#: src/folderview.c:1050
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "Reconstruïr l'arbre de carpetes"
 
-#: src/folderview.c:1051
+#: src/folderview.c:1043
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Refer l'arbre de directoris esborrarà les memòries cau locals. Vols "
 "continuar?"
 
-#: src/folderview.c:1061
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruint l'arbre de carpetes..."
 
-#: src/folderview.c:1063
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "Escanejant l'arbre de carpetes..."
 
-#: src/folderview.c:1154
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No s'ha pogut explorar la carpeta %s\n"
 
-#: src/folderview.c:1208
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "Comprovar missatges nous en totes les carpetes..."
 
-#: src/folderview.c:2124
+#: src/folderview.c:2073
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Tancant la carpeta %s..."
 
-#: src/folderview.c:2219
+#: src/folderview.c:2168
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Obrint la carpeta %s..."
 
-#: src/folderview.c:2237
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "No s'ha pogut obrir la carpeta."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
 msgstr "Buidar la paperera"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "Esborrar tots els missatges de la paperera?"
 
-#: src/folderview.c:2381
-#, fuzzy
-msgid "_Empty trash"
+#: src/folderview.c:2331
+msgid "+_Empty trash"
 msgstr "+Buidar pap_erera"
 
-#: src/folderview.c:2424 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Avís de desconnexió"
 
-#: src/folderview.c:2425 src/toolbar.c:2608
+#: src/folderview.c:2376 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Estàs treballant sense connexió. Ignorar?"
 
-#: src/folderview.c:2436 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Enviar missatge(s) encuats"
 
-#: src/folderview.c:2437 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Enviar tots els  missatges encuats?"
 
-#: src/folderview.c:2446 src/toolbar.c:2647
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873
+#: src/toolbar.c:2629
+msgid "_Send"
+msgstr "_Enviar"
+
+#: src/folderview.c:2397 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "S'han produït alguns errors enviant els missatges encuats."
 
-#: src/folderview.c:2449 src/main.c:2717 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3858,64 +3889,64 @@ msgstr ""
 "S'han produït alguns errors enviant els missatges encuats:\n"
 "%s"
 
-#: src/folderview.c:2524
+#: src/folderview.c:2477
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Realment vols copiar la carpeta '%s' en '%s' ?"
 
-#: src/folderview.c:2525
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Realment vols fer la carpeta '%s' sub-carpeta de '%s' ?"
 
-#: src/folderview.c:2527
+#: src/folderview.c:2480
 msgid "Copy folder"
 msgstr "Copiar la carpeta"
 
-#: src/folderview.c:2527
+#: src/folderview.c:2480
 msgid "Move folder"
 msgstr "Moure la carpeta"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiant %s a %s..."
 
-#: src/folderview.c:2538
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movent %s a %s..."
 
-#: src/folderview.c:2572
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "La destinació i l'origen són el mateix."
 
-#: src/folderview.c:2575
+#: src/folderview.c:2528
 msgid "Can't copy a folder to one of its children."
 msgstr "No es pot copiar la carpeta a una de les seves subcarpetes."
 
-#: src/folderview.c:2576
+#: src/folderview.c:2529
 msgid "Can't move a folder to one of its children."
 msgstr "No es pot moure la carpeta a una de les seves subcarpetes."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2532
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No es poden moure carpetes entre bústies diferents."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "Copiar ha fallat!"
 
-#: src/folderview.c:2582
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "Moure ha fallat!"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Processant configuració per la carpeta %s"
 
-#: src/folderview.c:3060 src/summaryview.c:4579 src/summaryview.c:4684
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La carpeta destí només es pot usar per emmaguetzemar subcarpetes."
 
@@ -3965,7 +3996,7 @@ msgstr "desconegut"
 msgid "Can't retrieve newsgroup list."
 msgstr "No es pot obtenir la llista de grups."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1584
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1907 src/summaryview.c:1587
 msgid "Done."
 msgstr "Fet."
 
@@ -4032,9 +4063,10 @@ msgstr ""
 "\n"
 "Informació del Sistema\n"
 
-#: src/gtk/about.c:168
-#, fuzzy, c-format
+#: src/gtk/about.c:167
+#, c-format
 msgid ""
+"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
@@ -4042,9 +4074,10 @@ msgstr ""
 "Locals: %s (cod. de caràcters: %s)\n"
 "Sistema Operatiu: %s %s (%s)"
 
-#: src/gtk/about.c:177
-#, fuzzy, c-format
+#: src/gtk/about.c:176
+#, c-format
 msgid ""
+"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
@@ -4052,9 +4085,10 @@ msgstr ""
 "Locals: %s (cod. de caràcters: %s)\n"
 "Sistema Operatiu: %s"
 
-#: src/gtk/about.c:186
-#, fuzzy, c-format
+#: src/gtk/about.c:185
+#, c-format
 msgid ""
+"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
@@ -4174,52 +4208,59 @@ msgstr ""
 "\n"
 
 #: src/gtk/about.c:567
-#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
-"this program. If not, see "
+"this program. If not, see <"
 msgstr ""
 "Haurieu d'haver rebut una copia de la GNU General Public License juntament "
 "amb aquest programa; en cas contrari,  mireu <"
 
-#: src/gtk/about.c:698 src/main.c:2541
+#: src/gtk/about.c:572
+msgid ""
+">. \n"
+"\n"
+msgstr ""
+">. \n"
+"\n"
+
+#: src/gtk/about.c:698 src/main.c:2538
 msgid "Session statistics\n"
 msgstr "Estadistiques de la sessió\n"
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2551 src/main.c:2554
+#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2548 src/main.c:2551
 #, c-format
 msgid "Started: %s\n"
 msgstr "Començat: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2560
+#: src/gtk/about.c:718 src/main.c:2557
 msgid "Incoming traffic\n"
 msgstr "Trànsit d'entrada\n"
 
-#: src/gtk/about.c:721 src/main.c:2563
+#: src/gtk/about.c:721 src/main.c:2560
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Missatges rebuts: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2569
+#: src/gtk/about.c:728 src/main.c:2566
 msgid "Outgoing traffic\n"
 msgstr "Trànsit de sortida\n"
 
-#: src/gtk/about.c:731 src/main.c:2572
+#: src/gtk/about.c:731 src/main.c:2569
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Missatges nous/redireccionats: %d\n"
 
-#: src/gtk/about.c:736 src/main.c:2576
+#: src/gtk/about.c:736 src/main.c:2573
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Missatges resposts: %d\n"
 
-#: src/gtk/about.c:741 src/main.c:2580
+#: src/gtk/about.c:741 src/main.c:2577
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Missatges reenviats: %d\n"
 
-#: src/gtk/about.c:746 src/main.c:2584
+#: src/gtk/about.c:746 src/main.c:2581
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total de missatge sortints: %d\n"
@@ -4262,63 +4303,63 @@ msgstr "Notes de Ve_rsió"
 msgid "_Statistics"
 msgstr "E_stadístiques"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:360
 msgid "Orange"
 msgstr "Taronja"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:364
 msgid "Red"
 msgstr "Vermell"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:368
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:372
 msgid "Sky blue"
 msgstr "Blau cel"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:376
 msgid "Blue"
 msgstr "Blau"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:380
 msgid "Green"
 msgstr "Verd"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:384
 msgid "Brown"
 msgstr "Marró"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:388
 msgid "Grey"
 msgstr "Gris"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:392
 msgid "Light brown"
 msgstr "Marró clar"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:396
 msgid "Dark red"
 msgstr "Vermell fosc"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:402
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:400
 msgid "Dark pink"
 msgstr "Rosa fosc"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:404
 msgid "Steel blue"
 msgstr "Blau cel"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:410
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:408
 msgid "Gold"
 msgstr "Daurat"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:412
 msgid "Bright green"
 msgstr "Verd fort"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:416
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -4361,10 +4402,10 @@ msgstr "No s'han trobat faltes ortogràfiques."
 msgid "Replace unknown word"
 msgstr "Substituïr paraula desconeguda"
 
-#: src/gtk/gtkaspell.c:1460
-#, fuzzy, c-format
-msgid "Replace \"%s\" with: "
-msgstr "Substituir per..."
+#: src/gtk/gtkaspell.c:1459
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Reemplaçar \"%s\" amb: </span>"
 
 #: src/gtk/gtkaspell.c:1503
 msgid ""
@@ -4444,26 +4485,17 @@ msgstr ""
 "El corrector ortogràfic no ha pogut canviar al diccionari alternatiu.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1921
-msgid "Failed: no service record found."
-msgstr ""
-
-#: src/gtk/gtkutils.c:1924
-msgid "Failed: network error."
-msgstr ""
-
-#: src/gtk/gtkutils.c:1927
-#, fuzzy, c-format
-msgid "Failed: unknown error (%d)."
-msgstr "Error desconegut"
+#: src/gtk/gtkutils.c:1909
+msgid "Failed."
+msgstr "Ha fallat."
 
-#: src/gtk/gtkutils.c:1997
+#: src/gtk/gtkutils.c:1972
 msgid "Configuring..."
 msgstr "Configurant..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2165 src/prefs_summaries.c:435
-#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:443
+#: src/prefs_matcher.c:2174 src/prefs_summary_column.c:84 src/quote_fmt.c:49
+#: src/summaryview.c:444
 msgid "Date"
 msgstr "Data"
 
@@ -4472,8 +4504,8 @@ msgid "Date:"
 msgstr "Data:"
 
 #: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2162 src/prefs_summaries.c:437
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:441
+#: src/prefs_matcher.c:2171 src/prefs_summary_column.c:82 src/quote_fmt.c:50
+#: src/summaryview.c:442
 msgid "From"
 msgstr "Des de"
 
@@ -4494,14 +4526,13 @@ msgid "Reply-To"
 msgstr "Respondre-A"
 
 #: src/gtk/headers.h:13 src/plugins/address_keeper/address_keeper_prefs.c:140
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
-#: src/prefs_summaries.c:438 src/prefs_summary_column.c:83 src/quote_fmt.c:57
-#: src/summaryview.c:442
+#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2172
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:57 src/summaryview.c:443
 msgid "To"
 msgstr "Per a"
 
 #: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164
+#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2173
 #: src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
@@ -4511,7 +4542,7 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2166 src/quote_fmt.c:61
+#: src/prefs_matcher.c:2175 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "ID-Missatge"
 
@@ -4524,7 +4555,7 @@ msgid "In-Reply-To"
 msgstr "En-Resposta-A"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2168 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2177 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referències"
 
@@ -4533,17 +4564,17 @@ msgid "References:"
 msgstr "Referències:"
 
 #: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2161 src/prefs_summaries.c:439
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:440
+#: src/prefs_matcher.c:2170 src/prefs_summary_column.c:81 src/quote_fmt.c:56
+#: src/summaryview.c:441
 msgid "Subject"
 msgstr "Assumpte"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:702
 #: src/summary_search.c:440
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:432
+#: src/gtk/headers.h:20
 msgid "Comments"
 msgstr "Comentaris"
 
@@ -4555,7 +4586,7 @@ msgstr "Comentaris:"
 msgid "Keywords"
 msgstr "Paraules Clau"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Keywords:"
 msgstr "Paraules Clau:"
 
@@ -4632,7 +4663,7 @@ msgid "Received:"
 msgstr "Rebut:"
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2176 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Grups de notícies"
 
@@ -4657,8 +4688,8 @@ msgid "Seen:"
 msgstr "Vist:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:79 src/summaryview.c:2805
+#: src/gtk/sslcertwindow.c:164 src/prefs_summary_column.c:79
+#: src/summaryview.c:2801
 msgid "Status"
 msgstr "Estat"
 
@@ -4730,7 +4761,7 @@ msgstr "Procedència"
 msgid "Precedence:"
 msgstr "Procedència:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1071
+#: src/gtk/headers.h:46 src/prefs_account.c:1072
 msgid "Organization"
 msgstr "Organizació"
 
@@ -4947,9 +4978,9 @@ msgid "Icon Legend"
 msgstr "Text de la Icona"
 
 #: src/gtk/icon_legend.c:140
-#, fuzzy
 msgid ""
-"The following icons are used to show the status of messages and folders:"
+"<span weight=\"bold\">The following icons are used to show the status of "
+"messages and folders:</span>"
 msgstr ""
 "<span weight=\"bold\">Les icones següents s'usen per mostrar l'estat de "
 "missatges i carpetes:</span>"
@@ -4987,22 +5018,16 @@ msgid "Clear _Log"
 msgstr "Netejar _Log"
 
 #: src/gtk/menu.c:137
-#, fuzzy
-msgid "Warning:"
-msgstr "Avís"
-
-#: src/gtk/menu.c:138
-#, fuzzy
 msgid ""
-"This URL was too long for displaying and\n"
+"<span><b>Warning:</b> This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
-"corrupted, malformed or part of some DoS attempt."
+"corrupted, malformed or part of some DoS attempt.</span>"
 msgstr ""
 "<span><b>Advertència:</b> Aquesta URL és massa llarg per mostrar i\n"
 "s'ha truncat per seguretat. Aquest missatge podria estar danyat,\n"
 "mal format o potser es part d'algun intent de DoS.</span>"
 
-#: src/gtk/pluginwindow.c:163 src/gtk/pluginwindow.c:168
+#: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
 msgid ""
 "\n"
 "\n"
@@ -5012,19 +5037,19 @@ msgstr ""
 "\n"
 "Versió: "
 
-#: src/gtk/pluginwindow.c:166
+#: src/gtk/pluginwindow.c:167
 msgid "Error: "
 msgstr "Error: "
 
-#: src/gtk/pluginwindow.c:167
+#: src/gtk/pluginwindow.c:168
 msgid "Plugin is not functional."
 msgstr "El mòdul no està operatiu"
 
-#: src/gtk/pluginwindow.c:200
+#: src/gtk/pluginwindow.c:201
 msgid "Select the Plugins to load"
 msgstr "Seleccionar els mòduls a carregar"
 
-#: src/gtk/pluginwindow.c:215
+#: src/gtk/pluginwindow.c:216
 #, c-format
 msgid ""
 "The following error occurred while loading %s:\n"
@@ -5035,7 +5060,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
+#: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/address_keeper/address_keeper_prefs.c:256
 #: src/plugins/archive/archiver_prefs.c:90
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
@@ -5046,7 +5071,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:412
+#: src/plugins/managesieve/sieve_prefs.c:397
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5055,56 +5080,58 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:487
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
-#: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
-#: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/pgpcore/prefs_gpg.c:569 src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/spam_report/spam_report_prefs.c:79
+#: src/plugins/spamassassin/spamassassin_gtk.c:648
+#: src/plugins/vcalendar/vcal_prefs.c:680 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Connectors"
 
-#: src/gtk/pluginwindow.c:336
+#: src/gtk/pluginwindow.c:337
 msgid "Load..."
 msgstr "Carregar..."
 
-#: src/gtk/pluginwindow.c:337
+#: src/gtk/pluginwindow.c:338
 msgid "Unload"
 msgstr "Descarregar"
 
-#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:222
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:221
 msgid "Description"
 msgstr "Descripció"
 
 #: src/gtk/pluginwindow.c:374
-#, fuzzy, c-format
-msgid "For more information about plugins see the %sClaws Mail website%s."
+#, c-format
+msgid ""
+"For more information about plugins see the <a href=\"%s\"><span underline="
+"\"none\">Claws Mail website</span></a>."
 msgstr ""
 "Per obtenir més informació sobre els connectors veure el <a href=\"%s"
 "\"><span underline=\"none\">lloc web de Claws Mail</span></a>."
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
 msgstr "Pulsa aquí per carregar un o més mòduls"
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
 msgstr "Descarregar el mòdul seleccionat"
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
 msgstr "Connectors carregats"
 
-#: src/gtk/prefswindow.c:639
+#: src/gtk/prefswindow.c:674
 msgid "Page Index"
 msgstr "Pàgina índex"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:831
 msgid "_Hide"
 msgstr "Ocu_ltar"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5514,15 +5541,15 @@ msgid "Tags:"
 msgstr "Etiquetes:"
 
 #: src/headerview.c:193 src/plugins/notification/notification_popup.c:316
-#: src/plugins/notification/notification_popup.c:623
-#: src/plugins/notification/notification_trayicon.c:845 src/summaryview.c:3363
-#: src/summaryview.c:3381 src/summaryview.c:3402
+#: src/plugins/notification/notification_popup.c:621
+#: src/plugins/notification/notification_trayicon.c:851 src/summaryview.c:3361
+#: src/summaryview.c:3379 src/summaryview.c:3400
 msgid "(No From)"
 msgstr "(Sense remitent)"
 
 #: src/headerview.c:208 src/plugins/notification/notification_popup.c:318
-#: src/plugins/notification/notification_popup.c:627
-#: src/plugins/notification/notification_trayicon.c:848 src/summaryview.c:3414
+#: src/plugins/notification/notification_popup.c:625
+#: src/plugins/notification/notification_trayicon.c:854 src/summaryview.c:3413
 #: src/summaryview.c:3417
 msgid "(No Subject)"
 msgstr "(Sense assumpte)"
@@ -5531,9 +5558,8 @@ msgstr "(Sense assumpte)"
 msgid "Error:"
 msgstr "Error:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2558
-#: src/plugins/att_remover/att_remover.c:301
-#: src/plugins/pdf_viewer/poppler_viewer.c:699
+#: src/image_viewer.c:299 src/mimeview.c:2545
+#: src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Nomb d'arxiu:"
 
@@ -5545,221 +5571,229 @@ msgstr "Tamany d'arxiu:"
 msgid "Load Image"
 msgstr "Carregar imatge"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "Connexió IMAP4 trencada\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
-#, fuzzy, c-format
-msgid "IMAP error on %s:"
-msgstr "Error IMAP a %s: estat incorrecte\n"
-
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
-msgstr "Autentificació"
+#: src/imap.c:621
+#, c-format
+msgid "IMAP error on %s: authenticated\n"
+msgstr "Error IMAP a %s: autentificada\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
-msgstr "Sense autentificació"
+#: src/imap.c:624
+#, c-format
+msgid "IMAP error on %s: not authenticated\n"
+msgstr "Error IMAP a %s: no autenticada\n"
 
-#: src/imap.c:628
-msgid "bad state"
-msgstr ""
+#: src/imap.c:627
+#, c-format
+msgid "IMAP error on %s: bad state\n"
+msgstr "Error IMAP a %s: estat incorrecte\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
-msgstr "Error intern"
+#: src/imap.c:630
+#, c-format
+msgid "IMAP error on %s: stream error\n"
+msgstr "Error IMAP a %s: error de fluxe\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+#, c-format
+msgid ""
+"IMAP error on %s: parse error (very probably non-RFC compliance from the "
+"server)\n"
 msgstr ""
 "Error IMAP a %s: error interpretant (molt probablement el servidor "
 "incompleix la norma RFC)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
-msgstr "Connexió fallida"
+#: src/imap.c:637
+#, c-format
+msgid "IMAP error on %s: connection refused\n"
+msgstr "Error IMAP a %s: connexió rebutjada\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
-msgstr "Error intern"
+#: src/imap.c:640
+#, c-format
+msgid "IMAP error on %s: memory error\n"
+msgstr "Error IMAP a %s: error de memòria\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
-msgstr "Error intern"
+#: src/imap.c:643
+#, c-format
+msgid "IMAP error on %s: fatal error\n"
+msgstr "Error IMAP a %s: error fatal\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+#, c-format
+msgid ""
+"IMAP error on %s: protocol error(very probably non-RFC compliance from the "
+"server)\n"
 msgstr ""
 "Error IMAP a %s: error de protocol (molt probablement el servidor incompleix "
 "la norma RFC)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+#, c-format
+msgid "IMAP error on %s: connection not accepted\n"
 msgstr "Error IMAP a %s: connexió no acceptada\n"
 
-#: src/imap.c:654
-msgid "APPEND error"
-msgstr ""
+#: src/imap.c:653
+#, c-format
+msgid "IMAP error on %s: APPEND error\n"
+msgstr "Error IMAP a %s: error a APEND\n"
 
-#: src/imap.c:657
-msgid "NOOP error"
-msgstr ""
+#: src/imap.c:656
+#, c-format
+msgid "IMAP error on %s: NOOP error\n"
+msgstr "Error IMAP a %s: error a NOOP\n"
 
-#: src/imap.c:660
-msgid "LOGOUT error"
-msgstr ""
+#: src/imap.c:659
+#, c-format
+msgid "IMAP error on %s: LOGOUT error\n"
+msgstr "Error IMAP a %s: error de LOGOUT\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+#, c-format
+msgid "IMAP error on %s: CAPABILITY error\n"
 msgstr "Error IMAP a %s: error de CAPABILITY\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
-msgstr "Error"
+#: src/imap.c:665
+#, c-format
+msgid "IMAP error on %s: CHECK error\n"
+msgstr "Error IMAP a %s: error de CHECK\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
-msgstr "Error"
+#: src/imap.c:668
+#, c-format
+msgid "IMAP error on %s: CLOSE error\n"
+msgstr "Error IMAP a %s: error de CLOSE\n"
 
-#: src/imap.c:672
-msgid "EXPUNGE error"
-msgstr ""
+#: src/imap.c:671
+#, c-format
+msgid "IMAP error on %s: EXPUNGE error\n"
+msgstr "Error IMAP a %s: error d'EXPUNGE\n"
 
-#: src/imap.c:675
-msgid "COPY error"
-msgstr ""
+#: src/imap.c:674
+#, c-format
+msgid "IMAP error on %s: COPY error\n"
+msgstr "Error IMAP a %s: error de COPY\n"
 
-#: src/imap.c:678
-msgid "UID COPY error"
-msgstr ""
+#: src/imap.c:677
+#, c-format
+msgid "IMAP error on %s: UID COPY error\n"
+msgstr "Error IMAP a %s: error de UID COPY\n"
 
-#: src/imap.c:681
-msgid "CREATE error"
-msgstr ""
+#: src/imap.c:680
+#, c-format
+msgid "IMAP error on %s: CREATE error\n"
+msgstr "Error IMAP a %s: error de CREATE\n"
 
-#: src/imap.c:684
-msgid "DELETE error"
-msgstr ""
+#: src/imap.c:683
+#, c-format
+msgid "IMAP error on %s: DELETE error\n"
+msgstr "Error IMAP a %s: error de DELETE\n"
 
-#: src/imap.c:687
-msgid "EXAMINE error"
-msgstr ""
+#: src/imap.c:686
+#, c-format
+msgid "IMAP error on %s: EXAMINE error\n"
+msgstr "Error IMAP a %s: error d'EXAMINE\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
-msgstr "Error"
+#: src/imap.c:689
+#, c-format
+msgid "IMAP error on %s: FETCH error\n"
+msgstr "Error IMAP a %s: error de FETCH\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+#, c-format
+msgid "IMAP error on %s: UID FETCH error\n"
 msgstr "Error IMAP a %s: error d'UID FETCH\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
-msgstr "Error de socket."
+#: src/imap.c:695
+#, c-format
+msgid "IMAP error on %s: LIST error\n"
+msgstr "Error IMAP a %s: error de LIST\n"
 
-#: src/imap.c:699
-msgid "LOGIN error"
-msgstr ""
+#: src/imap.c:698
+#, c-format
+msgid "IMAP error on %s: LOGIN error\n"
+msgstr "Error IMAP a %s: error de LOGIN\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
-msgstr "Error desconegut"
+#: src/imap.c:701
+#, c-format
+msgid "IMAP error on %s: LSUB error\n"
+msgstr "Error IMAP a %s: error de LSUB\n"
 
-#: src/imap.c:705
-msgid "RENAME error"
-msgstr ""
+#: src/imap.c:704
+#, c-format
+msgid "IMAP error on %s: RENAME error\n"
+msgstr "Error IMAP a %s: error de RENAME\n"
 
-#: src/imap.c:708
-msgid "SEARCH error"
-msgstr ""
+#: src/imap.c:707
+#, c-format
+msgid "IMAP error on %s: SEARCH error\n"
+msgstr "Error IMAP a %s: error de SEARCH\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+#, c-format
+msgid "IMAP error on %s: UID SEARCH error\n"
 msgstr "Error IMAP a %s: error d'UID SEARCH\n"
 
-#: src/imap.c:714
-msgid "SELECT error"
-msgstr ""
+#: src/imap.c:713
+#, c-format
+msgid "IMAP error on %s: SELECT error\n"
+msgstr "Error IMAP a %s: error de SELECT\n"
 
-#: src/imap.c:717
-msgid "STATUS error"
-msgstr ""
+#: src/imap.c:716
+#, c-format
+msgid "IMAP error on %s: STATUS error\n"
+msgstr "Error IMAP a %s: error de STATUS\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
-msgstr "Error"
+#: src/imap.c:719
+#, c-format
+msgid "IMAP error on %s: STORE error\n"
+msgstr "Error IMAP a %s: error de SEARCH\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+#, c-format
+msgid "IMAP error on %s: UID STORE error\n"
 msgstr "Error IMAP a %s: error d'UID STORE\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+#, c-format
+msgid "IMAP error on %s: SUBSCRIBE error\n"
 msgstr "Error IMAP a %s: error de SUBSCRIBE\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+#, c-format
+msgid "IMAP error on %s: UNSUBSCRIBE error\n"
 msgstr "Error IMAP a %s: Error d'UNSUBSCRIBE\n"
 
-#: src/imap.c:732
-msgid "STARTTLS error"
-msgstr ""
+#: src/imap.c:731
+#, c-format
+msgid "IMAP error on %s: STARTTLS error\n"
+msgstr "Error IMAP a %s: error de STARTTLS\n"
 
-#: src/imap.c:735
-msgid "INVAL error"
-msgstr ""
+#: src/imap.c:734
+#, c-format
+msgid "IMAP error on %s: INVAL error\n"
+msgstr "Error IMAP a %s: error d'INVAL\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+#, c-format
+msgid "IMAP error on %s: EXTENSION error\n"
 msgstr "Error IMAP a %s: error d'EXTENSION\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
-msgstr "Error de socket."
+#: src/imap.c:740
+#, c-format
+msgid "IMAP error on %s: SASL error\n"
+msgstr "Error IMAP a %s: error de SASL\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
-msgstr "Error de socket."
+#: src/imap.c:744
+#, c-format
+msgid "IMAP error on %s: SSL error\n"
+msgstr "Error IMAP a %s: error de SSL\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
-msgstr "Error desconegut"
+#: src/imap.c:748
+#, c-format
+msgid "IMAP error on %s: Unknown error [%d]\n"
+msgstr "Error IMAP a %s: error desconegut [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5771,7 +5805,7 @@ msgstr ""
 "Els logins CRAM-MD5 només funcionen si libetpan ha estat compilat amb suport "
 "SASL i el mòdul CRAM-MD5 SASL està instal·lat."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5783,7 +5817,7 @@ msgstr ""
 "Els logins DIGEST-MD5 només funcionen si libetpan ha estat compilat amb "
 "suport SASL i el mòdul DIGEST-MD5 SASL està instal·lat."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5795,49 +5829,36 @@ msgstr ""
 "Les connexions de SCRAM-SHA-1 nomès funcionen si libetpan s'ha compilat amb "
 "suport SCRAM SASL i el connector està instal·lat."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"Els logins CRAM-MD5 només funcionen si libetpan ha estat compilat amb suport "
-"SASL i el mòdul CRAM-MD5 SASL està instal·lat."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Ha fallat la connexió amb %s: login refusat.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Ha fallat la connexió a %s: login %s refusat.\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Connexió amb %s fallida"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexió IMAP4 amb %s s'ha desconnectat. Reconnectant...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3631 src/imap.c:4290 src/imap.c:4387
+#: src/imap.c:4567 src/imap.c:5376
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail necessita accés a xarxa per accedir al servidor IMAP."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:278
 msgid "Insecure connection"
 msgstr "Connexió no segura"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:279
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5850,104 +5871,109 @@ msgstr ""
 "\n"
 "Vols seguir connectant a aquest servidor? La comunicació pot no ser segura."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:285
 msgid "Con_tinue connecting"
 msgstr "Con_tinuar connectant"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Compte: '%s': Connectant al servidor IMAP4: %s:%d ..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "No s'ha pogut connectar al servidor IMAP4: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No s'ha pogut connectar al servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4052
 msgid "Can't start TLS session.\n"
 msgstr "No s'ha pogut iniciar la sessió TLS.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No s'ha pogut realitzar el login al servidor IMAP %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No s'ha pogut realitzar el login al servidor IMAP %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Afegint missatges..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Copiant missatges..."
 
-#: src/imap.c:2546
+#: src/imap.c:2504
 msgid "can't set deleted flags\n"
 msgstr "no s'han pogut establir els flags esborrats\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2511 src/imap.c:5006
 msgid "can't expunge\n"
 msgstr "no s'ha pogut ampliar\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2862
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscant carpetes no subscrites a %s..."
 
-#: src/imap.c:2907
+#: src/imap.c:2865
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscant subcarpetes de %s..."
 
-#: src/imap.c:3225
+#: src/imap.c:3171
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no s'ha pogut crear la bústia: LIST ha fallat\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3186
 msgid "can't create mailbox\n"
 msgstr "no s'ha pogut crear la bústia\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3277
+msgid "New folder name must not contain the namespace path separator"
+msgstr ""
+"El nou nom de la carpeta no ha de contenir el separador de l'espai de noms"
+
+#: src/imap.c:3317
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no s'ha pogut reanomenar la bústia: %s a %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3430
 msgid "can't delete mailbox\n"
 msgstr "no s'ha pogut esborrar la bústia\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3709
 msgid "LIST failed\n"
 msgstr "LIST fallida\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3794
 msgid "Flagging messages..."
 msgstr "Marcant missatges..."
 
-#: src/imap.c:3951
+#: src/imap.c:3897
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "No s'ha pogut seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4049
 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor requereix TLS per accedir-hi.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4059
 msgid "Can't refresh capabilities.\n"
 msgstr "No es poden refrescar les capacitats.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4064
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5956,20 +5982,20 @@ msgstr ""
 "La connexió a %s ha fallat: el servidor requereix TLS, però s'ha compilat "
 "Claws Mail sense sense suport TLS.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4072
 msgid "Server logins are disabled.\n"
 msgstr "Els accessos al servidors estan deshabilitats.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4295
 msgid "Fetching message..."
 msgstr "Rebent missatge..."
 
-#: src/imap.c:5054
+#: src/imap.c:4999
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no s'han pogut establir els flags esborrats: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6032
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6021,7 +6047,7 @@ msgstr "S_ubscripcions"
 msgid "_Subscribe..."
 msgstr "_Subscriure's..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "Des_ubscriure's..."
 
@@ -6042,7 +6068,7 @@ msgstr "R_econstruïr l'arbre de carpetes"
 msgid "Show only subscribed _folders"
 msgstr "Mostrar només les _carpetes subscrites"
 
-#: src/imap_gtk.c:195
+#: src/imap_gtk.c:196
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
@@ -6052,26 +6078,26 @@ msgstr ""
 "(si vols crear una carpeta per emmagatzemar només subcarpetes\n"
 "i no correus, afegiu `/' al nom de la carpeta)"
 
-#: src/imap_gtk.c:199 src/mh_gtk.c:147
+#: src/imap_gtk.c:200 src/mh_gtk.c:148
 msgid "Inherit properties from parent folder"
 msgstr "Propietats heredades de la carpeta mare"
 
-#: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
-#: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/news_gtk.c:306
+#: src/plugins/mailmbox/plugin_gtk.c:414 src/plugins/rssyl/rssyl_cb_menu.c:201
+#: src/plugins/vcalendar/vcal_folder.c:2034
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Introdueixi el nou nom per a '%s':"
 
-#: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
-#: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/imap_gtk.c:263 src/mh_gtk.c:256 src/plugins/mailmbox/plugin_gtk.c:415
+#: src/plugins/rssyl/rssyl_cb_menu.c:202
+#: src/plugins/vcalendar/vcal_folder.c:2035
 msgid "Rename folder"
 msgstr "Reanomenar carpeta"
 
-#: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
-#: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/imap_gtk.c:292 src/mh_gtk.c:282 src/news_gtk.c:328
+#: src/plugins/mailmbox/plugin_gtk.c:445 src/plugins/rssyl/rssyl_cb_menu.c:228
+#: src/plugins/vcalendar/vcal_folder.c:2055
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6079,7 +6105,7 @@ msgstr ""
 "No s'ha pogut reanomenar la carpeta.\n"
 "El nou nom no està permès."
 
-#: src/imap_gtk.c:359 src/mh_gtk.c:202 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:360 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:154
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6092,45 +6118,44 @@ msgstr ""
 "\n"
 "Vols eliminar-los definitivament?"
 
-#: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
-#: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/imap_gtk.c:381 src/news_gtk.c:281 src/plugins/mailmbox/plugin_gtk.c:350
+#: src/plugins/rssyl/rssyl_cb_menu.c:175
+#: src/plugins/vcalendar/vcal_folder.c:1988
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No es pot esborrar la carpeta '%s'."
 
-#: src/imap_gtk.c:506
+#: src/imap_gtk.c:507
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "Realment vols buscar carpetes no subscrites de '%s'?"
 
-#: src/imap_gtk.c:509
+#: src/imap_gtk.c:510
 msgid "Search recursively"
 msgstr "Cercar recursivament"
 
-#: src/imap_gtk.c:514 src/imap_gtk.c:573
+#: src/imap_gtk.c:515 src/imap_gtk.c:574
 msgid "Subscriptions"
 msgstr "Subscripcions"
 
-#: src/imap_gtk.c:515
-#, fuzzy
-msgid "_Search"
+#: src/imap_gtk.c:516
+msgid "+_Search"
 msgstr "+_Cercar"
 
-#: src/imap_gtk.c:525
+#: src/imap_gtk.c:526
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Escolliu una subcarpeta de %s per subscriure a: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:537 src/mainwindow.c:674
 msgid "Subscribe"
 msgstr "Subscriure's"
 
-#: src/imap_gtk.c:538 src/imap_gtk.c:540
+#: src/imap_gtk.c:539 src/imap_gtk.c:541
 msgid "All of them"
 msgstr "Tots"
 
-#: src/imap_gtk.c:556
+#: src/imap_gtk.c:557
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6142,32 +6167,31 @@ msgstr ""
 "Si hi ha noves carpetes, creades i no subscrites d'un altre client, useu "
 "\"Comprovar per noves carpetes\" a la carpeta arrel de la bústia."
 
-#: src/imap_gtk.c:565
+#: src/imap_gtk.c:566
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Vols %s la carpeta '%s'?"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:567
 msgid "subscribe"
 msgstr "Subscriure's"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:567
 msgid "unsubscribe"
 msgstr "desubscriure's"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:569 src/prefs_folder_item.c:1440
+#: src/prefs_folder_item.c:1468 src/prefs_folder_item.c:1496
 msgid "Apply to subfolders"
 msgstr "Aplicar a les subcarpetes"
 
-#: src/imap_gtk.c:574
-#, fuzzy
-msgid "_Subscribe"
+#: src/imap_gtk.c:575
+msgid "+_Subscribe"
 msgstr "+_Subscriure's"
 
-#: src/imap_gtk.c:575 src/news_gtk.c:267
-msgid "_Unsubscribe"
-msgstr "/Des_ubscriure's"
+#: src/imap_gtk.c:575
+msgid "+_Unsubscribe"
+msgstr "+_Des_ubscriure's"
 
 #: src/import.c:113 src/import.c:207
 msgid "Import mbox file"
@@ -6201,35 +6225,35 @@ msgstr "No es pot trobar la carpeta de destinació."
 msgid "Select importing file"
 msgstr "Seleccionar arxiu a importar"
 
-#: src/importldif.c:185
+#: src/importldif.c:186
 msgid "Please specify address book name and file to import."
 msgstr "Especifiqueu el nom de l'agenda i l'arxiu a importar."
 
-#: src/importldif.c:188
+#: src/importldif.c:189
 msgid "Select and rename LDIF field names to import."
 msgstr "Seleccioneu i renombreu els camps LDIF a importar."
 
-#: src/importldif.c:191
+#: src/importldif.c:192
 msgid "File imported."
 msgstr "Arxiu importat."
 
-#: src/importldif.c:450 src/importmutt.c:122 src/importpine.c:121
+#: src/importldif.c:451 src/importmutt.c:123 src/importpine.c:122
 msgid "Please select a file."
 msgstr "Seleccioneu un arxiu."
 
-#: src/importldif.c:456 src/importmutt.c:127 src/importpine.c:126
+#: src/importldif.c:457 src/importmutt.c:128 src/importpine.c:127
 msgid "Address book name must be supplied."
 msgstr "Heu de proporcionar un nom d'agenda d'adreces."
 
-#: src/importldif.c:496
+#: src/importldif.c:497
 msgid "LDIF file imported successfully."
 msgstr "Arxiu LDIF importat amb èxit."
 
-#: src/importldif.c:581
+#: src/importldif.c:582
 msgid "Select LDIF File"
 msgstr "Seleccionar arxiu LDIF"
 
-#: src/importldif.c:667
+#: src/importldif.c:668
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
@@ -6237,43 +6261,43 @@ msgstr ""
 "Especifiqueu el nom per a l'agenda que serà creada a partir de les dades de "
 "l'arxiu LDIF."
 
-#: src/importldif.c:672
+#: src/importldif.c:673
 msgid "File Name"
 msgstr "Nom de l'arxiu"
 
-#: src/importldif.c:682
+#: src/importldif.c:683
 msgid "The full file specification of the LDIF file to import."
 msgstr "L'especificació completa de l'arxiu LDIF a importar."
 
-#: src/importldif.c:689
+#: src/importldif.c:690
 msgid "Select the LDIF file to import."
 msgstr "Seleccioneu l'arxiu LDIF a importar."
 
-#: src/importldif.c:725
+#: src/importldif.c:726
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:726 src/summaryview.c:438
+#: src/importldif.c:727 src/summaryview.c:439
 msgid "S"
 msgstr "E"
 
-#: src/importldif.c:727
+#: src/importldif.c:728
 msgid "LDIF Field Name"
 msgstr "Nom del camp LDIF"
 
-#: src/importldif.c:728
+#: src/importldif.c:729
 msgid "Attribute Name"
 msgstr "Nom de l'atributo"
 
-#: src/importldif.c:783
+#: src/importldif.c:784
 msgid "LDIF Field"
 msgstr "Camp LDIF"
 
-#: src/importldif.c:795
+#: src/importldif.c:796
 msgid "Attribute"
 msgstr "Atribut"
 
-#: src/importldif.c:807
+#: src/importldif.c:808
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -6291,117 +6315,117 @@ msgstr ""
 "la llista. Doble click a qualsevol part de la fila i també serà seleccionat "
 "el camp per importar."
 
-#: src/importldif.c:822
+#: src/importldif.c:823
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "El camp LDIF pot reanomenar-se al nom de l'atribut d'usuari."
 
-#: src/importldif.c:827
+#: src/importldif.c:828
 msgid "Select for Import"
 msgstr "Seleccionar per importar"
 
-#: src/importldif.c:832
+#: src/importldif.c:833
 msgid "Select the LDIF field for import into the address book."
 msgstr "Seleccionar el camp LDIF per a importar-lo a l'agenda."
 
-#: src/importldif.c:834
+#: src/importldif.c:835
 msgid " Modify "
 msgstr " Modificar "
 
-#: src/importldif.c:839
+#: src/importldif.c:840
 msgid "This button will update the list above with the data supplied."
 msgstr ""
 "Aquest botó actualitzarà la llista superior amb les dades proporcionades."
 
-#: src/importldif.c:911
+#: src/importldif.c:912
 msgid "Records Imported:"
 msgstr "Registres importats :"
 
-#: src/importldif.c:943
+#: src/importldif.c:944
 msgid "Import LDIF file into Address Book"
 msgstr "Importar arxiu LDIF a l'agenda"
 
-#: src/importldif.c:980
+#: src/importldif.c:981
 msgid "Proceed"
 msgstr "Procedir"
 
-#: src/importmutt.c:141
+#: src/importmutt.c:142
 msgid "Error importing MUTT file."
 msgstr "Error important l'arxiu de MUTT."
 
-#: src/importmutt.c:156
+#: src/importmutt.c:157
 msgid "Select MUTT File"
 msgstr "Seleccioneu l'arxiu MUTT"
 
-#: src/importmutt.c:203
+#: src/importmutt.c:204
 msgid "Import MUTT file into Address Book"
 msgstr "Importar arxiu MUTT a l'agenda"
 
-#: src/importmutt.c:288 src/importpine.c:288
+#: src/importmutt.c:289 src/importpine.c:289
 msgid "Please select a file to import."
 msgstr "Seleccioneu l'arxiu a importar."
 
-#: src/importpine.c:140
+#: src/importpine.c:141
 msgid "Error importing Pine file."
 msgstr "Error important l'arxiu de Pine."
 
-#: src/importpine.c:155
+#: src/importpine.c:156
 msgid "Select Pine File"
 msgstr "Seleccionar arxiu Pine"
 
-#: src/importpine.c:202
+#: src/importpine.c:203
 msgid "Import Pine file into Address Book"
 msgstr "Importar arxiu Pine a l'agenda"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail necessita xarxa per descarregar els correus."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s fallida\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Obtenint nous missatges"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Cancellat"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Recuperant"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Fet (%d missatge (%s) rebut)"
 msgstr[1] "Fet (%d missatge(s) (%s) rebut(s))"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Fet (no hi ha missatges nous)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Connexió fallida"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "Authorizació fallida"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
+#: src/inc.c:662 src/prefs_matcher.c:396 src/prefs_summary_column.c:88
+#: src/summaryview.c:2797 src/summaryview.c:6318
 msgid "Locked"
 msgstr "Bloquejat"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Temps límit"
 
@@ -6436,8 +6460,8 @@ msgstr "No s'ha pogut connectar amb el servidor POP3: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No s'ha pogut connectar amb el servidor POP3: %s:%d\n"
 
-#: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278
+#: src/send_message.c:494
 msgid "Authenticating..."
 msgstr "Autentificant..."
 
@@ -6462,7 +6486,7 @@ msgstr "Obtenint el número de nous missatges (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtenint el tamany dels nous missatges (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:512
 msgid "Quitting"
 msgstr "Sortint"
 
@@ -6513,7 +6537,7 @@ msgstr "Error de socket."
 msgid "Socket error on connection to %s:%d."
 msgstr "Error de socket connectant amb %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:423 src/send_message.c:686
 msgid "Connection closed by the remote host."
 msgstr "Connexió tancada per la màquina remota."
 
@@ -6535,11 +6559,11 @@ msgstr ""
 "La bústia està bloquejada:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:671
 msgid "Authentication failed."
 msgstr "Autentificació fallida."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:674
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6548,7 +6572,7 @@ msgstr ""
 "L'autentificació ha fallat:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:690
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6583,7 +6607,7 @@ msgstr "Només _una vegada"
 msgid "Some SN"
 msgstr "Algun SN"
 
-#: src/ldif.c:758
+#: src/ldif.c:759
 msgid "Nick Name"
 msgstr "Motiu (nick)"
 
@@ -6648,16 +6672,32 @@ msgstr "Migració fallida!"
 msgid "Migrating configuration..."
 msgstr "Migrant la configuració..."
 
+#: src/main.c:937
+msgid "Failed to register folder item update hook"
+msgstr ""
+"Ha fallat el registre de l'enllaç d'actualització d'elements de carpeta"
+
+#: src/main.c:944
+msgid "Failed to register folder update hook"
+msgstr "Ha fallat el registre de l'enllaç d'actualització de les carpetes"
+
 #: src/main.c:1117
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no està soportat per glib.\n"
 
-#: src/main.c:1137 src/main.c:1141 src/main.c:1145
-#, fuzzy
-msgid "(or older)"
-msgstr "Carpeta origen:"
+#: src/main.c:1136
+msgid "Sylpheed-Claws 2.6.0 (or older)"
+msgstr "Sylpheed-Claws 2.6.0 (o anterior)"
 
-#: src/main.c:1445
+#: src/main.c:1139
+msgid "Sylpheed-Claws 1.9.15 (or older)"
+msgstr "Sylpheed-Claws 1.9.15 (o anterior)"
+
+#: src/main.c:1142
+msgid "Sylpheed-Claws 1.0.5 (or older)"
+msgstr "Sylpheed-Claws 1.0.5 (o anterior)"
+
+#: src/main.c:1442
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6676,7 +6716,7 @@ msgstr[1] ""
 "mòduls per més informació:\n"
 "%s"
 
-#: src/main.c:1473
+#: src/main.c:1470
 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 "
@@ -6687,7 +6727,7 @@ msgstr ""
 "carpetes\" del menú contextual de la carpeta mare de la bústia per intentar "
 "arreglar-ho."
 
-#: src/main.c:1479
+#: src/main.c:1476
 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 "
@@ -6697,36 +6737,36 @@ msgstr ""
 "És probable que estigui soportat per un mòdul extern desactualitzat. Si us "
 "plau reinstal·leu el mòdul i intenteu-ho una altra vegada."
 
-#: src/main.c:1729
+#: src/main.c:1726
 msgid "Missing filename\n"
 msgstr "No s'ha trobat el nom del fitxer\n"
 
-#: src/main.c:1736
+#: src/main.c:1733
 msgid "Cannot open filename for reading\n"
 msgstr "No s'ha pogut obrir el fitxer per llegir-lo\n"
 
-#: src/main.c:1747
+#: src/main.c:1744
 msgid "Malformed header\n"
 msgstr "Capçalera mal formada\n"
 
-#: src/main.c:1754
+#: src/main.c:1751
 msgid "Duplicated 'To:' header\n"
 msgstr "Capçalera \"Per:\" duplicada\n"
 
-#: src/main.c:1765
+#: src/main.c:1762
 msgid "Missing required 'To:' header\n"
 msgstr "No s'ha trobat la capçalera requerida 'Per:'\n"
 
-#: src/main.c:1908
+#: src/main.c:1905
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Ús: %s [OPCIÓ]...\n"
 
-#: src/main.c:1910
+#: src/main.c:1907
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adreça]  obre la finestra d'edició"
 
-#: src/main.c:1911
+#: src/main.c:1908
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6746,12 +6786,12 @@ msgstr ""
 "                          línia buida, llavors el cos del correu fins al "
 "final de l'arxiu."
 
-#: src/main.c:1916
+#: src/main.c:1913
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      subscriu-re's a la URI proporcionada si es posible"
 
-#: src/main.c:1917
+#: src/main.c:1914
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6761,23 +6801,23 @@ msgstr ""
 "                         obre la finestra de composició amb els arxius\n"
 "                         especificats com a adjunts"
 
-#: src/main.c:1920
+#: src/main.c:1917
 msgid "  --receive              receive new messages"
 msgstr "  --receive              rep els missatges nous"
 
-#: src/main.c:1921
+#: src/main.c:1918
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          rep nous missatges per tots els comptes"
 
-#: src/main.c:1922
+#: src/main.c:1919
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     cancel·lar la recepció de missatges"
 
-#: src/main.c:1923
+#: src/main.c:1920
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       cancel·lar l'enviament dels missatges"
 
-#: src/main.c:1924
+#: src/main.c:1921
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6795,15 +6835,15 @@ msgstr ""
 "                        petició: cadena de cerca\n"
 "                        recursiva: false if arg. starts with 0, n, N, f or F"
 
-#: src/main.c:1931
+#: src/main.c:1928
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar tots els missatges encuats"
 
-#: src/main.c:1932
+#: src/main.c:1929
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  mostra el número total de missatges"
 
-#: src/main.c:1933
+#: src/main.c:1930
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6811,15 +6851,15 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         mostra l'estat de cada carpeta"
 
-#: src/main.c:1935
+#: src/main.c:1932
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           mostren estadístiques de la sessió"
 
-#: src/main.c:1936
+#: src/main.c:1933
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     estadístiques de sessió de reinici"
 
-#: src/main.c:1937
+#: src/main.c:1934
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6828,35 +6868,35 @@ msgstr ""
 "                         carpeta és un identificador estil 'carpeta/"
 "sub_carpeta'inbox»"
 
-#: src/main.c:1939
+#: src/main.c:1936
 msgid "  --online               switch to online mode"
 msgstr "  --online               canviar a mode de treball amb connexió"
 
-#: src/main.c:1940
+#: src/main.c:1937
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline               canviar a mode de treball sense connexió"
 
-#: src/main.c:1941
+#: src/main.c:1938
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       sortir de Claws Mail"
 
-#: src/main.c:1942
+#: src/main.c:1939
 msgid "  --debug                debug mode"
 msgstr "  --debug                mode de depuració"
 
-#: src/main.c:1943
+#: src/main.c:1940
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         mode de depuració"
 
-#: src/main.c:1944
+#: src/main.c:1941
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              presenta aquesta ajuda i finalitza"
 
-#: src/main.c:1945
+#: src/main.c:1942
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           dona la informació de la versió i finalitza"
 
-#: src/main.c:1946
+#: src/main.c:1943
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6864,11 +6904,11 @@ msgstr ""
 "  --version-full -V      dona la informació de la versió i les "
 "característiques i finalitza"
 
-#: src/main.c:1947
+#: src/main.c:1944
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           mostra el directori de la configuració"
 
-#: src/main.c:1948
+#: src/main.c:1945
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6876,848 +6916,837 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         usar el directori de configuració especificat"
 
-#: src/main.c:1998
+#: src/main.c:1995
 msgid "Unknown option\n"
 msgstr "Opció desconeguda\n"
 
-#: src/main.c:2016
+#: src/main.c:2013
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Processant (%s)..."
 
-#: src/main.c:2019
+#: src/main.c:2016
 msgid "top level folder"
 msgstr "carpeta superior"
 
-#: src/main.c:2102
+#: src/main.c:2099
 msgid "Queued messages"
 msgstr "Missatges en cua"
 
-#: src/main.c:2103
+#: src/main.c:2100
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hi ha missatges sense enviar a la cua. Sortir ara?"
 
-#: src/main.c:2845
+#: src/main.c:2842
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: La xarxa està connectada.\n"
 
-#: src/main.c:2851
+#: src/main.c:2848
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: La xarxa està desconnectada.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:505 src/messageview.c:209
 msgid "_File"
 msgstr "_Arxiu"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:507 src/messageview.c:211 src/summaryview.c:434
 msgid "_View"
 msgstr "_Veure"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:510
 msgid "_Configuration"
 msgstr "_Configuració"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:514
 msgid "_Add mailbox"
 msgstr "_Afegir bústia"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:515
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:518
 msgid "Change mailbox order..."
 msgstr "Canviar l'ordre de les bùsties de correu..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:521
 msgid "_Import mbox file..."
 msgstr "_Importar arxiu mbox..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:522
 msgid "_Export to mbox file..."
 msgstr "_Exportar a arxiu mbox..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
 msgstr "_Exportar seleccionats a arxiu mbox..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:525
 msgid "Empty all _Trash folders"
 msgstr "Buidar _totes les papereres"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:528 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "De_sar com..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:529 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "De_sar com..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:532 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Configuració de pàgina..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:533 src/messageview.c:221
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:535
 msgid "Synchronise folders"
 msgstr "Sincronitzar carpetes"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:537
 msgid "E_xit"
 msgstr "_Sortir"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:542
 msgid "Select _thread"
 msgstr "Seleccionar _fil"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:543
+msgid "_Delete thread"
+msgstr "_Esborrar capçalera"
+
+#: src/mainwindow.c:545
 msgid "_Find in current message..."
 msgstr "_Cercar en el missatge actual..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:547
 msgid "_Quick search"
 msgstr "_Busqueda ràpida"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:550
 msgid "Show or hi_de"
 msgstr "_Mostrar o ocultar"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:551
 msgid "_Toolbar"
 msgstr "_Barra d'eines"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:553
 msgid "Set displayed _columns"
 msgstr "Definir _columnes visibles"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:554
 msgid "In _folder list..."
 msgstr "A la _llista de carpetes..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:555
 msgid "In _message list..."
 msgstr "A la llista de _missatges..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:560
 msgid "La_yout"
 msgstr "_Disposició"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:563
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:565
 msgid "_Attract by subject"
 msgstr "Atraure _per assumpte"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:567
 msgid "E_xpand all threads"
 msgstr "E_xpandir tots els fils"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:568
 msgid "Co_llapse all threads"
 msgstr "Co_llapsar tots els fils"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:570 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Anar a"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:571 src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Missatge anterior"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:572 src/messageview.c:234
 msgid "_Next message"
 msgstr "Següe_nt missatge"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:574 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Missatge ante_rior sense llegir"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:575 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Missatge següent sense llegir"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:577 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Anterior missatge no_u"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:578 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Segü_ent Missatge nou"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:580 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Missatge _marcat anterior"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:581 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Missatge m_arcat següent"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:583 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Missatge e_tiquetat anterior"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:584 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Missatge eti_quetat següent"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:586 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Missatge anterior obert"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:587 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Següent missatge nou"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:589 src/messageview.c:251
 msgid "Parent message"
 msgstr "Missatge pare"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:591 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "_Següent directori sense llegir"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:592 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Altra carpeta..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:594 src/messageview.c:256 src/mimeview.c:201
 msgid "Next part"
 msgstr "Següent part"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:595 src/messageview.c:257 src/mimeview.c:202
 msgid "Previous part"
 msgstr "Part anterior"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:598 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Missatge"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:599 src/messageview.c:259
 msgid "Previous line"
 msgstr "Línea anterior"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:600 src/messageview.c:260
 msgid "Next line"
 msgstr "Línea següent"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:601 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Pàgina anterior"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:602 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Pàgina següent"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:620 src/messageview.c:280
 msgid "Decode"
 msgstr "Decodificar"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:627
 msgid "Open in new _window"
 msgstr "Obrir en finestra _nova"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:628 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Fon_t del missatge"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:630 src/messageview.c:288
 msgid "Message part"
 msgstr "Part del missatge"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:631 src/messageview.c:289
 msgid "View as text"
 msgstr "Mostrar com a text"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:632 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Obrir"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:634 src/messageview.c:292
 msgid "Open with..."
 msgstr "Obrir amb..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:638 src/messageview.c:295
 msgid "Quotes"
 msgstr "Marques"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:640
 msgid "_Update summary"
 msgstr "Act_ualitzar resum"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:643
 msgid "Recei_ve"
 msgstr "Re_bre"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:644
 msgid "Get from _current account"
 msgstr "Del compte _actual"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:645
 msgid "Get from _all accounts"
 msgstr "De _tots els comptes"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:646
 msgid "Cancel receivin_g"
 msgstr "Cancel·lar la re_cepció"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:649
 msgid "_Send queued messages"
 msgstr "Enviar mi_ssatge(s) encuats"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:654
 msgid "Compose a_n email message"
 msgstr "Composar _nou missatge"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:655
 msgid "Compose a news message"
 msgstr "Composar missatge de notícies"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:657 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Respondre"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:658 src/messageview.c:302 src/summaryview.c:426
 msgid "Repl_y to"
 msgstr "Respon_dre a"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:661 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "L_lista de correu"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:662
 msgid "Follow-up and reply to"
 msgstr "Reenviar i respondre a"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:665 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:666 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Reen_viar com a adjunt"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:667 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Redirigi_r"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:669
 msgid "Mailing-_List"
 msgstr "L_lista-Correu"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:670
 msgid "Post"
 msgstr "Postejar"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:672
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:676
 msgid "Unsubscribe"
 msgstr "Desubscriure's"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:678
 msgid "View archive"
 msgstr "Veure arxiu"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:680
 msgid "Contact owner"
 msgstr "Contactar propietari"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:684
 msgid "M_ove..."
 msgstr "M_oure..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:685
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:686
 msgid "Move to _trash"
 msgstr "Moure a les _escombraries"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:687
 msgid "_Delete..."
 msgstr "_Esborrar..."
 
-#: src/mainwindow.c:693
-#, fuzzy
-msgid "Move thread to tr_ash"
-msgstr "Moure a les _escombraries"
-
-#: src/mainwindow.c:694
-#, fuzzy
-msgid "Delete t_hread"
-msgstr "_Esborrar capçalera"
-
-#: src/mainwindow.c:695
+#: src/mainwindow.c:688
 msgid "Cancel a news message"
 msgstr "Cancel·lar una notícia"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:691 src/mainwindow.c:692 src/summaryview.c:427
 msgid "_Mark"
 msgstr "_Marcar"
 
 # RML To be consistent with previous one.
-#: src/mainwindow.c:700
+#: src/mainwindow.c:693
 msgid "_Unmark"
 msgstr "_Desmarca"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:696
 msgid "Mark as unr_ead"
 msgstr "Marcar com a no ll_egit"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:697
 msgid "Mark as rea_d"
 msgstr "Marcar com lle_git"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:699
 msgid "Mark all read"
 msgstr "Marcar tot com _llegit"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:701 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorar fil"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:702
 msgid "Unignore thread"
 msgstr "Deixar d'ignorar el fil"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:703 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Revisar fil de discussió"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:704
 msgid "Unwatch thread"
 msgstr "Deixar de revisar el fil"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:707
 msgid "Mark as _spam"
 msgstr "Marcar com a correu bro_ssa"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:708
 msgid "Mark as _ham"
 msgstr "Marcar com a bò"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:711 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Bloquejar"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Desbloquejar"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:714 src/summaryview.c:428
 msgid "Color la_bel"
 msgstr "E_tiqueta de color"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:715 src/summaryview.c:429
 msgid "Ta_gs"
 msgstr "Eti_quetes"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:718
 msgid "Re-_edit"
 msgstr "Re_editar"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:721 src/messageview.c:311 src/mimeview.c:1027
 msgid "Check signature"
 msgstr "Comprovar signatura"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:726 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Afegir _remitent a la llibreta d'ad_reces"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:728
 msgid "C_ollect addresses"
 msgstr "Rec_ollir adreces"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:729
 msgid "From current _folder..."
 msgstr "De la carpeta ac_tual..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:730
 msgid "From selected _messages..."
 msgstr "dels _missatges seleccionats..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:733
 msgid "_Filter all messages in folder"
 msgstr "_Filtrar tots els missatges de la carpeta"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:734
 msgid "Filter _selected messages"
 msgstr "_Filtrar els missatges _seleccionats"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:735
 msgid "Run folder pr_ocessing rules"
 msgstr "Executar regles de pr_ocessament"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "_Crear regla de filtrat"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:738 src/mainwindow.c:744 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automàticament"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:739 src/mainwindow.c:745 src/mainwindow.c:848
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "Per el Des _de"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:740 src/mainwindow.c:746 src/mainwindow.c:849
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Per el _Per a"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "Per A_ssumpte"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:743 src/messageview.c:324 src/summaryview.c:432
 msgid "Create processing rule"
 msgstr "Crear regla de processament"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:750 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Llistar _URLs..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
 msgstr "Comprovar missatg_es nous en totes les carpetes"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:758
 msgid "Delete du_plicated messages"
 msgstr "Es_borrar els missatges repetits"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:759
 msgid "In selected folder"
 msgstr "A la carpeta seleccionada"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:760
 msgid "In all folders"
 msgstr "A totes les carpetes"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:763
 msgid "E_xecute"
 msgstr "E_xecutar"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:764
 msgid "Exp_unge"
 msgstr "Exp_urgar"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:767
 msgid "SSL cer_tificates"
 msgstr "Cer_tificats SSL"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:771
 msgid "Filtering Lo_g"
 msgstr "Traça de _filtrat"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:773
 msgid "Network _Log"
 msgstr "Traça de _xarxa"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:775
 msgid "_Forget all session passwords"
 msgstr "Obli_dar totes les contrassenyes de sessió"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "Obli_dar totes les contrassenyes de sessió"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:778
 msgid "C_hange current account"
 msgstr "_Canviar el compte actual"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:780
 msgid "_Preferences for current account..."
 msgstr "_Preferències del compte actual..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:781
 msgid "Create _new account..."
 msgstr "Crear _nou compte..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:782
 msgid "_Edit accounts..."
 msgstr "Editar comptes..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:785
 msgid "P_references..."
 msgstr "P_referències..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
 msgstr "Pre-pr_ocessant..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:787
 msgid "Post-pro_cessing..."
 msgstr "Post-pro_cessant..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:788
 msgid "_Filtering..."
 msgstr "_Filtrant..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:789
 msgid "_Templates..."
 msgstr "Plan_tilles..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:790
 msgid "_Actions..."
 msgstr "_Accions..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:791
 msgid "Tag_s..."
 msgstr "Etiquete_s..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:793
 msgid "Plu_gins..."
 msgstr "Co_nnectors..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:796
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
 msgstr "PUF d'usuari c_ollaborador en línia (FAQ)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:798
 msgid "Icon _Legend"
 msgstr "Text de _la Icona"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:800
 msgid "Set as default client"
 msgstr "Marcar com a client per defecte"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:807
 msgid "Offline _mode"
 msgstr "_Mode sense connexió"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:808
 msgid "Men_ubar"
 msgstr "Barra de _menu"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:809
 msgid "_Message view"
 msgstr "Vista de _missatges"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:811
 msgid "Status _bar"
 msgstr "_Barra d'estat"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:813
 msgid "Column headers"
 msgstr "Capçaleres de columna"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:814
 msgid "Th_read view"
 msgstr "Vista je_ràrquica"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:815
 msgid "Hide read threads"
 msgstr "Amagar els fils llegits"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:816
 msgid "_Hide read messages"
 msgstr "Ama_gar els missatges llegits"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:817
 msgid "Hide deleted messages"
 msgstr "Oculta missatges esborrats"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:818
 msgid "_Fullscreen"
 msgstr "_Pantalla complerta"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:819 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Mostrar totes les ca_pçaleres"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:820 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "_Collapsar to"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:821 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Plegar desde el nivell _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:822 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Plegar desde el nivell _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:826
 msgid "Text _below icons"
 msgstr "Te_xt sota les icones"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:827
 msgid "Text be_side icons"
 msgstr "Text al costat de les icones"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:828
 msgid "_Icons only"
 msgstr "Només _icones"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:829
 msgid "_Text only"
 msgstr "Només _text"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:836
 msgid "_Standard"
 msgstr "E_standart"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:837
 msgid "_Three columns"
 msgstr "_Tres columnes"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:838
 msgid "_Wide message"
 msgstr "Missat_ge ample"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:839
 msgid "W_ide message list"
 msgstr "Llista de missatges ampla"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:840
 msgid "S_mall screen"
 msgstr "_Pantalla petita"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:844
 msgid "By _number"
 msgstr "Per _número"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:845
 msgid "By s_ize"
 msgstr "Per _tamany"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:846
 msgid "By _date"
 msgstr "Per _data"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:847
 msgid "By thread date"
 msgstr "Per data del Fil"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:850
 msgid "By s_ubject"
 msgstr "Per Ass_umpte"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:851
 msgid "By _color label"
 msgstr "Per etiqueta de _color"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:852
 msgid "By tag"
 msgstr "Qualsevol etiqueta"
 
 # RML To be consistent with previous one.
-#: src/mainwindow.c:863
+#: src/mainwindow.c:853
 msgid "By _mark"
 msgstr "Per _marca"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:854
 msgid "By _status"
 msgstr "Per e_stat"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:855
 msgid "By a_ttachment"
 msgstr "Per adjun_t"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:856
 msgid "By score"
 msgstr "Per puntuació"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:857
 msgid "By locked"
 msgstr "Per bloquejat"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:858
 msgid "D_on't sort"
 msgstr "N_o ordenar"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:862
 msgid "Ascending"
 msgstr "Ascendent"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:863
 msgid "Descending"
 msgstr "Descendent"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:905 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_Autodetectar"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1302 src/summaryview.c:6244
 msgid "Apply tags..."
 msgstr "Aplicar etiquetes..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1945
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "S'ha(n) produït algun(s) error(s). Pulseu aquí per veure la traça registrada."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1960
 msgid "You are online. Click the icon to go offline"
 msgstr "Estàs connectat. Polseu en la icona per desconnectar"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1963
 msgid "You are offline. Click the icon to go online"
 msgstr "Estàs desconnectat. Polseu en la icona per connectar"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1977
 msgid "Select account"
 msgstr "Seleccionar compte"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2004 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Traça de xarxa"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2008
 msgid "Filtering/Processing debug log"
 msgstr "Filtrat/Processament de la traça de depuració"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2027 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filtrat de traça activat\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2029 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filtrat de traça desactivat\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2472 src/mainwindow.c:2479 src/mainwindow.c:2522
+#: src/mainwindow.c:2555 src/mainwindow.c:2587 src/mainwindow.c:2632
 #: src/plugins/notification/notification_trayicon.c:360
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Sense títol"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2633 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "cap"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2890 src/mainwindow.c:2894
 msgid "Delete all messages in trash folders?"
 msgstr "Esborrar tots els missatges de la paperera?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2891
 msgid "Don't quit"
 msgstr "No sortir"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Afegir bústia"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2921
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7727,18 +7756,18 @@ msgstr ""
 "Si la bústia existent és especificada, serà\n"
 "escaneajada automàticament."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2927 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La bústia '%s' ja existeix."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Correu"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2937 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7748,132 +7777,131 @@ msgstr ""
 "Pot ser que ja existeixin els arxius o no tingueu prous permisos per a "
 "escriure en el directori."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3389
 msgid "No posting allowed"
 msgstr "Cap correu permès"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3967
 msgid "Mbox import has failed."
 msgstr "L'importació de l'arxiu mbox ha fallat."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3976 src/mainwindow.c:3985
 msgid "Export to mbox has failed."
 msgstr "L'exportació a arxiu mbox ha fallat."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4026 src/plugins/notification/notification_trayicon.c:515
 msgid "Exit"
 msgstr "Sortir"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4026 src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
 msgstr "Vols sortir de Claws Mail?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4217
 msgid "Folder synchronisation"
 msgstr "Sincronització de carpetes"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4218
 msgid "Do you want to synchronise your folders now?"
 msgstr "Vols sincronitzar les teves carpetes ara?"
 
-#: src/mainwindow.c:4248
-#, fuzzy
-msgid "_Synchronise"
+#: src/mainwindow.c:4219
+msgid "+_Synchronise"
 msgstr "+_Sincronitzar"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4661
 msgid "Deleting duplicated messages..."
 msgstr "Esborrant missatges duplicats..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4698
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Esborrant %d missatge duplicat a les %d carpetes.\n"
 msgstr[1] "Esborrant %d missatges duplicats a les %d carpetes.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4953 src/summaryview.c:5733
 msgid "Processing rules to apply before folder rules"
 msgstr "Regles de processament a aplicar abans de les de les carpetes"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4961
 msgid "Processing rules to apply after folder rules"
 msgstr "Regles de processament a aplicar després de les de les carpetes"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4969 src/summaryview.c:5744
 msgid "Filtering configuration"
 msgstr "Configuració de filtrat"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5084
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "No s'ha pogut establir com a client per defecte: impossible  obtenir la ruta "
 "de l'executable."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5143
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail ha estat registrat com a cliente per defecte."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5145
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "No s'ha pogut registrar com a client per defecte: impossible escriure al "
 "registre."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5303
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d password oblidada a %d comptes.\n"
 msgstr[1] "%d passwords oblidades a %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:211 src/matcher.c:212 src/matcher.c:213 src/matcher.c:214
+#: src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "capçalera %s"
 
-#: src/matcher.c:222
+#: src/matcher.c:218
 msgid "header"
 msgstr "capçalera"
 
-#: src/matcher.c:223
+#: src/matcher.c:219
 msgid "header line"
 msgstr "Línia de capçalera"
 
-#: src/matcher.c:224
+#: src/matcher.c:220
 msgid "body line"
 msgstr "Línia de cos del missatge"
 
-#: src/matcher.c:225
+#: src/matcher.c:221
 msgid "tag"
 msgstr "etiqueta"
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
+#: src/matcher.c:525 src/matcher.c:530 src/matcher.c:550 src/matcher.c:555
 #: src/message_search.c:212 src/prefs_matcher.c:742 src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Majs./mins."
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
+#: src/matcher.c:525 src/matcher.c:530 src/matcher.c:550 src/matcher.c:555
 msgid "Case insensitive"
 msgstr "No susceptible a majs./mins."
 
-#: src/matcher.c:1849
+#: src/matcher.c:1843
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "comprovant si el missatge concorda [ %s ]\n"
 
-#: src/matcher.c:1920 src/matcher.c:1939 src/matcher.c:1952
+#: src/matcher.c:1912 src/matcher.c:1931 src/matcher.c:1944
 msgid "message matches\n"
 msgstr "el missatge concorda\n"
 
-#: src/matcher.c:1927 src/matcher.c:1945 src/matcher.c:1954
+#: src/matcher.c:1919 src/matcher.c:1937 src/matcher.c:1946
 msgid "message does not match\n"
 msgstr "el missatge no concorda\n"
 
-#: src/matcher.c:2217 src/matcher.c:2218 src/matcher.c:2219 src/matcher.c:2220
-#: src/matcher.c:2221 src/matcher.c:2222 src/matcher.c:2223 src/matcher.c:2224
+#: src/matcher.c:2209 src/matcher.c:2210 src/matcher.c:2211 src/matcher.c:2212
+#: src/matcher.c:2213 src/matcher.c:2214 src/matcher.c:2215 src/matcher.c:2216
 msgid "(none)"
 msgstr "(cap)"
 
@@ -7893,20 +7921,20 @@ msgid_plural "Importing from mbox... (%d mails imported)"
 msgstr[0] "Important desde mbox... (%d correu improtat)"
 msgstr[1] "Important desde mbox... (%d correus improtats)"
 
-#: src/mbox.c:553
+#: src/mbox.c:554
 msgid "Overwrite mbox file"
 msgstr "Sobreescriure l'arxiu mbox"
 
-#: src/mbox.c:554
+#: src/mbox.c:555
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Aquest arxiu ja existeix. Vols sobreescriure'l?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
-#: src/prefs_themes.c:533 src/textview.c:3075
+#: src/mbox.c:556 src/messageview.c:1848 src/mimeview.c:1844
+#: src/prefs_themes.c:533 src/textview.c:3053
 msgid "Overwrite"
 msgstr "Sobreescriure"
 
-#: src/mbox.c:564
+#: src/mbox.c:565
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -7915,7 +7943,7 @@ msgstr ""
 "No s'ha pogut crear l'arxiu:\n"
 "%s\n"
 
-#: src/mbox.c:572
+#: src/mbox.c:573
 msgid "Exporting to mbox..."
 msgstr "Exportant a arxiu mbox..."
 
@@ -7947,19 +7975,19 @@ msgstr "S'ha arribat al final del missatge. Vols seguir desde l'inici?"
 msgid "Search finished"
 msgstr "Cerca finalitzada"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:239
 msgid "Compose _new message"
 msgstr "Composar u_n missatge nou"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista de missatge"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<No s'ha trobat Return-Path>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7974,11 +8002,11 @@ msgstr ""
 "Adreça de retorn: %s\n"
 "Es recomana no enviar el justificant de recepció."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_No enviar"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7990,47 +8018,47 @@ msgstr ""
 "oficialment dirigit a vostè \n"
 "és un avís per no enviar el justificant de recepció."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Obtenint missatge (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No es pot desencriptar: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "El missatge no acompleix l'estàndard MIME. Pot ser mostrat erròniament."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
-#: src/summaryview.c:4840 src/textview.c:3063
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1997
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4816
+#: src/summaryview.c:4819 src/textview.c:3041
 msgid "Save as"
 msgstr "Desar com"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Sobreescriure l'arxiu existent?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
-#: src/summaryview.c:4875
+#: src/messageview.c:1857 src/summaryview.c:4836 src/summaryview.c:4839
+#: src/summaryview.c:4854
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No s'ha pogut desar l'arxiu '%s'."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Mostra tot %s."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Només el primer megabyte de text és mostrat."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8038,19 +8066,19 @@ msgstr ""
 "Heu demanat justificant de recepció per aquest missatge : ha estat mostrat "
 "per el destinatari."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Heu demanat justificant de recepció en aquest missatge."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Aquest missatge sollicita justificant de recepció."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Enviar justificant de recepció"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8058,7 +8086,7 @@ msgstr ""
 "Aquest missatge s'ha descarregat parcialment,\n"
 "i ha estat esborrat del servidor."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8067,15 +8095,15 @@ msgstr ""
 "Aquest missatge s'ha descarregat parcialment;\n"
 "es de %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Marcar per a descarregar"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Marcar per a esborrar"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8085,12 +8113,12 @@ msgstr ""
 "es de %s i serà descarregat."
 
 # RML To be consistent with previous one.
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Desmarca"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8099,11 +8127,11 @@ msgstr ""
 "Aquest missatge s'ha descarregat parcialment;\n"
 "es de %s i serà esborrat."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Notificació de justificant de recepció"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8115,19 +8143,19 @@ msgstr ""
 "Si us plau, escull el compte que desitjes utilitzar per a fer l'enviament de "
 "la notificació de recepció:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:588
 msgid "_Cancel"
 msgstr "_Cancel·lar"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Enviar Notificació"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2168
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No es pot imprimit: el missatge no conté text."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2931
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8135,7 +8163,7 @@ msgstr ""
 "\n"
 "  No hi ha missatges en aquesta carpeta"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2939
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8143,7 +8171,7 @@ msgstr ""
 "\n"
 "  El missatge ha sigut esborrat"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2940
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8151,16 +8179,21 @@ msgstr ""
 "\n"
 "  El missatge ha estat esborrat o mogut a una altre carpeta"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
-#: src/summaryview.c:7037
+#: src/messageview.c:2973 src/messageview.c:2979 src/summaryview.c:4201
+#: src/summaryview.c:6972
 msgid "An error happened while learning.\n"
 msgstr "S'ha produït un error mentre s'aprenia.\n"
 
-#: src/mh.c:527
+#: src/mh.c:444
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "no s'ha pogut copiar el missatge %s a %s\n"
+
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Moent missatges..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Esborrant missatges..."
 
@@ -8168,7 +8201,7 @@ msgstr "Esborrant missatges..."
 msgid "Remove _mailbox..."
 msgstr "Esborrar _bústia..."
 
-#: src/mh_gtk.c:223
+#: src/mh_gtk.c:224
 #, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -8179,7 +8212,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:365 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8188,64 +8221,64 @@ msgstr ""
 "Eliminar realment la bústia '%s'?\n"
 "(Els missatges NO seran esborrats del disc)"
 
-#: src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:368 src/plugins/mailmbox/plugin_gtk.c:301
 msgid "Remove mailbox"
 msgstr "Esborrar bústia"
 
-#: src/mimeview.c:192
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr "_Obrir"
 
-#: src/mimeview.c:194
+#: src/mimeview.c:195
 msgid "Open _with..."
 msgstr "Obrir _amb..."
 
-#: 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 com a text"
 
-#: src/mimeview.c:198
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr "De_sar com..."
 
-#: src/mimeview.c:199
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr "Des_ar tot..."
 
-#: src/mimeview.c:272
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr "Tipus MIME"
 
-#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036
-#: src/mimeview.c:1041
+#: src/mimeview.c:1032 src/mimeview.c:1037 src/mimeview.c:1042
+#: src/mimeview.c:1047
 msgid "View full information"
 msgstr "Veure l'informació completa"
 
-#: src/mimeview.c:1047
+#: src/mimeview.c:1053
 msgid "Check again"
 msgstr "Verificar de nou"
 
-#: src/mimeview.c:1059
+#: src/mimeview.c:1065
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Fes clic en l'icona per comprovar-ho."
 
-#: src/mimeview.c:1061
+#: src/mimeview.c:1067
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Fes clic en l'icona o premeu '%s' per comprovar-ho."
 
-#: src/mimeview.c:1071
+#: src/mimeview.c:1077
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Ha expirat el temps comprovant la signatura. Pulseu l'icona per a reintentar-"
 "ho."
 
-#: src/mimeview.c:1073
+#: src/mimeview.c:1079
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8253,39 +8286,40 @@ msgstr ""
 "Ha expirat el temps comprovant la signatura. Pulseu l'icona o la tecla '%s' "
 "per a reintentar-ho."
 
-#: src/mimeview.c:1313
+#: src/mimeview.c:1319
 msgid "Checking signature..."
 msgstr "Comprovant signatura..."
 
-#: src/mimeview.c:1354
+#: src/mimeview.c:1360
 msgid "Go back to email"
 msgstr "Tornar al correu"
 
-#: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
+#: src/mimeview.c:2080 src/mimeview.c:2192
+#: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No s'ha pogut desar la part del missatge multipart: %s"
 
-#: src/mimeview.c:1839 src/textview.c:3073
+#: src/mimeview.c:1841 src/textview.c:3051
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobreescriure l'arxiu existent '%s'?"
 
-#: src/mimeview.c:1881 src/plugins/archive/archiver_prefs.c:126
+#: src/mimeview.c:1883 src/plugins/archive/archiver_prefs.c:126
 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destinació"
 
-#: src/mimeview.c:1888 src/plugins/archive/archiver_prefs.c:132
+#: src/mimeview.c:1890 src/plugins/archive/archiver_prefs.c:132
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' no és un directori."
 
-#: src/mimeview.c:2125 src/mimeview.c:2132 src/textview.c:2990
+#: src/mimeview.c:2127 src/mimeview.c:2134 src/textview.c:2972
 msgid "Open with"
 msgstr "Obrir amb"
 
-#: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:2991
+#: src/mimeview.c:2128 src/mimeview.c:2135 src/textview.c:2973
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8294,20 +8328,12 @@ msgstr ""
 "Teclejeu l'ordre per a obrir l'arxiu:\n"
 "('%s' serà substituït per el nom de l'arxiu)"
 
-#: src/mimeview.c:2228
-#, c-format
-msgid ""
-"Could not convert attachment name to UTF-16:\n"
-"\n"
-"%s"
-msgstr ""
-
-#: src/mimeview.c:2236
+#: src/mimeview.c:2226
 msgid "Execute untrusted binary?"
 msgstr "Executar binari dubtós?"
 
 # src/mimeview.c:2020
-#: src/mimeview.c:2237
+#: src/mimeview.c:2227
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8319,98 +8345,97 @@ msgstr ""
 "\n"
 "Vols executar aquest arxiu?"
 
-#: src/mimeview.c:2241
+#: src/mimeview.c:2231
 msgid "Run binary"
 msgstr "Executar binari"
 
-#: src/mimeview.c:2543 src/plugins/att_remover/att_remover.c:299
+#: src/mimeview.c:2530
 msgid "Type:"
 msgstr "Tipus:"
 
-#: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:700 src/summaryview.c:2695
+#: src/mimeview.c:2531 src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Size:"
 msgstr "Tamany:"
 
-#: src/mimeview.c:2558 src/plugins/vcalendar/vcalendar.c:1274
+#: src/mimeview.c:2545 src/plugins/vcalendar/vcalendar.c:1271
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
 msgstr "Descripció:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "La connexió NNTP amb %s:%d s'ha desconnectat.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Compte '%s': Connectant al servidor NNTP: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Error al registrar la traça en %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan no admet el codi de retorn 480 per tant per ara optem per seguir\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "El mode lector ha fracassat, però continuara igualment\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Error al crear la sessió amb %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Error d'autentificació a %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail necessita accés a xarxa per accedir al servidor de notícies."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "no es pot seleccionar el grup: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "no es pot establir el grup: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rang d'articles invàlid: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "no s'ha pogut obtenir xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obtenint xover %d - %d a %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "no s'ha pogut obtenir xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "línia xover invàlida\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -8432,16 +8457,20 @@ msgstr "_Subscriure's a un grup de notícies..."
 msgid "_Unsubscribe newsgroup"
 msgstr "Des_ubscriure's a un grup de notícies"
 
-#: src/news_gtk.c:265
+#: src/news_gtk.c:266
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "Desubscriure's realment del grup de notícies '%s'?"
 
-#: src/news_gtk.c:266
+#: src/news_gtk.c:267
 msgid "Unsubscribe newsgroup"
 msgstr "Desubscriure's grup de notícies"
 
-#: src/news_gtk.c:306
+#: src/news_gtk.c:268
+msgid "_Unsubscribe"
+msgstr "/Des_ubscriure's"
+
+#: src/news_gtk.c:307
 msgid "Rename newsgroup folder"
 msgstr "Reanomenar carpeta de grup de notícies"
 
@@ -8556,7 +8585,7 @@ msgid "Laptop LED"
 msgstr "Diode de portàtil"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:256
+#: src/plugins/attachwarner/attachwarner.c:250
 msgid "Failed to register check before send hook"
 msgstr "Error al registrar valida abans d'enviar"
 
@@ -8585,7 +8614,7 @@ msgstr "Ruta del llibre d'adresses on les adresses són guardades"
 #: src/plugins/address_keeper/address_keeper_prefs.c:121
 #: src/plugins/bogofilter/bogofilter_gtk.c:278
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:446
+#: src/plugins/spamassassin/spamassassin_gtk.c:447
 #: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
 #: src/prefs_matcher.c:679
 msgid "Select..."
@@ -8692,36 +8721,36 @@ msgstr "Prem el botó Cancel·lar per aturar l'acció d'arxivar"
 msgid "Archiving:"
 msgstr "Arxivant:"
 
-#: src/plugins/archive/archiver_gtk.c:507
+#: src/plugins/archive/archiver_gtk.c:503
 msgid "Folder and archive must be selected"
 msgstr "S'ha de seleccionar una carpeta i un arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:516
+#: src/plugins/archive/archiver_gtk.c:512
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: Existeix. Continuar de totes maneres?"
 
-#: src/plugins/archive/archiver_gtk.c:519
+#: src/plugins/archive/archiver_gtk.c:515
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: És un enllaç. No es pot continuar"
 
-#: src/plugins/archive/archiver_gtk.c:522
+#: src/plugins/archive/archiver_gtk.c:518
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: És un directori. No es pot continuar"
 
-#: src/plugins/archive/archiver_gtk.c:525
+#: src/plugins/archive/archiver_gtk.c:521
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: Permisos no trobats. No es pot continuar"
 
-#: src/plugins/archive/archiver_gtk.c:528
+#: src/plugins/archive/archiver_gtk.c:524
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: Error desconegut. No es pot continuar"
 
-#: src/plugins/archive/archiver_gtk.c:565
+#: src/plugins/archive/archiver_gtk.c:561
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8730,7 +8759,7 @@ msgstr ""
 "No es un nou d'arxiu vàlid:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:578
+#: src/plugins/archive/archiver_gtk.c:574
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8739,7 +8768,7 @@ msgstr ""
 "No es una carpeta de Claws Mail vàlida:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:607
+#: src/plugins/archive/archiver_gtk.c:603
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8754,182 +8783,182 @@ msgstr ""
 "\n"
 "Continuar de totes maneres?"
 
-#: src/plugins/archive/archiver_gtk.c:709
+#: src/plugins/archive/archiver_gtk.c:705
 msgid "Archive result"
 msgstr "Resultat d'arxivar"
 
-#: src/plugins/archive/archiver_gtk.c:739
+#: src/plugins/archive/archiver_gtk.c:735
 msgid "Values"
 msgstr "Valors"
 
-#: src/plugins/archive/archiver_gtk.c:748
+#: src/plugins/archive/archiver_gtk.c:744
 msgid "Archive"
 msgstr "Arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:754
+#: src/plugins/archive/archiver_gtk.c:750
 msgid "Archive format"
 msgstr "Format d'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:761
+#: src/plugins/archive/archiver_gtk.c:757
 msgid "Compression method"
 msgstr "Mètode de compressió"
 
-#: src/plugins/archive/archiver_gtk.c:769
+#: src/plugins/archive/archiver_gtk.c:765
 msgid "Number of files"
 msgstr "Número d'arxius"
 
-#: src/plugins/archive/archiver_gtk.c:777
+#: src/plugins/archive/archiver_gtk.c:773
 msgid "Archive Size"
 msgstr "Tamany de l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:785
+#: src/plugins/archive/archiver_gtk.c:781
 msgid "Folder Size"
 msgstr "Tamany de la carpeta"
 
-#: src/plugins/archive/archiver_gtk.c:794
+#: src/plugins/archive/archiver_gtk.c:790
 msgid "Compression level"
 msgstr "Nivell de compressió"
 
-#: src/plugins/archive/archiver_gtk.c:799
-#: src/plugins/archive/archiver_gtk.c:807
-#: src/plugins/archive/archiver_gtk.c:815
-#: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:507
+#: src/plugins/archive/archiver_gtk.c:795
+#: src/plugins/archive/archiver_gtk.c:803
+#: src/plugins/archive/archiver_gtk.c:811
+#: src/plugins/pdf_viewer/poppler_viewer.c:718 src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "Si"
 
-#: src/plugins/archive/archiver_gtk.c:799
-#: src/plugins/archive/archiver_gtk.c:807
-#: src/plugins/archive/archiver_gtk.c:815
-#: src/plugins/pdf_viewer/poppler_viewer.c:722 src/prefs_folder_item.c:506
-#: src/prefs_summaries.c:372
+#: src/plugins/archive/archiver_gtk.c:795
+#: src/plugins/archive/archiver_gtk.c:803
+#: src/plugins/archive/archiver_gtk.c:811
+#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:513
+#: src/prefs_summaries.c:369
 msgid "No"
 msgstr "Cap"
 
-#: src/plugins/archive/archiver_gtk.c:802
+#: src/plugins/archive/archiver_gtk.c:798
 msgid "MD5 checksum"
 msgstr "Checksum MD5"
 
-#: src/plugins/archive/archiver_gtk.c:810
+#: src/plugins/archive/archiver_gtk.c:806
 msgid "Descriptive names"
 msgstr "Noms descriptius"
 
-#: src/plugins/archive/archiver_gtk.c:818
+#: src/plugins/archive/archiver_gtk.c:814
 msgid "Delete selected files"
 msgstr "Esborrar els arxis seleccionats"
 
-#: src/plugins/archive/archiver_gtk.c:827
-#: src/plugins/archive/archiver_gtk.c:1203
+#: src/plugins/archive/archiver_gtk.c:823
+#: src/plugins/archive/archiver_gtk.c:1199
 msgid "Select mails before"
 msgstr "Seleccionar els missatges abans"
 
-#: src/plugins/archive/archiver_gtk.c:903
+#: src/plugins/archive/archiver_gtk.c:899
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Seleccionar nom d'arxiu per arxivar [el sufixe hauria de reflectir l'arxiu "
 "com per exemple .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:951
+#: src/plugins/archive/archiver_gtk.c:947
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld de %ld"
 
-#: src/plugins/archive/archiver_gtk.c:988
+#: src/plugins/archive/archiver_gtk.c:984
 msgid "Create Archive"
 msgstr "Crear arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1003
+#: src/plugins/archive/archiver_gtk.c:999
 msgid "Enter Archiver arguments"
 msgstr "Introduir argument de l'arxivador"
 
-#: src/plugins/archive/archiver_gtk.c:1016
+#: src/plugins/archive/archiver_gtk.c:1012
 msgid "Folder to archive"
 msgstr "Carpeta a arxivar"
 
-#: src/plugins/archive/archiver_gtk.c:1023
+#: src/plugins/archive/archiver_gtk.c:1019
 msgid "Folder which is the root of the archive"
 msgstr "Carpeta la qual es l'arrel de l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1028
+#: src/plugins/archive/archiver_gtk.c:1024
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Premeu aquest botó per seleccionar la carpeta la qual serà arrel de l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1034
+#: src/plugins/archive/archiver_gtk.c:1030
 msgid "Name for archive"
 msgstr "Nom per l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1036
 msgid "Archive location and name"
 msgstr "Nom i localització de l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1042
+#: src/plugins/archive/archiver_gtk.c:1038
 #: src/plugins/archive/archiver_prefs.c:194
 #: src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1041
 msgid "Click this button to select a name and location for the archive"
 msgstr "Premeu aquest botó per seleccionar un nom i localització per l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1047
+#: src/plugins/archive/archiver_gtk.c:1043
 msgid "Choose compression"
 msgstr "Escollir compressió"
 
-#: src/plugins/archive/archiver_gtk.c:1060
+#: src/plugins/archive/archiver_gtk.c:1056
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr "Escolliu aquesta opció per usar compressió ZIP per l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1067
+#: src/plugins/archive/archiver_gtk.c:1063
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr "Escolliu aquesta opció per usar compressió BZIP2 per l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1074
+#: src/plugins/archive/archiver_gtk.c:1070
 msgid "Choose this to use Compress compression for your archive"
 msgstr ""
 "Escolliu aquesta opció per usar compressió Compress per al vostre arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/archive/archiver_gtk.c:1077
 msgid "Choose this option to disable compression for the archive"
 msgstr "Escolliu aquesta opció per deshabilitat la compressió de l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1101
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Choose format"
 msgstr "Escollir format"
 
-#: src/plugins/archive/archiver_gtk.c:1114
+#: src/plugins/archive/archiver_gtk.c:1110
 msgid "Choose this option to use TAR as format for the archive"
 msgstr "Escolliu aquesta opció per usar TAR com a format de l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1121
+#: src/plugins/archive/archiver_gtk.c:1117
 msgid "Choose this to use SHAR as format for the archive"
 msgstr "Escolliu aquesta opció per usar SHAR com a format de l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1128
+#: src/plugins/archive/archiver_gtk.c:1124
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr "Escolliu aquesta opció per usar CPIO com a format de l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1135
+#: src/plugins/archive/archiver_gtk.c:1131
 msgid "Choose this option to use PAX as format for the archive"
 msgstr "Escolliu aquesta opció per usar PAX com a format de l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1155
+#: src/plugins/archive/archiver_gtk.c:1151
 msgid "Miscellaneous options"
 msgstr "Opcions varies"
 
-#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1160
 msgid "_Recursive"
 msgstr "_Recursiu"
 
-#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1164
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Escolliu aquesta opció per incloure subcarpetes a l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1170
+#: src/plugins/archive/archiver_gtk.c:1166
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1174
+#: src/plugins/archive/archiver_gtk.c:1170
 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"
@@ -8939,11 +8968,11 @@ msgstr ""
 "Tot i aixó aneu amb compte, això incrementarà substancialment el temps usat\n"
 "per crear els arxius"
 
-#: src/plugins/archive/archiver_gtk.c:1178
+#: src/plugins/archive/archiver_gtk.c:1174
 msgid "R_ename"
 msgstr "R_enombrar"
 
-#: src/plugins/archive/archiver_gtk.c:1182
+#: src/plugins/archive/archiver_gtk.c:1178
 #: src/plugins/archive/archiver_prefs.c:325
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -8953,7 +8982,7 @@ msgstr ""
 "Esquema de nomenglatura: data_desde at a@assumpte.\n"
 "Els noms seran truncats a un màxim de 96 caràcters"
 
-#: src/plugins/archive/archiver_gtk.c:1190
+#: src/plugins/archive/archiver_gtk.c:1186
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -8961,11 +8990,11 @@ msgstr ""
 "Escolliu aquesta opció per esborrar els missatges abans d'arxivar-los\n"
 "En aquest punt només es tractem IMAP4, Bústia local i POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1194
+#: src/plugins/archive/archiver_gtk.c:1190
 msgid "Selection options"
 msgstr "Opcions de selecció"
 
-#: src/plugins/archive/archiver_gtk.c:1210
+#: src/plugins/archive/archiver_gtk.c:1206
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9048,7 +9077,6 @@ msgstr ""
 "per crear els arxius"
 
 #: src/plugins/archive/archiver_prefs.c:323
-#: src/plugins/managesieve/sieve_manager.c:761
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -9056,6 +9084,18 @@ msgstr "Renombrar"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Escolliu aquesta opció per esborrar missatge després d'arxivar-los"
 
+#: src/plugins/att_remover/att_remover.c:299
+msgid "<b>Type: </b>"
+msgstr "<b>Tipus: </b>"
+
+#: src/plugins/att_remover/att_remover.c:300
+msgid "<b>Size: </b>"
+msgstr "<b>Tamany: </b>"
+
+#: src/plugins/att_remover/att_remover.c:301
+msgid "<b>Filename: </b>"
+msgstr "<b>Nom del fitxer: </b>"
+
 #: src/plugins/att_remover/att_remover.c:332
 msgid "Remove attachments"
 msgstr "Esborrar l'adjunts"
@@ -9065,8 +9105,8 @@ msgstr "Esborrar l'adjunts"
 msgid "Remove"
 msgstr "Esborrar"
 
-#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:80 src/summaryview.c:2789
+#: src/plugins/att_remover/att_remover.c:365 src/prefs_summary_column.c:80
+#: src/summaryview.c:2785
 msgid "Attachment"
 msgstr "Adjunt"
 
@@ -9114,30 +9154,31 @@ msgstr ""
 msgid "Attachment handling"
 msgstr "Maneig d'adjunt"
 
-#: src/plugins/attachwarner/attachwarner.c:217
-#, fuzzy, c-format
+#: src/plugins/attachwarner/attachwarner.c:214
+#, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: %s\n"
+"attached. Mention appears on line %d, which begins with text: <span weight="
+"\"bold\">%.20s</span>...\n"
 "\n"
-"%s"
+"%s it anyway?"
 msgstr ""
 "Un fitxer adjunt és esmentat en el correu que estem enviant, però no s'ha "
 "adjuntat cap fitxer. La menció apareix a la línia %d, que comença amb el "
 "text: <span weight=\"bold\">%.20s</span>...\n"
 "%s de totes maneres?"
 
-#: src/plugins/attachwarner/attachwarner.c:223
+#: src/plugins/attachwarner/attachwarner.c:218
 msgid "Attachment warning"
 msgstr "Avís d'adjunt"
 
-#: src/plugins/attachwarner/attachwarner.c:249
-#: src/plugins/attachwarner/attachwarner.c:286
-#: src/plugins/attachwarner/attachwarner.c:338
+#: src/plugins/attachwarner/attachwarner.c:243
+#: src/plugins/attachwarner/attachwarner.c:280
+#: src/plugins/attachwarner/attachwarner.c:332
 msgid "Attach warner"
 msgstr "Avisador d'adjunts"
 
-#: src/plugins/attachwarner/attachwarner.c:296
+#: src/plugins/attachwarner/attachwarner.c:290
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -9186,7 +9227,8 @@ msgid ""
 msgstr ""
 "No validar adjunts desapareguts quan es respon o es redireccionen missatges"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Signatures"
 
@@ -9297,37 +9339,39 @@ msgstr ""
 "Les opcions les podeu trobar a /Configuració/Preferències/Connectors/"
 "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Detecció de correu brossa"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Aprenentatge de correu brossa"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:399
+#: src/plugins/spamassassin/spamassassin_gtk.c:400
 msgid "Process messages on receiving"
 msgstr "Processar missatges al rebre"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:358
 msgid "Maximum size"
 msgstr "Tamany màxim"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:366
+#: src/plugins/spamassassin/spamassassin_gtk.c:367
 msgid "Messages larger than this will not be checked"
 msgstr "Missatges més grans que aquest no seran comprovats"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1507
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1507
 msgid "KB"
 msgstr "Kb"
 
@@ -9345,7 +9389,7 @@ msgstr "Nomès marca-ho com correu no solicitat"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:415
+#: src/plugins/spamassassin/spamassassin_gtk.c:416
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9354,7 +9398,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:233
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:421
+#: src/plugins/spamassassin/spamassassin_gtk.c:422
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 "Pulseu aquest botò per seleccionar la carpeta on guardareu el correu brossa"
@@ -9387,13 +9431,13 @@ msgstr "Només es realitza per missatges a carpetes MH"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:436
+#: src/plugins/spamassassin/spamassassin_gtk.c:437
 msgid "Whitelist senders found in address book/folder"
 msgstr "Llista blanca de remitents trobada a l'agenda/carpeta"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:272
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:440
+#: src/plugins/spamassassin/spamassassin_gtk.c:441
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9403,7 +9447,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:282
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:450
+#: src/plugins/spamassassin/spamassassin_gtk.c:451
 msgid "Click this button to select a book or folder in the address book"
 msgstr "Pulseu aquest botò per seleccionar una agenda o carpeta de l'agenda"
 
@@ -9430,7 +9474,7 @@ msgstr "Ruta a l'executable de bogofilter"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:309
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:428
+#: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "Mark spam as read"
 msgstr "Marcar correu brossa com a llegit"
 
@@ -9502,7 +9546,7 @@ msgstr ""
 "Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:407
+#: src/plugins/spamassassin/spamassassin_gtk.c:408
 msgid "Save spam in"
 msgstr "Desar el correu brossa en"
 
@@ -9770,26 +9814,26 @@ msgstr ""
 msgid "Could not create socket"
 msgstr "No s'ha pogut crear el sòcol"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:422
+#: src/plugins/clamd/libclamd/clamd-plugin.c:421
 msgid ": File does not exist"
 msgstr ": El fitxer no existeix."
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:435
+#: src/plugins/clamd/libclamd/clamd-plugin.c:434
 msgid ": Unable to open"
 msgstr ": No s'ha pogut obrir"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:455
-#: src/plugins/clamd/libclamd/clamd-plugin.c:460
-#: src/plugins/clamd/libclamd/clamd-plugin.c:474
+#: src/plugins/clamd/libclamd/clamd-plugin.c:454
+#: src/plugins/clamd/libclamd/clamd-plugin.c:459
+#: src/plugins/clamd/libclamd/clamd-plugin.c:473
 msgid "Socket write error"
 msgstr "Error d'escritura de sòcol"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:467
+#: src/plugins/clamd/libclamd/clamd-plugin.c:466
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Error al llegir"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:481
+#: src/plugins/clamd/libclamd/clamd-plugin.c:480
 msgid "Socket read error"
 msgstr "Error de lectura de sòcol"
 
@@ -9902,8 +9946,8 @@ msgstr "El CSS en aquest fitxer s'aplicarà a totes les parts d'HTML"
 
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
-#: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/plugins/rssyl/rssyl_prefs.c:186 src/prefs_account.c:1441
+#: src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "M_ostrar"
@@ -9912,93 +9956,93 @@ msgstr "M_ostrar"
 msgid "Select stylesheet"
 msgstr "Selecciona el full d'estil"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "La carrega de contingut remote està deshabilitada."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Carregar imatges"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Permet el contingut remot"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Habilita Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Habilita Móduls"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Activa Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Obre els enllaços amb un navegador extern"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ha aparegut un error: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s está malformat o no es un canal d'informació suportat"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Cerca la web"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Obre en el visor"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Obre en el visor (permet contingut remot)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Obre en el navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Obre imatge"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Copia l'enllaç"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Descarrega l'enllaç"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Desar l'imatge com"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Copia la imatge"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Importa el canal d'informació"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Elegant"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Visor Elegant d'HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10010,6 +10054,10 @@ msgstr ""
 "Per defecte tot el contingut remote està bloquejat. Les opcions podeu trobar-"
 "les a /Configuració/Preferencies/Plugins/Fancy"
 
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:151
+msgid "failed to write Fetchinfo configuration to file\n"
+msgstr "no ha pogut escriure el fitxer de configuració de Fetchinfo\n"
+
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:200
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
@@ -10092,11 +10140,11 @@ msgstr ""
 "Afegeix la capçalera X-FETCH-TIME amb la data i hora d'extracció de missatge "
 "en RFC822 format"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:125
 msgid "GData plugin: Authorization required"
 msgstr "Connector GData: Autorització requerida"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10114,80 +10162,78 @@ msgstr ""
 "camp de sota per concedir accés a Claws Mail a la llista de contactes de "
 "Google."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:142
 msgid "Step 1:"
 msgstr "Pas 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 "Feu clic aquí per obrir la pàgina d'autorització de Google en un navegador"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:152
 msgid "Step 2:"
 msgstr "Pas 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:158
 msgid "Enter code:"
 msgstr "Introdueïx el codi:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Connector GData: Error al consultar els contactes: %s\n"
 
-#. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:340
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
 msgstr[0] "Afegit %d de"
 msgstr[1] "Afegits %d de"
 
-#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:342
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 contacte a la memòria cau"
 msgstr[1] "%d contactes a la memòria cau"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:352
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Connector GData: Iniciant la consulta de contactes asíncrona\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:373
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Connector GData: Error al consultar els grups: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:410
 msgid "GData plugin: Groups received\n"
 msgstr "Connector GData: Grups rebuts\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:417
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Connector GData: Iniciant la consulta de grups asíncrona\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:442
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Connector GData: Error d'autorització: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:449
 msgid "GData plugin: Authorization successful\n"
 msgstr "Connector GData: Autorització correcta\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:459
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Connector GData: Iniciant l'autentificació interactiva\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:469
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 "Connector GData: Ha rebut un codi d'autorització, demanant l'autorització\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10195,26 +10241,26 @@ msgstr ""
 "Connector GData: No s'ha rebut cap codi d'autorització, cancel·lada la "
 "sol·licitud d'autorització\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:493
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Connector GData: Error d'actualització de l'autorització: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:502
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Connector GData: Actualització de l'autorització correcta\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:555
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Connector GData: Intentant actualitzar autorització\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:188 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autentificació"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
@@ -10231,6 +10277,15 @@ msgstr "Número màxim de resultats:"
 msgid "GData"
 msgstr "GData"
 
+#: src/plugins/gdata/gdata_plugin.c:75
+msgid ""
+"\n"
+"GData Plugin: Failed to write plugin configuration to file\n"
+msgstr ""
+"\n"
+"Connector GData: Error al escriure el fitxer de la configuració del "
+"connector\n"
+
 #: src/plugins/gdata/gdata_plugin.c:107
 msgid "Failed to register address completion hook in the GData plugin"
 msgstr ""
@@ -10261,10193 +10316,10024 @@ msgstr ""
 "\n"
 "La teva opinió és benvinguda a <berndth at gmx.de>."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "Integració GData"
 
-#: src/plugins/libravatar/libravatar.c:374
-#: src/plugins/libravatar/libravatar.c:439
-#: src/plugins/libravatar/libravatar.c:499
-#: src/plugins/libravatar/libravatar_prefs.c:546
-msgid "Libravatar"
-msgstr "Libravatar"
+#. TRANSLATORS: The two numbers are latitude and longitude coordinates
+#: src/plugins/geolocation/geolocation_plugin.c:349
+#, c-format
+msgid "Found location: (%.2f,%.2f)"
+msgstr "S'ha trobat la localització: (%.2f,%.2f)"
 
-#: src/plugins/libravatar/libravatar.c:381
-msgid "Failed to register avatar header update hook"
-msgstr "Ha fallat el registre del ganxo per actualitzar la capçalera d'avatar"
+#. TRANSLATORS: The country name is appended to the string
+#: src/plugins/geolocation/geolocation_plugin.c:369
+msgid "Alleged country of origin: "
+msgstr "País al·legat d'origen: "
 
-#: src/plugins/libravatar/libravatar.c:390
-msgid "Failed to register avatar image render hook"
-msgstr "Ha fallat el registre del ganxo per renderitzar imatges d'avatars"
+#. TRANSLATORS: The IP address is appended to the string
+#: src/plugins/geolocation/geolocation_plugin.c:373
+msgid "Could not resolve location of IP address "
+msgstr "No s'ha pogut resoldre la direcció de l'adreça IP "
 
-#: src/plugins/libravatar/libravatar.c:396
-msgid "Failed to create avatar image cache directory"
-msgstr "No s'ha pogut crear el directori per la memòria cau d'imatges d'avatar"
+#: src/plugins/geolocation/geolocation_plugin.c:512
+msgid "Try to locate sender"
+msgstr "Intentar localitzar el remitent"
 
-#: src/plugins/libravatar/libravatar.c:406
-msgid "Failed to load missing items cache"
-msgstr "A fallat la carrega dels elements de la memòria cau."
+#: src/plugins/geolocation/geolocation_plugin.c:528
+msgid "Andorra"
+msgstr "Andorra"
 
-#: src/plugins/libravatar/libravatar.c:449
-msgid ""
-"Display libravatar profiles' images for mail messages. More\n"
-"info about libravatar at http://www.libravatar.org/. If you have\n"
-"a gravatar.com profile but not a libravatar one, those will also\n"
-"be retrieved (when redirections are allowed in plugin config).\n"
-"Plugin config page is available from main window at:\n"
-"/Configuration/Preferences/Plugins/Libravatar.\n"
-"\n"
-"This plugin uses libcurl to retrieve images, so if you're behind a\n"
-"proxy please refer to curl(1) manpage for details on 'http_proxy'\n"
-"configuration. More details about this and others on README file.\n"
-"\n"
-"Feedback to <ricardo at mones.org> is welcome.\n"
-msgstr ""
-"Mostrar imatges de perfils libravatar per als missatges de correu. Més\n"
-"informació sobre libravatar en http://www.libravatar.org/. Si vostè té\n"
-"un perfil gravatar.com però no una libravatar, els farà també\n"
-"recuperar (quan es permeti redireccions en la configuració del connector) .\n"
-"La pàgina de configuració del connector està disponible des de la finestra "
-"principal en:\n"
-"/Configuració/Preferències/Connectors/Libravatar.\n"
-"\n"
-"Aquest plugin utilitza libcurl per recuperar imatges, així que si estàs "
-"darrere d'un\n"
-"Proxy consulti la pàgina curl(1) del manual per a més detalls sobre la "
-"configuració\n"
-"de 'http_proxy'. Més detalls sobre aquest i altres a l'arxiu README .\n"
-"\n"
-"La teva opinió és benvinguda a <ricardo at mones.org>.\n"
+#: src/plugins/geolocation/geolocation_plugin.c:529
+msgid "United Arab Emirates"
+msgstr "Emirats Àrabs Units"
 
-#: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
-msgid "Error reading cache stats"
-msgstr "Error llegint l'arxiu"
+#: src/plugins/geolocation/geolocation_plugin.c:530
+msgid "Afghanistan"
+msgstr "Afganistan"
 
-#: src/plugins/libravatar/libravatar_prefs.c:141
-#, fuzzy, c-format
-msgid "Using %s in %d files, %d directories, %d others and %d errors"
-msgstr "Utilitzant %s a %d fitxers,%d  directoris i %d altres"
+#: src/plugins/geolocation/geolocation_plugin.c:531
+msgid "Antigua And Barbuda"
+msgstr "Antigua I Barbuda"
 
-#: src/plugins/libravatar/libravatar_prefs.c:150
-#, c-format
-msgid "Using %s in %d files, %d directories and %d others"
-msgstr "Utilitzant %s a %d fitxers,%d  directoris i %d altres"
+#: src/plugins/geolocation/geolocation_plugin.c:532
+msgid "Anguilla"
+msgstr "Anguila"
 
-#: src/plugins/libravatar/libravatar_prefs.c:164
-msgid "Clear icon cache"
-msgstr "Netejar memòria d'avatars"
+#: src/plugins/geolocation/geolocation_plugin.c:533
+msgid "Albania"
+msgstr "Albània"
 
-#: src/plugins/libravatar/libravatar_prefs.c:165
-msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "Realment vols suprimir tota la memòria cau d'avatars?"
+#: src/plugins/geolocation/geolocation_plugin.c:534
+msgid "Armenia"
+msgstr "Armènia"
 
-#: src/plugins/libravatar/libravatar_prefs.c:178
-msgid "Not enough memory for operation"
-msgstr "No hi ha prou memòria per a operar"
+#: src/plugins/geolocation/geolocation_plugin.c:535
+msgid "Netherlands Antilles"
+msgstr "Antilles Holandeses"
 
-#: src/plugins/libravatar/libravatar_prefs.c:183
-#, c-format
-msgid ""
-"Icon cache successfully cleared:\n"
-"• %u missing entries removed.\n"
-"• %u files removed."
-msgstr ""
-"Esborrada correctament la memòria cau d'avatarst:\n"
-"• %u entrades perdudes esborrades.\n"
-"• %u fitxers esborrats."
+#: src/plugins/geolocation/geolocation_plugin.c:536
+msgid "Angola"
+msgstr "Angola"
 
-#: src/plugins/libravatar/libravatar_prefs.c:188
-#, fuzzy
-msgid "Icon cache successfully cleared!"
-msgstr ""
-"<span color=\"#006400\">S'ha esborrat correctament la memòria cau d'avatars!"
-"</span>"
+#: src/plugins/geolocation/geolocation_plugin.c:537
+msgid "Antarctica"
+msgstr "Antàrtida"
 
-#: src/plugins/libravatar/libravatar_prefs.c:191
-#, c-format
-msgid ""
-"Errors clearing icon cache:\n"
-"• %u missing entries removed.\n"
-"• %u files removed.\n"
-"• %u files failed to be read.\n"
-"• %u files couldn't be removed."
-msgstr ""
-"Errors al esborrar la memòria cau d'avatars:\n"
-"• %u entrades perdudes esborrades.\n"
-"• %u fitxers esborrats.\n"
-"• %u fitxers que no es poden llegir.\n"
-"• %u fitxers que no es poden esborrar."
+#: src/plugins/geolocation/geolocation_plugin.c:538
+msgid "Argentina"
+msgstr "Argentina"
 
-#: src/plugins/libravatar/libravatar_prefs.c:198
-#, fuzzy
-msgid "Error clearing icon cache."
-msgstr "Netejar memòria d'avatars"
+#: src/plugins/geolocation/geolocation_plugin.c:539
+msgid "American Samoa"
+msgstr "Samoa Americana"
 
-#: src/plugins/libravatar/libravatar_prefs.c:213
-msgid "_Use cached icons"
-msgstr "_Utilitza icones de la memòria cau"
+#: src/plugins/geolocation/geolocation_plugin.c:540
+msgid "Austria"
+msgstr "Àustria"
 
-#: src/plugins/libravatar/libravatar_prefs.c:214
-msgid ""
-"Keep icons on disk for reusing instead of making another network request"
-msgstr ""
-"Mantenir icones en disc per reciclar en lloc de fer una altra sol·licitud de "
-"la xarxa"
+#: src/plugins/geolocation/geolocation_plugin.c:541
+msgid "Australia"
+msgstr "Austràlia"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
-msgid "Cache refresh interval"
-msgstr "Interval d'actualització de la memòria cau"
+#: src/plugins/geolocation/geolocation_plugin.c:542
+msgid "Aruba"
+msgstr "Aruba"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1486
-#: src/prefs_matcher.c:336
-msgid "hours"
-msgstr "hores"
+#: src/plugins/geolocation/geolocation_plugin.c:543
+msgid "Azerbaijan"
+msgstr "Azerbaidjan"
 
-#: src/plugins/libravatar/libravatar_prefs.c:305
-msgid "Mystery man"
-msgstr "Home misteri"
+#: src/plugins/geolocation/geolocation_plugin.c:544
+msgid "Bosnia And Herzegovina"
+msgstr "Bòsnia I Hercegovina"
 
-#: src/plugins/libravatar/libravatar_prefs.c:306
-msgid "Identicon"
-msgstr "Icona d'identificació"
+#: src/plugins/geolocation/geolocation_plugin.c:545
+msgid "Barbados"
+msgstr "Barbados"
 
-#: src/plugins/libravatar/libravatar_prefs.c:307
-msgid "MonsterID"
-msgstr "MonsterID"
+#: src/plugins/geolocation/geolocation_plugin.c:546
+msgid "Bangladesh"
+msgstr "Bangladesh"
 
-#: src/plugins/libravatar/libravatar_prefs.c:308
-msgid "Wavatar"
-msgstr "Wavatar"
+#: src/plugins/geolocation/geolocation_plugin.c:547
+msgid "Belgium"
+msgstr "Bèlgica"
 
-#: src/plugins/libravatar/libravatar_prefs.c:309
-msgid "Retro"
-msgstr "Retro"
+#: src/plugins/geolocation/geolocation_plugin.c:548
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
 
-#: src/plugins/libravatar/libravatar_prefs.c:310
-msgid "Custom URL"
-msgstr "URL personalitzada"
+#: src/plugins/geolocation/geolocation_plugin.c:549
+msgid "Bulgaria"
+msgstr "Bulgària"
 
-#: src/plugins/libravatar/libravatar_prefs.c:313
-msgid "A blank image"
-msgstr "Imatge en blanc"
+#: src/plugins/geolocation/geolocation_plugin.c:550
+msgid "Bahrain"
+msgstr "Bahrain"
 
-#: src/plugins/libravatar/libravatar_prefs.c:314
-msgid "The unobtrusive low-contrast greyish silhouette"
-msgstr "La discreta silueta grisenca amb poc contrast"
+#: src/plugins/geolocation/geolocation_plugin.c:551
+msgid "Burundi"
+msgstr "Burundi"
 
-#: src/plugins/libravatar/libravatar_prefs.c:315
-msgid "A generated geometric pattern"
-msgstr "Un patró geometric generat."
+#: src/plugins/geolocation/geolocation_plugin.c:552
+msgid "Benin"
+msgstr "Benín"
 
-#: src/plugins/libravatar/libravatar_prefs.c:316
-msgid "A generated full-body monster"
-msgstr "Un monstre de cos complet generat"
+#: src/plugins/geolocation/geolocation_plugin.c:553
+msgid "Bermuda"
+msgstr "Bermuda"
 
-#: src/plugins/libravatar/libravatar_prefs.c:317
-msgid "A generated almost unique face"
-msgstr "Una cara generada gairabè ùnica."
+#: src/plugins/geolocation/geolocation_plugin.c:554
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
 
-#: src/plugins/libravatar/libravatar_prefs.c:318
-msgid "A generated 8-bit arcade-style pixelated image"
-msgstr "Una imatge d'8-bits pixelada d'estil arcade."
+#: src/plugins/geolocation/geolocation_plugin.c:555
+msgid "Bolivia"
+msgstr "Bolívia"
 
-#: src/plugins/libravatar/libravatar_prefs.c:319
-msgid "Redirect to a user provided URL"
-msgstr "Redirecció a una URL introduïda per l'usuari"
+#: src/plugins/geolocation/geolocation_plugin.c:556
+msgid "Brazil"
+msgstr "Brasil"
 
-#: src/plugins/libravatar/libravatar_prefs.c:333
-msgid ""
-"Enter the URL you want to be redirected when no user icon is available. "
-"Leave an empty URL to use the default libravatar orange icon."
-msgstr ""
-"Introdueïx l'URL on vols fer redirigir quan cap icona de l'usuari estigui "
-"disponible. Deixar una URL buida per usar l'icona libravatar taronja per "
-"defecte."
+#: src/plugins/geolocation/geolocation_plugin.c:557
+msgid "Bahamas"
+msgstr "Bahames"
 
-#: src/plugins/libravatar/libravatar_prefs.c:382
-msgid "_Allow redirects to other sites"
-msgstr "Permet redireccions a _altres llocs"
+#: src/plugins/geolocation/geolocation_plugin.c:558
+msgid "Bhutan"
+msgstr "Bhutan"
 
-#: src/plugins/libravatar/libravatar_prefs.c:383
-msgid ""
-"Follow redirect responses received from libravatar server to other avatar "
-"services like gravatar.com"
-msgstr ""
-"Segueix les respostes amb redirecció del servidor de libravatar cap a un "
-"altre servei d'avatars com gravatar.com"
+#: src/plugins/geolocation/geolocation_plugin.c:559
+msgid "Bouvet Island"
+msgstr "Illa Bouvet"
 
-#: src/plugins/libravatar/libravatar_prefs.c:392
-msgid "_Enable federated servers"
-msgstr "Activa servidors f_ederats"
+#: src/plugins/geolocation/geolocation_plugin.c:560
+msgid "Botswana"
+msgstr "Botswana"
 
-#: src/plugins/libravatar/libravatar_prefs.c:393
-msgid "Try to get avatar from sender's domain libravatar server"
-msgstr ""
-"Tractar d'aconseguir l'avatar del servidor de libravatar de domini del "
-"remitent"
+#: src/plugins/geolocation/geolocation_plugin.c:561
+msgid "Belarus"
+msgstr "Bielorússia"
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
-msgid "Request timeout"
-msgstr "Temps d'espera de la petició"
+#: src/plugins/geolocation/geolocation_plugin.c:562
+msgid "Belize"
+msgstr "Belize"
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
-#: src/plugins/notification/notification_prefs.c:1073
-#: src/plugins/notification/notification_prefs.c:1368
-#: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
-#: src/prefs_summaries.c:538
-msgid "second(s)"
-msgstr "segon(s)"
+#: src/plugins/geolocation/geolocation_plugin.c:563
+msgid "Canada"
+msgstr "Canadà"
 
-#: src/plugins/libravatar/libravatar_prefs.c:411
-msgid ""
-"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
-"than global socket I/O timeout."
-msgstr ""
-"Fes server un 0 per l'utilització de temps d'espera de sòcols I/O globals. "
-"El valor màxim ha de ser també menor que el temps d'espera de sòcols I/O "
-"globals."
+#: src/plugins/geolocation/geolocation_plugin.c:564
+msgid "Cocos (Keeling) Islands"
+msgstr "Illes Cocos (Keeling)"
 
-#: src/plugins/libravatar/libravatar_prefs.c:455
-msgid "Icon cache"
-msgstr "Memòria cau d'icones"
+#: src/plugins/geolocation/geolocation_plugin.c:565
+msgid "Central African Republic"
+msgstr "República Centreafricana"
 
-#: src/plugins/libravatar/libravatar_prefs.c:459
-msgid "Default missing icon mode"
-msgstr "No s'ha trobat el mode d'icona per defecte"
+#: src/plugins/geolocation/geolocation_plugin.c:566
+msgid "Congo"
+msgstr "Congo"
 
-#: src/plugins/libravatar/libravatar_prefs.c:463
-msgid "Network"
-msgstr "Xarxa"
+#: src/plugins/geolocation/geolocation_plugin.c:567
+msgid "Switzerland"
+msgstr "Suïssa"
 
-#: src/plugins/mailmbox/plugin.c:58
-#, fuzzy
-msgid "mailmbox folder"
-msgstr "carpeta de bùstia de correu (etPan!)"
+#: src/plugins/geolocation/geolocation_plugin.c:568
+msgid "Cote D'Ivoire"
+msgstr "Costa d'Ivori"
 
-#: src/plugins/mailmbox/plugin.c:63
-msgid "This is a plugin to handle mailboxes in mbox format."
-msgstr ""
-"Aquest es un connector per gestionar les bùsties de correu amb format mbox."
+#: src/plugins/geolocation/geolocation_plugin.c:569
+msgid "Cook Islands"
+msgstr "Illes Cook"
 
-#: src/plugins/mailmbox/plugin.c:84
-msgid "MBOX"
-msgstr "MBOX"
+#: src/plugins/geolocation/geolocation_plugin.c:570
+msgid "Chile"
+msgstr "Xile"
 
-#: src/plugins/mailmbox/plugin_gtk.c:190
-msgid ""
-"Input the location of mailbox.\n"
-"If the existing mailbox is specified, it will be\n"
-"scanned automatically."
-msgstr ""
-"Introduiu la localització de la bústia.\n"
-"Si la bústia existent és especificada, serà\n"
-"escaneajada automàticament."
+#: src/plugins/geolocation/geolocation_plugin.c:571
+msgid "Cameroon"
+msgstr "Camerun"
 
-#: src/plugins/mailmbox/plugin_gtk.c:330
-#, c-format
-msgid ""
-"All folder(s) and message(s) under '%s' will be deleted.\n"
-"Do you really want to delete?"
-msgstr ""
-"S'esborraran totes les carpetes i missatges que penjen de '%s'.\n"
-"Realment vols esborrar-los?"
+#: src/plugins/geolocation/geolocation_plugin.c:572
+msgid "China"
+msgstr "Xina"
 
-#: src/plugins/managesieve/managesieve.c:439
-msgid "No Sieve auth method available\n"
-msgstr "No hi ha cap mètode d'autenticació Sieve disponible\n"
+#: src/plugins/geolocation/geolocation_plugin.c:573
+msgid "Colombia"
+msgstr "Colombia"
 
-#: src/plugins/managesieve/managesieve.c:443
-msgid "Selected Sieve auth method not available\n"
-msgstr "El mètode Sieve seleccionat no està disponible\n"
+#: src/plugins/geolocation/geolocation_plugin.c:574
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#: src/plugins/managesieve/managesieve.c:676
-msgid "Disconnected"
-msgstr "Desconnectat"
+#: src/plugins/geolocation/geolocation_plugin.c:575
+msgid "Cuba"
+msgstr "Cuba"
 
-#: src/plugins/managesieve/managesieve.c:680
-#, c-format
-msgid "Disconnected: %s"
-msgstr "Desconnectat: %s"
+#: src/plugins/geolocation/geolocation_plugin.c:576
+msgid "Cape Verde"
+msgstr "Cap Verd"
 
-#: src/plugins/managesieve/managesieve.c:728
-#: src/plugins/managesieve/managesieve.c:873
-#, c-format
-msgid "unhandled message on Sieve session: %s\n"
-msgstr "missatge desconegut en la sessió Sieve: %s\n"
+#: src/plugins/geolocation/geolocation_plugin.c:577
+msgid "Christmas Island"
+msgstr "Illa de Nadal"
 
-#: src/plugins/managesieve/managesieve.c:735
-msgid "TLS failed"
-msgstr "TLS ha fallat"
+#: src/plugins/geolocation/geolocation_plugin.c:578
+msgid "Cyprus"
+msgstr "Xipre"
 
-#: src/plugins/managesieve/managesieve.c:800
-#: src/plugins/managesieve/managesieve.c:816
-#: src/plugins/managesieve/managesieve.c:843
-#: src/plugins/managesieve/managesieve.c:925
-#: src/plugins/managesieve/managesieve.c:943
-msgid "error occurred on SIEVE session\n"
-msgstr "hi ha hagut un error en la sessió Sieve\n"
+#: src/plugins/geolocation/geolocation_plugin.c:579
+msgid "Czech Republic"
+msgstr "República Txeca"
 
-#: src/plugins/managesieve/managesieve.c:869
-#, c-format
-msgid "error occurred on Sieve session. data: %s\n"
-msgstr "hi ha hagut un error en la sessió Sieve. dades: %s\n"
+#: src/plugins/geolocation/geolocation_plugin.c:580
+msgid "Germany"
+msgstr "Alemanya"
 
-#: src/plugins/managesieve/managesieve.c:878
-#, c-format
-msgid "unhandled message on Sieve session: %d\n"
-msgstr "missatge desconegut en la sessió Sieve: %d\n"
+#: src/plugins/geolocation/geolocation_plugin.c:581
+msgid "Djibouti"
+msgstr "Djibouti"
 
-#: src/plugins/managesieve/managesieve.c:1135
-msgid "Sieve: retrying auth\n"
-msgstr "Sieve: s'està reintentant autentifiació\n"
+# RML To be consistent with previous one.
+#: src/plugins/geolocation/geolocation_plugin.c:582
+msgid "Denmark"
+msgstr "Dinamarca"
+
+#: src/plugins/geolocation/geolocation_plugin.c:583
+msgid "Dominica"
+msgstr "Dominica"
+
+#: src/plugins/geolocation/geolocation_plugin.c:584
+msgid "Dominican Republic"
+msgstr "República Dominicana"
+
+#: src/plugins/geolocation/geolocation_plugin.c:585
+msgid "Algeria"
+msgstr "Algèria"
+
+#: src/plugins/geolocation/geolocation_plugin.c:586
+msgid "Ecuador"
+msgstr "Equador"
+
+#: src/plugins/geolocation/geolocation_plugin.c:587
+msgid "Estonia"
+msgstr "Estònia"
+
+#: src/plugins/geolocation/geolocation_plugin.c:588
+msgid "Egypt"
+msgstr "Egipte"
+
+#: src/plugins/geolocation/geolocation_plugin.c:589
+msgid "Western Sahara"
+msgstr "Sàhara Occidental"
+
+#: src/plugins/geolocation/geolocation_plugin.c:590
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#: src/plugins/geolocation/geolocation_plugin.c:591
+msgid "Spain"
+msgstr "Espanya"
+
+#: src/plugins/geolocation/geolocation_plugin.c:592
+msgid "Ethiopia"
+msgstr "Etiòpia"
+
+#: src/plugins/geolocation/geolocation_plugin.c:593
+msgid "Finland"
+msgstr "Finlàndia"
+
+#: src/plugins/geolocation/geolocation_plugin.c:594
+msgid "Fiji"
+msgstr "Fiji"
+
+#: src/plugins/geolocation/geolocation_plugin.c:595
+msgid "Falkland Islands (Malvinas)"
+msgstr "Illes Falkland (Malvines)"
+
+#: src/plugins/geolocation/geolocation_plugin.c:596
+msgid "Micronesia, Federated States Of"
+msgstr "Micronèsia, Estats Federats de"
+
+#: src/plugins/geolocation/geolocation_plugin.c:597
+msgid "Faroe Islands"
+msgstr "Illes Fèroe"
+
+#: src/plugins/geolocation/geolocation_plugin.c:598
+msgid "France"
+msgstr "França"
+
+#: src/plugins/geolocation/geolocation_plugin.c:599
+msgid "France, Metropolitan"
+msgstr "França, Metropolitana"
+
+#: src/plugins/geolocation/geolocation_plugin.c:600
+msgid "Gabon"
+msgstr "Gabon"
+
+#: src/plugins/geolocation/geolocation_plugin.c:601
+#: src/plugins/geolocation/geolocation_plugin.c:747
+msgid "United Kingdom"
+msgstr "Regne Unit"
 
-#: src/plugins/managesieve/managesieve.c:1137
-msgid "Auth method not available"
-msgstr "Mètode d'autenticació no disponible"
+#: src/plugins/geolocation/geolocation_plugin.c:602
+msgid "Grenada"
+msgstr "Granada"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5657
-msgid "_Filter"
-msgstr "_Filtre"
+#: src/plugins/geolocation/geolocation_plugin.c:603
+msgid "Georgia"
+msgstr "Geòrgia"
 
-#: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:630
-msgid "Chec_k Syntax"
-msgstr "Comprovar la sinta_xi"
+#: src/plugins/geolocation/geolocation_plugin.c:604
+msgid "French Guiana"
+msgstr "Guiana francès"
 
-#: src/plugins/managesieve/sieve_editor.c:87
-msgid "Re_vert"
-msgstr "Des_fer"
+#: src/plugins/geolocation/geolocation_plugin.c:605
+msgid "Ghana"
+msgstr "Ghana"
 
-#: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:722
-#: src/plugins/managesieve/sieve_manager.c:182
-msgid "Unable to get script contents"
-msgstr "Incapaç d'aconseguir el contingut de la seqüència d'ordres"
+#: src/plugins/geolocation/geolocation_plugin.c:606
+msgid "Gibraltar"
+msgstr "Gibraltar"
 
-#: src/plugins/managesieve/sieve_editor.c:325
-msgid "Reverting..."
-msgstr "Desfent..."
+#: src/plugins/geolocation/geolocation_plugin.c:607
+msgid "Greenland"
+msgstr "Groenlàndia"
 
-#: src/plugins/managesieve/sieve_editor.c:334
-msgid "Revert script"
-msgstr "Desfer la seqüència d'ordres"
+#: src/plugins/geolocation/geolocation_plugin.c:608
+msgid "Gambia"
+msgstr "Gàmbia"
 
-#: src/plugins/managesieve/sieve_editor.c:335
-msgid "This script has been modified. Revert the unsaved changes?"
-msgstr ""
-"Aquesta seqüència d'ordres s'ha modificat. Vols desfer els canvis no desats?"
+#: src/plugins/geolocation/geolocation_plugin.c:609
+msgid "Guinea"
+msgstr "Guinea"
 
-#: src/plugins/managesieve/sieve_editor.c:336
-msgid "_Revert"
-msgstr "Desfe_r"
+#: src/plugins/geolocation/geolocation_plugin.c:610
+msgid "Guadeloupe"
+msgstr "Guadalupe"
 
-#: src/plugins/managesieve/sieve_editor.c:353
-msgid "Script saved successfully."
-msgstr "Seqüències d'ordres guardat satisfactòriament."
+#: src/plugins/geolocation/geolocation_plugin.c:611
+msgid "Equatorial Guinea"
+msgstr "Guinea Equatorial"
 
-#: src/plugins/managesieve/sieve_editor.c:370
-msgid "Saving..."
-msgstr "Desant…"
+#: src/plugins/geolocation/geolocation_plugin.c:612
+msgid "Greece"
+msgstr "Grècia"
 
-#: src/plugins/managesieve/sieve_editor.c:399
-msgid "Checking syntax..."
-msgstr "Comprovant la sintaxi..."
+#: src/plugins/geolocation/geolocation_plugin.c:613
+msgid "South Georgia And The South Sandwich Islands"
+msgstr "Geòrgia del Sud i les Illes Sandwich del Sud"
 
-#: src/plugins/managesieve/sieve_editor.c:432
-msgid "This script has been modified. Save the latest changes?"
-msgstr ""
-"Aquesta seqüència d'ordres s'ha modificat. Vols desar els últims canvis?"
+#: src/plugins/geolocation/geolocation_plugin.c:614
+msgid "Guatemala"
+msgstr "Guatemala"
 
-#: src/plugins/managesieve/sieve_editor.c:693
-#, c-format
-msgid "%s - Sieve Filter%s"
-msgstr "%s - filtre Sieve %s"
+#: src/plugins/geolocation/geolocation_plugin.c:615
+msgid "Guam"
+msgstr "Guam"
 
-#: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1278
-msgid "Loading..."
-msgstr "Carregant..."
+#: src/plugins/geolocation/geolocation_plugin.c:616
+msgid "Guinea-Bissau"
+msgstr "Guinea Bissau"
 
-#: src/plugins/managesieve/sieve_manager.c:159
-#: src/plugins/managesieve/sieve_manager.c:241
-msgid "Add Sieve script"
-msgstr "Afegir seqüència d'ordres Sieve"
+#: src/plugins/geolocation/geolocation_plugin.c:617
+msgid "Guyana"
+msgstr "Guaiana"
 
-#: src/plugins/managesieve/sieve_manager.c:160
-msgid "Enter name for a new Sieve filter script."
-msgstr "Introduïu un nom per la nova seqüència d'ordres Sieve."
+#: src/plugins/geolocation/geolocation_plugin.c:618
+msgid "Hong Kong"
+msgstr "Hong Kong"
 
-#: src/plugins/managesieve/sieve_manager.c:242
-msgid "Enter new name for the script."
-msgstr "Introduïu un nom nou per la seqüència d'ordres."
+#: src/plugins/geolocation/geolocation_plugin.c:619
+msgid "Heard Island And Mcdonald Islands"
+msgstr "Illa Illes Heard i McDonald"
 
-#: src/plugins/managesieve/sieve_manager.c:323
-#, c-format
-msgid "Do you really want to delete the filter '%s'?"
-msgstr "Realment vols esborrar el filtre  '%s'?"
+#: src/plugins/geolocation/geolocation_plugin.c:620
+msgid "Honduras"
+msgstr "Hondures"
 
-#: src/plugins/managesieve/sieve_manager.c:324
-msgid "Delete filter"
-msgstr "Esborrar el filtre"
+#: src/plugins/geolocation/geolocation_plugin.c:621
+msgid "Croatia"
+msgstr "Croàcia"
 
-#: src/plugins/managesieve/sieve_manager.c:478
-msgid "Active"
-msgstr "Actiu"
+#: src/plugins/geolocation/geolocation_plugin.c:622
+msgid "Haiti"
+msgstr "Haití"
 
-#: src/plugins/managesieve/sieve_manager.c:489
-msgid "An account can only have one active script at a time."
-msgstr "Un compte només pot tenir una seqüència d'ordres activa alhora."
+#: src/plugins/geolocation/geolocation_plugin.c:623
+msgid "Hungary"
+msgstr "Hongria"
 
-#: src/plugins/managesieve/sieve_manager.c:576
-msgid "Unable to connect"
-msgstr "Incapaç de connectar"
+#: src/plugins/geolocation/geolocation_plugin.c:624
+msgid "Indonesia"
+msgstr "Indonèsia"
 
-#: src/plugins/managesieve/sieve_manager.c:620
-msgid "Listing scripts..."
-msgstr "Llista de seqüències d'ordres..."
+#: src/plugins/geolocation/geolocation_plugin.c:625
+msgid "Ireland"
+msgstr "Irlanda"
 
-#: src/plugins/managesieve/sieve_manager.c:623
-msgid "Connecting..."
-msgstr "Connectant ..."
+#: src/plugins/geolocation/geolocation_plugin.c:626
+msgid "Israel"
+msgstr "Israel"
 
-#: src/plugins/managesieve/sieve_manager.c:655
-msgid "Manage Sieve Filters"
-msgstr "Administra filtres Sieve"
+#: src/plugins/geolocation/geolocation_plugin.c:627
+msgid "India"
+msgstr "Índia"
 
-#: src/plugins/managesieve/sieve_manager.c:796
-msgid "To use Sieve, enable it in an account's preferences."
-msgstr "Per utilitzar Sieve, permetre'l en les preferències d'un compte."
+#: src/plugins/geolocation/geolocation_plugin.c:628
+msgid "British Indian Ocean Territory"
+msgstr "Territori Britànic De l'Oceà Índic"
 
-#: src/plugins/managesieve/sieve_plugin.c:36
-#: src/plugins/managesieve/sieve_plugin.c:154
-msgid "ManageSieve"
-msgstr "ManageSieve"
+#: src/plugins/geolocation/geolocation_plugin.c:629
+msgid "Iraq"
+msgstr "Iraq"
 
-#: src/plugins/managesieve/sieve_plugin.c:46
-msgid "Manage Sieve Filters..."
-msgstr "Administra filtres Sieve..."
+#: src/plugins/geolocation/geolocation_plugin.c:630
+msgid "Iran, Islamic Republic Of"
+msgstr "Iran, República Islàmica de l '"
 
-#: src/plugins/managesieve/sieve_plugin.c:114
-msgid "Manage sieve filters on a server using the ManageSieve protocol."
-msgstr ""
-"Administra filtres Sieve en un servidor utilitzant el protocol ManageSieve."
+#: src/plugins/geolocation/geolocation_plugin.c:631
+msgid "Iceland"
+msgstr "Islàndia"
 
-#: src/plugins/managesieve/sieve_prefs.c:146
-msgid "Enable Sieve"
-msgstr "Activar Sieve"
+#: src/plugins/geolocation/geolocation_plugin.c:632
+msgid "Italy"
+msgstr "Itàlia"
 
-#: src/plugins/managesieve/sieve_prefs.c:153 src/prefs_account.c:1095
-msgid "Server information"
-msgstr "Informació del servidor"
+#: src/plugins/geolocation/geolocation_plugin.c:633
+msgid "Jamaica"
+msgstr "Jamaica"
 
-#: src/plugins/managesieve/sieve_prefs.c:162
-msgid "Server name"
-msgstr "Nom del servidor"
+#: src/plugins/geolocation/geolocation_plugin.c:634
+msgid "Jordan"
+msgstr "Jordània"
 
-#: src/plugins/managesieve/sieve_prefs.c:171
-msgid "Connect to this host instead of the host used for receiving mail"
-msgstr ""
-"Connectar-se a aquest servidor en comptes del servidor utilitzat per rebre "
-"correu"
+#: src/plugins/geolocation/geolocation_plugin.c:635
+msgid "Japan"
+msgstr "Japó"
 
-#: src/plugins/managesieve/sieve_prefs.c:175
-msgid "Server port"
-msgstr "Port del servidor"
+#: src/plugins/geolocation/geolocation_plugin.c:636
+msgid "Kenya"
+msgstr "Kenya"
 
-#: src/plugins/managesieve/sieve_prefs.c:182
-msgid "Connect to this port instead of the default"
-msgstr "Connectar-se a aquest port en comptes de al predeterminat"
+#: src/plugins/geolocation/geolocation_plugin.c:637
+msgid "Kyrgyzstan"
+msgstr "Kyrgyzstan"
 
-#: src/plugins/managesieve/sieve_prefs.c:186
-msgid "Encryption"
-msgstr "Xifratge"
+#: src/plugins/geolocation/geolocation_plugin.c:638
+msgid "Cambodia"
+msgstr "Cambodja"
 
-#: src/plugins/managesieve/sieve_prefs.c:191
-msgid "No TLS"
-msgstr "Sense TLS"
+#: src/plugins/geolocation/geolocation_plugin.c:639
+msgid "Kiribati"
+msgstr "Kiribati"
 
-#: src/plugins/managesieve/sieve_prefs.c:193
-msgid "Use TLS when available"
-msgstr "Utilitzar TLS quan estigui disponible"
+#: src/plugins/geolocation/geolocation_plugin.c:640
+msgid "Comoros"
+msgstr "Comores"
 
-#: src/plugins/managesieve/sieve_prefs.c:195
-msgid "Require TLS"
-msgstr "Requereix TLS"
+#: src/plugins/geolocation/geolocation_plugin.c:641
+msgid "Saint Kitts And Nevis"
+msgstr "Sant Cristóbal i Nieves"
 
-#: src/plugins/managesieve/sieve_prefs.c:203
-#: src/plugins/rssyl/rssyl_feed_props.c:267
-msgid "No authentication"
-msgstr "Sense autentificació"
+#: src/plugins/geolocation/geolocation_plugin.c:642
+msgid "Korea, Democratic People'S Republic Of"
+msgstr "República de Corea, Popular Democràtica de"
 
-#: src/plugins/managesieve/sieve_prefs.c:205
-msgid "Use same authentication as for receiving mail"
-msgstr "Utilitzeu la mateixa autenticació que per rebre correu"
+#: src/plugins/geolocation/geolocation_plugin.c:643
+msgid "Korea, Republic Of"
+msgstr "República De Corea"
 
-#: src/plugins/managesieve/sieve_prefs.c:207
-msgid "Specify authentication"
-msgstr "Especifiqueu l'autenticació"
+#: src/plugins/geolocation/geolocation_plugin.c:644
+msgid "Kuwait"
+msgstr "Kuwait"
 
-#: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
-msgid "User ID"
-msgstr "ID d'usuari"
+#: src/plugins/geolocation/geolocation_plugin.c:645
+msgid "Cayman Islands"
+msgstr "Illes Caiman"
 
-#: src/plugins/managesieve/sieve_prefs.c:247
-#: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
-msgid "Password"
-msgstr "Contrasenya"
+#: src/plugins/geolocation/geolocation_plugin.c:646
+msgid "Kazakhstan"
+msgstr "Kazakhstan"
 
-#: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
-msgid "Authentication method"
-msgstr "Mètode d'autentificació"
+#: src/plugins/geolocation/geolocation_plugin.c:647
+msgid "Lao People'S Democratic Republic"
+msgstr "República Democràtica Popular Lao"
 
-#: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Automàtic"
+#: src/plugins/geolocation/geolocation_plugin.c:648
+msgid "Lebanon"
+msgstr "Líban"
 
-#: src/plugins/managesieve/sieve_prefs.c:379
-msgid "Sieve server must not contain a space."
-msgstr "El servidor de Sieve no pot contenir un espai."
+#: src/plugins/geolocation/geolocation_plugin.c:649
+msgid "Saint Lucia"
+msgstr "Santa Llúcia"
 
-#: src/plugins/managesieve/sieve_prefs.c:385
-msgid "Sieve server is not entered."
-msgstr "No s'ha especificat el servidor Sieve."
+#: src/plugins/geolocation/geolocation_plugin.c:650
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
 
-#: src/plugins/managesieve/sieve_prefs.c:413
-msgid "Sieve"
-msgstr "Sieve"
+#: src/plugins/geolocation/geolocation_plugin.c:651
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
 
-#: src/plugins/newmail/newmail.c:106 src/plugins/newmail/newmail.c:149
-msgid "NewMail"
-msgstr "Nou Correu"
+#: src/plugins/geolocation/geolocation_plugin.c:652
+msgid "Liberia"
+msgstr "Libèria"
 
-#: src/plugins/newmail/newmail.c:111
-msgid "Failed to register newmail hook"
-msgstr "Ha fallat el registre del ganxo per nous correus"
+#: src/plugins/geolocation/geolocation_plugin.c:653
+msgid "Lesotho"
+msgstr "Lesotho"
 
-#: src/plugins/newmail/newmail.c:128
-#, c-format
-msgid "Could not open log file %s: %s\n"
-msgstr "No s'ha pogut obrir el fitxer de traça %s: %s\n"
+#: src/plugins/geolocation/geolocation_plugin.c:654
+msgid "Lithuania"
+msgstr "Lituània"
 
-#: src/plugins/newmail/newmail.c:141
-#, c-format
-msgid ""
-"This plugin writes a header summary to a log file for each mail received "
-"after sorting.\n"
-"\n"
-"Default is ~/Mail/NewLog\n"
-"\n"
-"Current log is %s"
-msgstr ""
-"Aquest plugin escriu un resum de les capçaleres en un fitxer de traça per a "
-"cada correu rebut després de la classificació.\n"
-"\n"
-"Per defecte ès ~/Mail/NewLog\n"
-"\n"
-"La traça actual ès %s"
+#: src/plugins/geolocation/geolocation_plugin.c:655
+msgid "Luxembourg"
+msgstr "Luxemburg"
 
-#: src/plugins/newmail/newmail.c:175
-msgid "Log file"
-msgstr "Fitxer de traça"
+#: src/plugins/geolocation/geolocation_plugin.c:656
+msgid "Latvia"
+msgstr "Letònia"
 
-#: src/plugins/notification/notification_banner.c:356
-msgid "Folder:"
-msgstr "Carpeta:"
+#: src/plugins/geolocation/geolocation_plugin.c:657
+msgid "Libyan Arab Jamahiriya"
+msgstr "Jamahiriya Àrab Líbia"
 
-#: src/plugins/notification/notification_foldercheck.c:478
-msgid "Select folder(s)"
-msgstr "Seleccionar carpeta(s)"
+#: src/plugins/geolocation/geolocation_plugin.c:658
+msgid "Morocco"
+msgstr "Marroc"
 
-#: src/plugins/notification/notification_foldercheck.c:579
-msgid "select recursively"
-msgstr "seleccionar recursivament"
+#: src/plugins/geolocation/geolocation_plugin.c:659
+msgid "Monaco"
+msgstr "Mònaco"
 
-#: src/plugins/notification/notification_lcdproc.c:155
-msgid "No new messages"
-msgstr "Cap missatge nou"
+#: src/plugins/geolocation/geolocation_plugin.c:660
+msgid "Moldova, Republic Of"
+msgstr "Moldàvia, República de"
 
-#: src/plugins/notification/notification_plugin.c:216
-#: src/plugins/notification/notification_plugin.c:417
-#: src/plugins/notification/notification_prefs.c:400
-#: src/plugins/notification/notification_prefs.c:415
-#: src/plugins/notification/notification_prefs.c:434
-#: src/plugins/notification/notification_prefs.c:452
-#: src/plugins/notification/notification_prefs.c:470
-#: src/plugins/notification/notification_prefs.c:488
-#: src/plugins/notification/notification_prefs.c:506
-#: src/plugins/notification/notification_prefs.c:524
-msgid "Notification"
-msgstr "Notificació"
+#: src/plugins/geolocation/geolocation_plugin.c:661
+msgid "Madagascar"
+msgstr "Madagascar"
 
-#: src/plugins/notification/notification_plugin.c:221
-msgid "The Notification plugin needs threading support."
-msgstr "El mòdul de notificació necessita suport de fils."
+#: src/plugins/geolocation/geolocation_plugin.c:662
+msgid "Marshall Islands"
+msgstr "Illes Marshall"
 
-#: src/plugins/notification/notification_plugin.c:228
-msgid "Failed to register folder item update hook in the Notification plugin"
-msgstr ""
-"Error al registrar el canvi de l'element de la carpeta al mòdul de "
-"notificació"
+#: src/plugins/geolocation/geolocation_plugin.c:663
+msgid "Macedonia, The Former Yugoslav Republic Of"
+msgstr "Macedònia, Antiga República Iugoslava de"
 
-#: src/plugins/notification/notification_plugin.c:236
-msgid "Failed to register folder update hook in the Notification plugin"
-msgstr "Error al registrar el canvi de la carpeta al mòdul de notificació"
+#: src/plugins/geolocation/geolocation_plugin.c:664
+msgid "Mali"
+msgstr "Mali"
 
-#: src/plugins/notification/notification_plugin.c:246
-msgid "Failed to register msginfo update hook in the Notification plugin"
-msgstr "Error al registrar el canvi de la informació al mòdul de notificació"
+# RML To be consistent with previous one.
+#: src/plugins/geolocation/geolocation_plugin.c:665
+msgid "Myanmar"
+msgstr "Myanmar"
 
-#: src/plugins/notification/notification_plugin.c:256
-msgid "Failed to register offline switch hook in the Notification plugin"
-msgstr "Error al registrar el canvi a fora de línia al mòdul de notificació"
+#: src/plugins/geolocation/geolocation_plugin.c:666
+msgid "Mongolia"
+msgstr "Mongòlia"
 
-#: src/plugins/notification/notification_plugin.c:267
-msgid "Failed to register main window close hook in the Notification plugin"
-msgstr ""
-"Error al registrar el tancament de la finestra principal al mòdul de "
-"notificació"
+#: src/plugins/geolocation/geolocation_plugin.c:667
+msgid "Macao"
+msgstr "Macau"
 
-#: src/plugins/notification/notification_plugin.c:280
-msgid "Failed to register got iconified hook in the Notification plugin"
-msgstr "Error al registrar la iconificació al mòdul de notificació"
+#: src/plugins/geolocation/geolocation_plugin.c:668
+msgid "Northern Mariana Islands"
+msgstr "Illes Marianes Del Nord"
 
-#: src/plugins/notification/notification_plugin.c:293
-msgid "Failed to register account list changed hook in the Notification plugin"
-msgstr ""
-"Error al registrar el canvi de la llista de comptes al mòdul de notificació"
+#: src/plugins/geolocation/geolocation_plugin.c:669
+msgid "Martinique"
+msgstr "Martinica"
 
-#: src/plugins/notification/notification_plugin.c:306
-msgid "Failed to register theme change hook in the Notification plugin"
-msgstr ""
-"Error al registrar el ganxo de canvi de tema del connector de Notificació"
+#: src/plugins/geolocation/geolocation_plugin.c:670
+msgid "Mauritania"
+msgstr "Mauritània"
 
-#: src/plugins/notification/notification_plugin.c:422
-msgid ""
-"This plugin provides various ways to notify the user of new and unread "
-"email.\n"
-"The plugin is extensively configurable in the plugins section of the "
-"preferences dialog.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Aquest mòdul ens permet notificar a l'usuari de maneres diferents dels "
-"correus nous i no llegits.\n"
-"El mòdul és extensament configurable a la secció de mòduls al diàleg de "
-"preferències.\n"
-"Opinions a <berndt at gmx.de> són benvingudes."
+#: src/plugins/geolocation/geolocation_plugin.c:671
+msgid "Montserrat"
+msgstr "Montserrat"
 
-#: src/plugins/notification/notification_plugin.c:447
-msgid "Various tools"
-msgstr "Eines variades"
+#: src/plugins/geolocation/geolocation_plugin.c:672
+msgid "Malta"
+msgstr "Malta"
 
-#: src/plugins/notification/notification_popup.c:314
-msgid "New Mail message"
-msgstr "Nou missatge de correu"
+#: src/plugins/geolocation/geolocation_plugin.c:673
+msgid "Mauritius"
+msgstr "Maurici"
 
-#: src/plugins/notification/notification_popup.c:335
-msgid "New News post"
-msgstr "Nou missatge de notícies"
+#: src/plugins/geolocation/geolocation_plugin.c:674
+msgid "Maldives"
+msgstr "Maldives"
 
-#: src/plugins/notification/notification_popup.c:336
-msgid "A new message arrived"
-msgstr "Ha arribat un nou missatge"
+#: src/plugins/geolocation/geolocation_plugin.c:675
+msgid "Malawi"
+msgstr "Malawi"
 
-#: src/plugins/notification/notification_popup.c:339
-msgid "New Calendar message"
-msgstr "Nou missatge de calendari"
+#: src/plugins/geolocation/geolocation_plugin.c:676
+msgid "Mexico"
+msgstr "Mèxic"
 
-#: src/plugins/notification/notification_popup.c:340
-#: src/plugins/notification/notification_trayicon.c:866
-msgid "A new calendar message arrived"
-msgstr "Ha arribat un nou missatge de calendari"
+#: src/plugins/geolocation/geolocation_plugin.c:677
+msgid "Malaysia"
+msgstr "Malàisia"
 
-#: src/plugins/notification/notification_popup.c:343
-msgid "New RSS feed article"
-msgstr "Nou article de feed RSS"
+#: src/plugins/geolocation/geolocation_plugin.c:678
+msgid "Mozambique"
+msgstr "Moçambic"
 
-#: src/plugins/notification/notification_popup.c:344
-#: src/plugins/notification/notification_trayicon.c:869
-msgid "A new article in a RSS feed arrived"
-msgstr "Ha arribat un nou article a un feed RSS"
+#: src/plugins/geolocation/geolocation_plugin.c:679
+msgid "Namibia"
+msgstr "Namíbia"
 
-#: src/plugins/notification/notification_popup.c:347
-msgid "New unknown message"
-msgstr "Nou missatge desconegut"
+#: src/plugins/geolocation/geolocation_plugin.c:680
+msgid "New Caledonia"
+msgstr "Nova Caledònia"
 
-#: src/plugins/notification/notification_popup.c:348
-msgid "Unknown message type arrived"
-msgstr "Ha arribat un missatge de tipus desconegut"
+#: src/plugins/geolocation/geolocation_plugin.c:681
+msgid "Niger"
+msgstr "Níger"
 
-#: src/plugins/notification/notification_popup.c:381
-#: src/plugins/notification/notification_trayicon.c:638
-msgid "Present main window"
-msgstr "Finestra principal actual"
+#: src/plugins/geolocation/geolocation_plugin.c:682
+msgid "Norfolk Island"
+msgstr "Illa Norfolk"
 
-#: src/plugins/notification/notification_popup.c:491
-msgid "Mail message"
-msgstr "Missatge de correu"
+#: src/plugins/geolocation/geolocation_plugin.c:683
+msgid "Nigeria"
+msgstr "Nigèria"
 
-#: src/plugins/notification/notification_popup.c:492
-#: src/plugins/notification/notification_popup.c:498
-#, c-format
-msgid "%d new message arrived"
-msgid_plural "%d new messages arrived"
-msgstr[0] "Ha arribat %d missatge nou"
-msgstr[1] "Han arribat %d missatges nous"
+#: src/plugins/geolocation/geolocation_plugin.c:684
+msgid "Nicaragua"
+msgstr "Nicaragua"
 
-#: src/plugins/notification/notification_popup.c:497
-msgid "News message"
-msgstr "Missatge de notícies"
+#: src/plugins/geolocation/geolocation_plugin.c:685
+msgid "Netherlands"
+msgstr "Països Baixos"
 
-#: src/plugins/notification/notification_popup.c:503
-msgid "Calendar message"
-msgstr "Missatge de calendari"
+#: src/plugins/geolocation/geolocation_plugin.c:686
+msgid "Norway"
+msgstr "Noruega"
 
-#: src/plugins/notification/notification_popup.c:504
-#: src/plugins/notification/notification_trayicon.c:903
-#, c-format
-msgid "%d new calendar message arrived"
-msgid_plural "%d new calendar messages arrived"
-msgstr[0] "Ha arribat %d nou missatge de calendari"
-msgstr[1] "Han arribat %d nous missatges de calendari"
+#: src/plugins/geolocation/geolocation_plugin.c:687
+msgid "Nepal"
+msgstr "Nepal"
 
-#: src/plugins/notification/notification_popup.c:509
-msgid "RSS news feed"
-msgstr "Feed RSS de notícies"
+#: src/plugins/geolocation/geolocation_plugin.c:688
+msgid "Nauru"
+msgstr "Nauru"
 
-#: src/plugins/notification/notification_popup.c:510
-#, c-format
-msgid "%d new article in a RSS feed arrived"
-msgid_plural "%d new articles in a RSS feed arrived"
-msgstr[0] "Ha arribat %d nou article de feed RSS"
-msgstr[1] "HAn arribat %d nous articles de feed RSS"
+#: src/plugins/geolocation/geolocation_plugin.c:689
+msgid "Niue"
+msgstr "Niue"
 
-#: src/plugins/notification/notification_popup.c:574
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nou missatge"
-msgstr[1] "%d nous missatges"
+#: src/plugins/geolocation/geolocation_plugin.c:690
+msgid "New Zealand"
+msgstr "Nova Zelanda"
 
-#: src/plugins/notification/notification_prefs.c:416
-msgid "Hotkeys"
-msgstr "Tecles d'accés directe"
+#: src/plugins/geolocation/geolocation_plugin.c:691
+msgid "Oman"
+msgstr "Oman"
 
-#: src/plugins/notification/notification_prefs.c:435
-msgid "Banner"
-msgstr "Anunci"
+#: src/plugins/geolocation/geolocation_plugin.c:692
+msgid "Panama"
+msgstr "Panamà"
 
-#: src/plugins/notification/notification_prefs.c:453
-msgid "Popup"
-msgstr "Element emergent"
+#: src/plugins/geolocation/geolocation_plugin.c:693
+msgid "Peru"
+msgstr "Perú"
 
-#: src/plugins/notification/notification_prefs.c:471 src/prefs_actions.c:263
-#: src/prefs_receive.c:133
-msgid "Command"
-msgstr "Comanda"
+#: src/plugins/geolocation/geolocation_plugin.c:694
+msgid "French Polynesia"
+msgstr "Polinèsia francès"
 
-#: src/plugins/notification/notification_prefs.c:489
-msgid "LCD"
-msgstr "LCD"
+#: src/plugins/geolocation/geolocation_plugin.c:695
+msgid "Papua New Guinea"
+msgstr "Papua Nova Guinea"
 
-#: src/plugins/notification/notification_prefs.c:507
-msgid "SysTrayicon"
-msgstr "Icona de safata de sistema"
+#: src/plugins/geolocation/geolocation_plugin.c:696
+msgid "Philippines"
+msgstr "Filipines"
 
-#: src/plugins/notification/notification_prefs.c:525
-msgid "Indicator"
-msgstr "Indicador"
+#: src/plugins/geolocation/geolocation_plugin.c:697
+msgid "Pakistan"
+msgstr "Pakistan"
 
-#: src/plugins/notification/notification_prefs.c:608
-msgid "Include folder types"
-msgstr "Incloure tipus de carpeta"
+#: src/plugins/geolocation/geolocation_plugin.c:698
+msgid "Poland"
+msgstr "Polònia"
 
-#: src/plugins/notification/notification_prefs.c:617
-msgid "Mail folders"
-msgstr "Carpetes de correus"
+#: src/plugins/geolocation/geolocation_plugin.c:699
+msgid "Saint Pierre And Miquelon"
+msgstr "Sant Pere i Miquelon"
 
-#: src/plugins/notification/notification_prefs.c:625
-msgid "News folders"
-msgstr "Carpetes de notícies"
+#: src/plugins/geolocation/geolocation_plugin.c:700
+msgid "Pitcairn"
+msgstr "Pitcairn"
 
-#: src/plugins/notification/notification_prefs.c:633
-msgid "RSSyl folders"
-msgstr "Carpetes RSSyl"
+#: src/plugins/geolocation/geolocation_plugin.c:701
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
 
-#: src/plugins/notification/notification_prefs.c:641
-msgid "vCalendar folders"
-msgstr "Carpetes vCalendar"
+#: src/plugins/geolocation/geolocation_plugin.c:702
+msgid "Portugal"
+msgstr "Portugal"
 
-#: src/plugins/notification/notification_prefs.c:649
-msgid "These settings override folder-specific selections."
-msgstr ""
-"Aquestes configuracions sobreescriuran les seleccions especifiques de "
-"carpeta."
+#: src/plugins/geolocation/geolocation_plugin.c:703
+msgid "Palau"
+msgstr "Palau"
 
-#: src/plugins/notification/notification_prefs.c:660
-msgid "Global notification settings"
-msgstr "Configuració de notificació global"
+#: src/plugins/geolocation/geolocation_plugin.c:704
+msgid "Paraguay"
+msgstr "Paraguai"
 
-#: src/plugins/notification/notification_prefs.c:669
-msgid "Set window manager urgency hint when new messages exist"
-msgstr ""
-"Estableix el suggeriment d'urgencia del gestor de finestres quan existeixi "
-"un nou missatge"
+#: src/plugins/geolocation/geolocation_plugin.c:705
+msgid "Qatar"
+msgstr "Katar"
 
-#: src/plugins/notification/notification_prefs.c:678
-msgid "Set window manager urgency hint when unread messages exist"
-msgstr ""
-"Estableix el suggeriment d'urgencia del gestor de finestres quan existeixi "
-"un missatge no llegit"
+#: src/plugins/geolocation/geolocation_plugin.c:706
+msgid "Reunion"
+msgstr "Reunion"
 
-#: src/plugins/notification/notification_prefs.c:688
-msgid "Use sound theme"
-msgstr "Useu tema de so"
+#: src/plugins/geolocation/geolocation_plugin.c:707
+msgid "Romania"
+msgstr "Romania"
 
-#: src/plugins/notification/notification_prefs.c:762
-msgid "Show banner"
-msgstr "Mostra avís"
+#: src/plugins/geolocation/geolocation_plugin.c:708
+msgid "Russian Federation"
+msgstr "Federació Russa"
 
-#: src/plugins/notification/notification_prefs.c:767
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:143
-#: src/prefs_receive.c:183 src/prefs_summaries.c:504
-msgid "Never"
-msgstr "Mai"
+#: src/plugins/geolocation/geolocation_plugin.c:709
+msgid "Rwanda"
+msgstr "Rwanda"
 
-#: src/plugins/notification/notification_prefs.c:769 src/prefs_receive.c:181
-#: src/prefs_summaries.c:486 src/prefs_summaries.c:505
-msgid "Always"
-msgstr "Sempre"
+#: src/plugins/geolocation/geolocation_plugin.c:710
+msgid "Saudi Arabia"
+msgstr "Aràbia Saudita"
 
-#: src/plugins/notification/notification_prefs.c:771
-msgid "Only when not empty"
-msgstr "Només quan no estigui buit"
+#: src/plugins/geolocation/geolocation_plugin.c:711
+msgid "Solomon Islands"
+msgstr "Illes Salomó"
 
-#: src/plugins/notification/notification_prefs.c:790
-msgid "Banner speed"
-msgstr "Velocitat de l'avís"
+#: src/plugins/geolocation/geolocation_plugin.c:712
+msgid "Seychelles"
+msgstr "Seychelles"
 
-#: src/plugins/notification/notification_prefs.c:827
-msgid "Maximum number of messages"
-msgstr "Nombre màxim de missatges"
+#: src/plugins/geolocation/geolocation_plugin.c:713
+msgid "Sudan"
+msgstr "Sudan"
 
-#: src/plugins/notification/notification_prefs.c:833
-msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr ""
-"Limitar el nombre de missatges mostrats, fes servir 0 per a il·limitats"
+#: src/plugins/geolocation/geolocation_plugin.c:714
+msgid "Sweden"
+msgstr "Suècia"
 
-#: src/plugins/notification/notification_prefs.c:842
-msgid "Banner width"
-msgstr "Amplada del Banner"
+#: src/plugins/geolocation/geolocation_plugin.c:715
+msgid "Singapore"
+msgstr "Singapur"
 
-#: src/plugins/notification/notification_prefs.c:848
-msgid "Limit the size of banner, use 0 for screen width"
-msgstr "Amplada de l'anunci en pixels (0 significa pantalla sencera)"
+#: src/plugins/geolocation/geolocation_plugin.c:716
+msgid "Saint Helena"
+msgstr "Santa Helena"
 
-#: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
-#: src/prefs_message.c:223
-msgid "pixel(s)"
-msgstr "punt(s)"
+#: src/plugins/geolocation/geolocation_plugin.c:717
+msgid "Slovenia"
+msgstr "Eslovènia"
 
-#: src/plugins/notification/notification_prefs.c:859
-msgid "Include unread mails in banner"
-msgstr "Incloure correus no llegit a l'avís"
+#: src/plugins/geolocation/geolocation_plugin.c:718
+msgid "Svalbard And Jan Mayen"
+msgstr "Svalbard i Jan Mayen"
 
-#: src/plugins/notification/notification_prefs.c:867
-msgid "Make banner sticky"
-msgstr "Fer que l'avís s'enganxi"
+#: src/plugins/geolocation/geolocation_plugin.c:719
+msgid "Slovakia"
+msgstr "Eslovàquia"
 
-#: src/plugins/notification/notification_prefs.c:877
-#: src/plugins/notification/notification_prefs.c:1082
-#: src/plugins/notification/notification_prefs.c:1377
-#: src/plugins/notification/notification_prefs.c:1612
-msgid "Only include selected folders"
-msgstr "Incloure només carpetes seleccionades"
+#: src/plugins/geolocation/geolocation_plugin.c:720
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
 
-#: src/plugins/notification/notification_prefs.c:886
-#: src/plugins/notification/notification_prefs.c:1091
-#: src/plugins/notification/notification_prefs.c:1386
-#: src/plugins/notification/notification_prefs.c:1621
-msgid "Select folders..."
-msgstr "Seleccionar carpetes..."
+#: src/plugins/geolocation/geolocation_plugin.c:721
+msgid "San Marino"
+msgstr "Sant Marí"
 
-#: src/plugins/notification/notification_prefs.c:898
-msgid "Banner colors"
-msgstr "Colors del Banner"
+#: src/plugins/geolocation/geolocation_plugin.c:722
+msgid "Senegal"
+msgstr "Senegal"
 
-#: src/plugins/notification/notification_prefs.c:902
-#: src/plugins/notification/notification_prefs.c:1123
-msgid "Use custom colors"
-msgstr "Usar colors definits"
+#: src/plugins/geolocation/geolocation_plugin.c:723
+msgid "Somalia"
+msgstr "Somàlia"
 
-#: src/plugins/notification/notification_prefs.c:917
-#: src/plugins/notification/notification_prefs.c:1136
-msgid "Foreground"
-msgstr "Primer pla"
+#: src/plugins/geolocation/geolocation_plugin.c:724
+msgid "Suriname"
+msgstr "Surinam"
 
-#: src/plugins/notification/notification_prefs.c:923
-#: src/plugins/notification/notification_prefs.c:1142
-msgid "Foreground color"
-msgstr "Color de primer pla"
+#: src/plugins/geolocation/geolocation_plugin.c:725
+msgid "Sao Tome And Principe"
+msgstr "Sant Vaig prendre I Príncep"
 
-#: src/plugins/notification/notification_prefs.c:928
-#: src/plugins/notification/notification_prefs.c:1147
-#: src/prefs_msg_colors.c:281 src/prefs_msg_colors.c:302
-#: src/prefs_msg_colors.c:323
-msgid "Background"
-msgstr "Fons"
+#: src/plugins/geolocation/geolocation_plugin.c:726
+msgid "El Salvador"
+msgstr "El Salvador"
 
-#: src/plugins/notification/notification_prefs.c:934
-#: src/plugins/notification/notification_prefs.c:1153
-msgid "Background color"
-msgstr "Color de fons"
+#: src/plugins/geolocation/geolocation_plugin.c:727
+msgid "Syrian Arab Republic"
+msgstr "República Àrab Síria"
 
-#: src/plugins/notification/notification_prefs.c:1046
-#: src/plugins/notification/notification_prefs.c:1647
-msgid "Enable popup"
-msgstr "Activar elements emergents"
+#: src/plugins/geolocation/geolocation_plugin.c:728
+msgid "Swaziland"
+msgstr "Swazilàndia"
 
-#: src/plugins/notification/notification_prefs.c:1063
-#: src/plugins/notification/notification_prefs.c:1665
-msgid "Popup timeout"
-msgstr "Temps espera de la finestra emergent"
+#: src/plugins/geolocation/geolocation_plugin.c:729
+msgid "Turks And Caicos Islands"
+msgstr "Illes Turks i Caicos"
 
-#: src/plugins/notification/notification_prefs.c:1102
-msgid "Make popup sticky"
-msgstr "Fer que l'element emergent s'enganxi"
+#: src/plugins/geolocation/geolocation_plugin.c:730
+msgid "Chad"
+msgstr "Chad"
 
-#: src/plugins/notification/notification_prefs.c:1112
-msgid "Set popup window width and position"
-msgstr "Definir amplada i posició de les finestres emergents"
+#: src/plugins/geolocation/geolocation_plugin.c:731
+msgid "French Southern Territories"
+msgstr "Territoris Francesos del Sud"
 
-#: src/plugins/notification/notification_prefs.c:1117
-msgid "(the window manager is free to ignore this)"
-msgstr "(el gestor de finestres és lliure d'ignorar-ho)"
+#: src/plugins/geolocation/geolocation_plugin.c:732
+msgid "Togo"
+msgstr "Togo"
 
-#: src/plugins/notification/notification_prefs.c:1165
-#: src/plugins/notification/notification_prefs.c:1677
-msgid "Display folder name"
-msgstr "Mostra el nom de la carpeta"
+#: src/plugins/geolocation/geolocation_plugin.c:733
+msgid "Thailand"
+msgstr "Tailàndia"
 
-#: src/plugins/notification/notification_prefs.c:1230
-msgid "Sample popup window"
-msgstr "Mostra finestra emergent"
+#: src/plugins/geolocation/geolocation_plugin.c:734
+msgid "Tajikistan"
+msgstr "Tadjikistan"
 
-#: src/plugins/notification/notification_prefs.c:1236
-msgid "Done"
-msgstr "Fet"
+#: src/plugins/geolocation/geolocation_plugin.c:735
+msgid "Tokelau"
+msgstr "Tokelau"
 
-#: src/plugins/notification/notification_prefs.c:1294
-msgid "Select command"
-msgstr "Selecciona l'ordre"
+#: src/plugins/geolocation/geolocation_plugin.c:736
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
 
-#: src/plugins/notification/notification_prefs.c:1323
-msgid "Enable command"
-msgstr "Activar comanda"
+#: src/plugins/geolocation/geolocation_plugin.c:737
+msgid "Tunisia"
+msgstr "Tunísia"
 
-#: src/plugins/notification/notification_prefs.c:1340
-msgid "Command to execute"
-msgstr "Ordre a executar"
+#: src/plugins/geolocation/geolocation_plugin.c:738
+msgid "Tonga"
+msgstr "Tonga"
 
-#: src/plugins/notification/notification_prefs.c:1358
-msgid "Block command after execution for"
-msgstr "Bloqeujar comanda després de l'execució per"
+#: src/plugins/geolocation/geolocation_plugin.c:739
+msgid "East Timor"
+msgstr "Timor Oriental"
 
-#: src/plugins/notification/notification_prefs.c:1465
-msgid "Enable LCD"
-msgstr "Activar LCD"
+#: src/plugins/geolocation/geolocation_plugin.c:740
+msgid "Turkey"
+msgstr "Turquia"
 
-#: src/plugins/notification/notification_prefs.c:1484
-msgid "Hostname:Port of LCDd server"
-msgstr "Nom de servidor:Port del servei LCDd"
+#: src/plugins/geolocation/geolocation_plugin.c:741
+msgid "Trinidad And Tobago"
+msgstr "Trinitat I Tobago"
 
-#: src/plugins/notification/notification_prefs.c:1569
-msgid "Enable Trayicon"
-msgstr "Activar la icona de safata"
+#: src/plugins/geolocation/geolocation_plugin.c:742
+msgid "Tuvalu"
+msgstr "Tuvalu"
 
-#: src/plugins/notification/notification_prefs.c:1585
-msgid "Hide at start-up"
-msgstr "Ocultar a l'inici"
+#: src/plugins/geolocation/geolocation_plugin.c:743
+msgid "Taiwan, Province Of China"
+msgstr "Taiwan, Província De la Xina"
 
-#: src/plugins/notification/notification_prefs.c:1593
-msgid "Close to tray"
-msgstr "Tancar a la safata"
+#: src/plugins/geolocation/geolocation_plugin.c:744
+msgid "Tanzania, United Republic Of"
+msgstr "Tanzània, República Unida de"
 
-#: src/plugins/notification/notification_prefs.c:1601
-msgid "Hide when iconified"
-msgstr "Ocultar al iconificar"
+#: src/plugins/geolocation/geolocation_plugin.c:745
+msgid "Ukraine"
+msgstr "Ucraïna"
 
-#. TRANSLATORS: "Toaster" does not refer to the kitchen appliance.
-#. A toast is a small passive (non-focus-stealing)
-#. notification bubble. If your language does not have a word
-#. for that, go for something along the lines of "passive popup"
-#. instead.See also
-#. http://en.wikipedia.org/wiki/Toast_(computing)
-#: src/plugins/notification/notification_prefs.c:1638
-msgid "Passive toaster popup"
-msgstr "Avís emergent passiu"
+#: src/plugins/geolocation/geolocation_plugin.c:746
+msgid "Uganda"
+msgstr "Uganda"
 
-#: src/plugins/notification/notification_prefs.c:1865
-msgid "Add to Indicator Applet"
-msgstr "Afegir a un applet indicador"
+#: src/plugins/geolocation/geolocation_plugin.c:748
+msgid "United States Minor Outlying Islands"
+msgstr "Illes menors allunyades dels Estats Units"
 
-#: src/plugins/notification/notification_prefs.c:1879
-msgid "Hide mainwindow when minimized"
-msgstr "Ocultar la finestra principal quan es minimitzi"
+#: src/plugins/geolocation/geolocation_plugin.c:749
+msgid "United States"
+msgstr "Estats Units"
 
-#: src/plugins/notification/notification_prefs.c:1885
-msgid "Register Claws Mail"
-msgstr "Registrar Claws Mail"
+#: src/plugins/geolocation/geolocation_plugin.c:750
+msgid "Uruguay"
+msgstr "Uruguai"
 
-#: src/plugins/notification/notification_prefs.c:1946
-msgid "Enable global hotkeys"
-msgstr "Habilitar accessos directes per teclat globals"
+#: src/plugins/geolocation/geolocation_plugin.c:751
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
 
-#: src/plugins/notification/notification_prefs.c:1960
-#, c-format
-msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
-msgstr "Exemples per tecles d'accés ràpid inclouen <b>%s</b> i <b>%s</b>"
+#: src/plugins/geolocation/geolocation_plugin.c:752
+msgid "Holy See (Vatican City State)"
+msgstr "Santa Seu (Ciutat del Vaticà)"
 
-#: src/plugins/notification/notification_prefs.c:1960
-msgid "<control><shift>F11"
-msgstr "<control><shift>F11"
+#: src/plugins/geolocation/geolocation_plugin.c:753
+msgid "Saint Vincent And The Grenadines"
+msgstr "Saint Vincent i les Grenadines"
 
-#: src/plugins/notification/notification_prefs.c:1960
-msgid "<alt>N"
-msgstr "<alt>N"
+#: src/plugins/geolocation/geolocation_plugin.c:754
+msgid "Venezuela"
+msgstr "Veneçuela"
 
-#: src/plugins/notification/notification_prefs.c:1971
-msgid "Toggle minimize"
-msgstr "Commutar minimitzar"
+#: src/plugins/geolocation/geolocation_plugin.c:755
+msgid "Virgin Islands, British"
+msgstr "Illes Verges Britàniques"
 
-#: src/plugins/notification/notification_trayicon.c:114
-msgid "_Get Mail"
-msgstr "_Rebre Correu"
+#: src/plugins/geolocation/geolocation_plugin.c:756
+msgid "Virgin Islands, U.S."
+msgstr "Illes Verges dels Estats Units"
 
-#: src/plugins/notification/notification_trayicon.c:116
-msgid "_Email"
-msgstr "Corr_eu"
+#: src/plugins/geolocation/geolocation_plugin.c:757
+msgid "Viet Nam"
+msgstr "Vietnam"
 
-#: src/plugins/notification/notification_trayicon.c:117
-msgid "E_mail from account"
-msgstr "_Correu des del compte"
+#: src/plugins/geolocation/geolocation_plugin.c:758
+msgid "Vanuatu"
+msgstr "Vanuatu"
 
-#: src/plugins/notification/notification_trayicon.c:118
-msgid "Open A_ddressbook"
-msgstr "Obrir l'A_genda d'adreces"
+#: src/plugins/geolocation/geolocation_plugin.c:759
+msgid "Wallis And Futuna"
+msgstr "Wallis i Futuna"
 
-#: src/plugins/notification/notification_trayicon.c:119
-msgid "E_xit Claws Mail"
-msgstr "_Sortir de Claws Mail"
+#: src/plugins/geolocation/geolocation_plugin.c:760
+msgid "Samoa"
+msgstr "Samoa"
 
-#: src/plugins/notification/notification_trayicon.c:124
-msgid "_Work Offline"
-msgstr "_Treballar sense connexió"
+#: src/plugins/geolocation/geolocation_plugin.c:761
+msgid "Yemen"
+msgstr "Yémen"
 
-#: src/plugins/notification/notification_trayicon.c:126
-msgid "Show Trayicon Notifications"
-msgstr "Mostrar safata de notificacions"
+#: src/plugins/geolocation/geolocation_plugin.c:762
+msgid "Mayotte"
+msgstr "Maiòta"
 
-#: src/plugins/notification/notification_trayicon.c:269
-#, c-format
-msgid "New %d, Unread: %d, Total: %d"
-msgstr "Nous %d, No llegits: %d, Totals: %d"
+#: src/plugins/geolocation/geolocation_plugin.c:763
+msgid "Serbia And Montenegro"
+msgstr "Sèrbia i Montenegro"
 
-#: src/plugins/notification/notification_trayicon.c:816
-msgid "New mail message"
-msgstr "Nou missatge de correu"
+#: src/plugins/geolocation/geolocation_plugin.c:764
+msgid "South Africa"
+msgstr "Sud-àfrica"
 
-#: src/plugins/notification/notification_trayicon.c:818
-msgid "New news post"
-msgstr "Nou missatge de notícies"
+#: src/plugins/geolocation/geolocation_plugin.c:765
+msgid "Zambia"
+msgstr "Zàmbia"
 
-#: src/plugins/notification/notification_trayicon.c:820
-msgid "New calendar message"
-msgstr "Nou missatge de calendari"
+#: src/plugins/geolocation/geolocation_plugin.c:766
+msgid "Democratic Republic Of The Congo"
+msgstr "República Democràtica Del Congo"
 
-#: src/plugins/notification/notification_trayicon.c:822
-msgid "New article in RSS feed"
-msgstr "Nou article d'un feed RSS"
+#: src/plugins/geolocation/geolocation_plugin.c:767
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
 
-#: src/plugins/notification/notification_trayicon.c:825
-msgid "New messages arrived"
-msgstr "Ha arribat un nou missatge"
+#: src/plugins/geolocation/geolocation_plugin.c:777
+#: src/plugins/geolocation/geolocation_plugin.c:862
+msgid "GeoLocation"
+msgstr "Geolocalització"
 
-#: src/plugins/notification/notification_trayicon.c:881
-#, c-format
-msgid "%d new mail message arrived"
-msgid_plural "%d new mail messages arrived"
-msgstr[0] "Ha arribat %d missatge nou"
-msgstr[1] "Han arribat %d missatges nous"
+#: src/plugins/geolocation/geolocation_plugin.c:782
+msgid "Could not initialize clutter"
+msgstr "No s'ha pogut inicialitzar el corrector"
 
-#: src/plugins/notification/notification_trayicon.c:892
+#: src/plugins/geolocation/geolocation_plugin.c:788
+#: src/plugins/geolocation/geolocation_plugin.c:795
 #, c-format
-msgid "%d new news post arrived"
-msgid_plural "%d new news posts arrived"
-msgstr[0] "Ha arribat %d missatge de noticies nou"
-msgstr[1] "Han arribat %d missatges de noticies nous"
+msgid "Could not create regular expression: %s\n"
+msgstr "No s'ha pogut crear l'expressió regular: %s\n"
 
-#: src/plugins/notification/notification_trayicon.c:914
-#, c-format
-msgid "%d new article in RSS feeds arrived"
-msgid_plural "%d new articles in RSS feeds arrived"
-msgstr[0] "Ha arribat %d nou article de feeds RSS"
-msgstr[1] "Han arribat %d nous articles de feeds RSS"
+#: src/plugins/geolocation/geolocation_plugin.c:803
+msgid "Failed to register messageview_show hook in the GeoLocation plugin"
+msgstr ""
+"Ha fallat el registre de vi_sualitzacio de la vista del missatge en el "
+"connector de GeoLocalització"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:702
-msgid "Title:"
-msgstr "Títol:"
+#: src/plugins/geolocation/geolocation_plugin.c:867
+msgid ""
+"This plugin provides GeoLocation functionality for Claws Mail.\n"
+"\n"
+"Warning: It is technically impossible to derive the geographic location of "
+"senders from their E-Mails with any amount of certainty. The results "
+"presented by this plugin are only rough estimates. In particular, mailing "
+"list managers often strip sender information from the mails, so mails from "
+"mailing lists may be assigned to the location of the mailing list server "
+"instead of the mail sender.\n"
+"When in doubt, don't trust the results of this plugin, and don't rely on "
+"this information to divorce your spouse.\n"
+"\n"
+"Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
+"quarrels)."
+msgstr ""
+"Aquest connector proporciona la funcionalitat de geolocalització per Claws "
+"Mail.\n"
+"\n"
+"Atenció: És tècnicament impossible derivar la ubicació geogràfica dels "
+"remitents dels correus electrònics amb qualsevol quantitat de certesa. Els "
+"resultats presentats per aquest connector són només estimacions aproximades. "
+"En particular, els administradors de la llista de correu sovint despullen "
+"informació del remitent dels correus, per la qual les llistes de correu "
+"poden ser assignades enlloc del remitent del correu.\n"
+"En cas de dubte, no confien en els resultats d'aquest connector, i no "
+"confiar en aquesta informació per divorciar-se de la seva cònjuge.\n"
+"\n"
+"La teva opinió és benvinguda a <berndth at gmx.de> (però només si no es tracta "
+"de baralles conjugals)."
+
+#: src/plugins/geolocation/geolocation_plugin.c:900
+msgid "GeoLocation integration"
+msgstr "Integració per Geolocalització"
+
+#: src/plugins/libravatar/libravatar.c:360
+#: src/plugins/libravatar/libravatar.c:431
+#: src/plugins/libravatar/libravatar.c:491
+#: src/plugins/libravatar/libravatar_prefs.c:546
+msgid "Libravatar"
+msgstr "Libravatar"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
-msgid "Author:"
-msgstr "Autor:"
+#: src/plugins/libravatar/libravatar.c:367
+msgid "Failed to register avatar header update hook"
+msgstr "Ha fallat el registre del ganxo per actualitzar la capçalera d'avatar"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
-msgid "Creator:"
-msgstr "Creador:"
+#: src/plugins/libravatar/libravatar.c:375
+msgid "Failed to register avatar image render hook"
+msgstr "Ha fallat el registre del ganxo per renderitzar imatges d'avatars"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:707
-msgid "Producer:"
-msgstr "Generador:"
+#: src/plugins/libravatar/libravatar.c:380
+msgid "Failed to create avatar image cache directory"
+msgstr "No s'ha pogut crear el directori per la memòria cau d'imatges d'avatar"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:710
-msgid "Created:"
-msgstr "Creat:"
+#: src/plugins/libravatar/libravatar.c:389
+msgid "Failed to load missing items cache"
+msgstr "A fallat la carrega dels elements de la memòria cau."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:714
-msgid "Modified:"
-msgstr "Modificat"
+#: src/plugins/libravatar/libravatar.c:441
+msgid ""
+"Display libravatar profiles' images for mail messages. More\n"
+"info about libravatar at http://www.libravatar.org/. If you have\n"
+"a gravatar.com profile but not a libravatar one, those will also\n"
+"be retrieved (when redirections are allowed in plugin config).\n"
+"Plugin config page is available from main window at:\n"
+"/Configuration/Preferences/Plugins/Libravatar.\n"
+"\n"
+"This plugin uses libcurl to retrieve images, so if you're behind a\n"
+"proxy please refer to curl(1) manpage for details on 'http_proxy'\n"
+"configuration. More details about this and others on README file.\n"
+"\n"
+"Feedback to <ricardo at mones.org> is welcome.\n"
+msgstr ""
+"Mostrar imatges de perfils libravatar per als missatges de correu. Més\n"
+"informació sobre libravatar en http://www.libravatar.org/. Si vostè té\n"
+"un perfil gravatar.com però no una libravatar, els farà també\n"
+"recuperar (quan es permeti redireccions en la configuració del connector) .\n"
+"La pàgina de configuració del connector està disponible des de la finestra "
+"principal en:\n"
+"/Configuració/Preferències/Connectors/Libravatar.\n"
+"\n"
+"Aquest plugin utilitza libcurl per recuperar imatges, així que si estàs "
+"darrere d'un\n"
+"Proxy consulti la pàgina curl(1) del manual per a més detalls sobre la "
+"configuració\n"
+"de 'http_proxy'. Més detalls sobre aquest i altres a l'arxiu README .\n"
+"\n"
+"La teva opinió és benvinguda a <ricardo at mones.org>.\n"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:717
-msgid "Format:"
-msgstr "Format:"
+#: src/plugins/libravatar/libravatar_prefs.c:137
+msgid "<span color=\"red\">Error reading cache stats</span>"
+msgstr ""
+"<span color=\"red\">Error en la lectura d'estadístiques de memòria cau</span>"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:719
-#: src/plugins/pdf_viewer/poppler_viewer.c:722
-msgid "Optimized:"
-msgstr "Optimitzat:"
+#: src/plugins/libravatar/libravatar_prefs.c:141
+#, c-format
+msgid ""
+"<span color=\"red\">Using %s in %d files, %d directories, %d others and %d "
+"errors</span>"
+msgstr ""
+"<span color=\"red\">Utilitzant %s a %d fitxers,%d  directoris, %d altres i "
+"%d errors</span>"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1180
-msgid "PDF properties"
-msgstr "Propietats del PDF"
+#: src/plugins/libravatar/libravatar_prefs.c:150
+#, c-format
+msgid "Using %s in %d files, %d directories and %d others"
+msgstr "Utilitzant %s a %d fitxers,%d  directoris i %d altres"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1329
-#, fuzzy
-msgid "Enter password"
-msgstr "Introduiu contrasenya"
+#: src/plugins/libravatar/libravatar_prefs.c:164
+msgid "Clear icon cache"
+msgstr "Netejar memòria d'avatars"
+
+#: src/plugins/libravatar/libravatar_prefs.c:165
+msgid "Are you sure you want to remove all cached avatar icons?"
+msgstr "Realment vols suprimir tota la memòria cau d'avatars?"
+
+#: src/plugins/libravatar/libravatar_prefs.c:178
+msgid "Not enough memory for operation"
+msgstr "No hi ha prou memòria per a operar"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1330
+#: src/plugins/libravatar/libravatar_prefs.c:183
+#, c-format
 msgid ""
-"This document is locked and requires a password before it can be opened."
+"Icon cache successfully cleared:\n"
+"• %u missing entries removed.\n"
+"• %u files removed."
 msgstr ""
+"Esborrada correctament la memòria cau d'avatarst:\n"
+"• %u entrades perdudes esborrades.\n"
+"• %u fitxers esborrats."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1345
-#, c-format
-msgid "%s Document"
-msgstr "%s Document"
+#: src/plugins/libravatar/libravatar_prefs.c:188
+msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
+msgstr ""
+"<span color=\"#006400\">S'ha esborrat correctament la memòria cau d'avatars!"
+"</span>"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1351
+#: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
-msgid "of %d"
-msgstr "de %d"
+msgid ""
+"Errors clearing icon cache:\n"
+"• %u missing entries removed.\n"
+"• %u files removed.\n"
+"• %u files failed to be read.\n"
+"• %u files couldn't be removed."
+msgstr ""
+"Errors al esborrar la memòria cau d'avatars:\n"
+"• %u entrades perdudes esborrades.\n"
+"• %u fitxers esborrats.\n"
+"• %u fitxers que no es poden llegir.\n"
+"• %u fitxers que no es poden esborrar."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1368
-msgid "PDF rendering failed for an unknown reason."
-msgstr "La visualtizació del PDF ha fallar per un motiu desconegut."
+#: src/plugins/libravatar/libravatar_prefs.c:198
+msgid "<span color=\"red\">Error clearing icon cache.</span>"
+msgstr "<span color=\"red\">Error al esborrar la memòria cau d'avatars.</span>"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1732
-#: src/plugins/pdf_viewer/poppler_viewer.c:1950
-msgid "Document Index"
-msgstr "Índex del Document"
+#: src/plugins/libravatar/libravatar_prefs.c:213
+msgid "_Use cached icons"
+msgstr "_Utilitza icones de la memòria cau"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
-msgid "First Page"
-msgstr "Primera pàgina"
+#: src/plugins/libravatar/libravatar_prefs.c:214
+msgid ""
+"Keep icons on disk for reusing instead of making another network request"
+msgstr ""
+"Mantenir icones en disc per reciclar en lloc de fer una altra sol·licitud de "
+"la xarxa"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
-msgid "Previous Page"
-msgstr "Pàgina anterior"
+#: src/plugins/libravatar/libravatar_prefs.c:229
+msgid "Cache refresh interval"
+msgstr "Interval d'actualització de la memòria cau"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
-msgid "Next Page"
-msgstr "Pàgina següent"
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1486
+#: src/prefs_matcher.c:335
+msgid "hours"
+msgstr "hores"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
-msgid "Last Page"
-msgstr "Última pàgina"
+#: src/plugins/libravatar/libravatar_prefs.c:305
+msgid "Mystery man"
+msgstr "Home misteri"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
-msgid "Zoom In"
-msgstr "Augmentar"
+#: src/plugins/libravatar/libravatar_prefs.c:306
+msgid "Identicon"
+msgstr "Icona d'identificació"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1932
-msgid "Zoom Out"
-msgstr "Disminuir"
+#: src/plugins/libravatar/libravatar_prefs.c:307
+msgid "MonsterID"
+msgstr "MonsterID"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1935
-msgid "Fit Page"
-msgstr "Ajustar pàgina"
+#: src/plugins/libravatar/libravatar_prefs.c:308
+msgid "Wavatar"
+msgstr "Wavatar"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1938
-msgid "Fit Page Width"
-msgstr "Ajustar l'ample de pàgina"
+#: src/plugins/libravatar/libravatar_prefs.c:309
+msgid "Retro"
+msgstr "Retro"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1941
-msgid "Rotate Left"
-msgstr "Rotar a l'esquerra"
+#: src/plugins/libravatar/libravatar_prefs.c:310
+msgid "Custom URL"
+msgstr "URL personalitzada"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1944
-msgid "Rotate Right"
-msgstr "Rotar a la dreta"
+#: src/plugins/libravatar/libravatar_prefs.c:313
+msgid "A blank image"
+msgstr "Imatge en blanc"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
-msgid "Document Info"
-msgstr "Informació del Document"
+#: src/plugins/libravatar/libravatar_prefs.c:314
+msgid "The unobtrusive low-contrast greyish silhouette"
+msgstr "La discreta silueta grisenca amb poc contrast"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1952
-msgid "Page Number"
-msgstr "Número de Pàgina"
+#: src/plugins/libravatar/libravatar_prefs.c:315
+msgid "A generated geometric pattern"
+msgstr "Un patró geometric generat."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1954
-msgid "Zoom Factor"
-msgstr "Factor d'augment"
+#: src/plugins/libravatar/libravatar_prefs.c:316
+msgid "A generated full-body monster"
+msgstr "Un monstre de cos complet generat"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2059
-#, c-format
-msgid ""
-"This plugin enables the viewing of PDF and PostScript attachments using the "
-"Poppler %s Lib and the gs tool.\n"
-"\n"
-"Any feedback is welcome: iwkse at claws-mail.org"
-msgstr ""
-"Aquest mòdul permet veure adjunts en format PDF i PostScript usant la "
-"illibreria Poppler %s i l'eina gs.\n"
-"\n"
-"Qualsevol sugeriment serà benvingut: iwkse at claws-mail.org"
+#: src/plugins/libravatar/libravatar_prefs.c:317
+msgid "A generated almost unique face"
+msgstr "Una cara generada gairabè ùnica."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2065
-#: src/plugins/pdf_viewer/poppler_viewer.c:2073
-#: src/plugins/pdf_viewer/poppler_viewer.c:2093
-msgid "PDF Viewer"
-msgstr "Visor de PDFs"
+#: src/plugins/libravatar/libravatar_prefs.c:318
+msgid "A generated 8-bit arcade-style pixelated image"
+msgstr "Una imatge d'8-bits pixelada d'estil arcade."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2069
-#, c-format
+#: src/plugins/libravatar/libravatar_prefs.c:319
+msgid "Redirect to a user provided URL"
+msgstr "Redirecció a una URL introduïda per l'usuari"
+
+#: src/plugins/libravatar/libravatar_prefs.c:333
 msgid ""
-"Warning: could not find ghostscript binary (gs) required for %s plugin to "
-"process PostScript attachments, only PDF attachments will be displayed. To "
-"enable PostScript support please install gs program.\n"
-"\n"
-"%s"
+"Enter the URL you want to be redirected when no user icon is available. "
+"Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
-"Advertència: no s'ha pogut trobar el binàri ghostscript (gs) requerit per el "
-"connector %s per processar arxius adjunts PostScript, es mostrarà només els "
-"arxius adjunts PDF. Per habilitar el suport PostScript instal el programa "
-"gs.\n"
-"\n"
-"\n"
-"%s"
+"Introdueïx l'URL on vols fer redirigir quan cap icona de l'usuari estigui "
+"disponible. Deixar una URL buida per usar l'icona libravatar taronja per "
+"defecte."
 
-#: src/plugins/perl/perl_gtk.c:50
-msgid "Edit perl filter rules (ext)..."
-msgstr "Editar les regles de filtres perl (ext)..."
+#: src/plugins/libravatar/libravatar_prefs.c:382
+msgid "_Allow redirects to other sites"
+msgstr "Permet redireccions a _altres llocs"
 
-#: src/plugins/pgpcore/autocompletion.c:133
-msgid "Failed to register PGP address autocompletion hook"
+#: src/plugins/libravatar/libravatar_prefs.c:383
+msgid ""
+"Follow redirect responses received from libravatar server to other avatar "
+"services like gravatar.com"
 msgstr ""
-"Ha fallat el registre del ganxo per completació automàtica d'adreces PGP"
-
-#: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:127
-msgid "Passphrase"
-msgstr "Frase de pas"
+"Segueix les respostes amb redirecció del servidor de libravatar cap a un "
+"altre servei d'avatars com gravatar.com"
 
-#: src/plugins/pgpcore/passphrase.c:249
-msgid "[no user id]"
-msgstr "[sense id d'usuari]"
+#: src/plugins/libravatar/libravatar_prefs.c:392
+msgid "_Enable federated servers"
+msgstr "Activa servidors f_ederats"
 
-#: src/plugins/pgpcore/passphrase.c:261
-#, fuzzy
-msgid "Please enter the passphrase for the new key:"
+#: src/plugins/libravatar/libravatar_prefs.c:393
+msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sSi us plau, escriviu la frase de pas "
-"per a la nova clau: </span>\n"
-"\n"
-"%.*s\n"
+"Tractar d'aconseguir l'avatar del servidor de libravatar de domini del "
+"remitent"
 
-#: src/plugins/pgpcore/passphrase.c:264
-msgid "Passphrases did not match.\n"
-msgstr "La frase de pas no coincideix.\n"
+#: src/plugins/libravatar/libravatar_prefs.c:410
+msgid "Request timeout"
+msgstr "Temps d'espera de la petició"
 
-#: src/plugins/pgpcore/passphrase.c:268
-#, fuzzy
-msgid "Please re-enter the passphrase for the new key:"
+#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
+#: src/prefs_summaries.c:496
+msgid "seconds"
+msgstr "segons"
+
+#: src/plugins/libravatar/libravatar_prefs.c:411
+msgid ""
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Si us plau, re-escriviu la frase de "
-"pas per a la nova clau: </span>\n"
-"\n"
-"%.*s\n"
+"Fes server un 0 per l'utilització de temps d'espera de sòcols I/O globals. "
+"El valor màxim ha de ser també menor que el temps d'espera de sòcols I/O "
+"globals."
 
-#: src/plugins/pgpcore/passphrase.c:273
-#, fuzzy
-msgid "Please enter the passphrase for:"
-msgstr "Ompliu el nom de la bústia."
+#: src/plugins/libravatar/libravatar_prefs.c:455
+msgid "Icon cache"
+msgstr "Memòria cau d'icones"
 
-#: src/plugins/pgpcore/passphrase.c:276
-msgid "Bad passphrase.\n"
-msgstr "Paraula de pas errònia\n"
+#: src/plugins/libravatar/libravatar_prefs.c:459
+msgid "Default missing icon mode"
+msgstr "No s'ha trobat el mode d'icona per defecte"
 
-#: src/plugins/pgpcore/pgp_viewer.c:121
-msgid "Key import"
-msgstr "Importar clau"
+#: src/plugins/libravatar/libravatar_prefs.c:463
+msgid "Network"
+msgstr "Xarxa"
 
-#: src/plugins/pgpcore/pgp_viewer.c:122
-msgid ""
-"This key is not in your keyring. Do you want Claws Mail to try and import it "
-"from a keyserver?"
-msgstr ""
-"Aquesta clau no és al vostre anell de claus. Vols que Claws Mail intenti "
-"importar-la desde un servidor de claus?"
+#: src/plugins/mailmbox/plugin.c:58
+msgid "mailmbox folder (etPan!)"
+msgstr "carpeta de bùstia de correu (etPan!)"
 
-#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:201
-msgid ""
-"\n"
-"  Key ID "
+#: src/plugins/mailmbox/plugin.c:63
+msgid "This is a plugin to handle mailboxes in mbox format."
 msgstr ""
-"\n"
-"  ID tecla"
+"Aquest es un connector per gestionar les bùsties de correu amb format mbox."
 
-#: src/plugins/pgpcore/pgp_viewer.c:132 src/plugins/pgpcore/pgp_viewer.c:194
-msgid "   This key is not in your keyring.\n"
-msgstr "   Aquesta clau no és al vostre anell de claus.\n"
+#: src/plugins/mailmbox/plugin.c:84
+msgid "MBOX"
+msgstr "MBOX"
 
-#: src/plugins/pgpcore/pgp_viewer.c:133
-msgid "   It should be possible to import it "
-msgstr "   Hauria de ser possible importar-la"
+#: src/plugins/mailmbox/plugin_gtk.c:86
+msgid "mbox (etPan!)..."
+msgstr "mbox (etPan!)..."
 
-#: src/plugins/pgpcore/pgp_viewer.c:135
+#: src/plugins/mailmbox/plugin_gtk.c:190
 msgid ""
-"when working online,\n"
-"   or "
+"Input the location of mailbox.\n"
+"If the existing mailbox is specified, it will be\n"
+"scanned automatically."
 msgstr ""
-"mentre treballeu amb connexió,\n"
-"   o "
+"Introduiu la localització de la bústia.\n"
+"Si la bústia existent és especificada, serà\n"
+"escaneajada automàticament."
 
-#: src/plugins/pgpcore/pgp_viewer.c:136
+#: src/plugins/mailmbox/plugin_gtk.c:331
+#, c-format
 msgid ""
-"with the following command: \n"
-"\n"
-"     "
+"All folder(s) and message(s) under '%s' will be deleted.\n"
+"Do you really want to delete?"
 msgstr ""
-"amb la següent comanda: \n"
-"\n"
-"     "
+"S'esborraran totes les carpetes i missatges que penjen de '%s'.\n"
+"Realment vols esborrar-los?"
 
-#: src/plugins/pgpcore/pgp_viewer.c:143
-msgid ""
-"\n"
-"  Importing key ID "
-msgstr ""
-"\n"
-"  Important l'ID de la clau "
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr "No hi ha cap mètode d'autenticació Sieve disponible\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:186
-msgid "   This key has been imported to your keyring.\n"
-msgstr "   Aquesta clau ha estat importada al vostre anell de claus.\n"
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr "El mètode Sieve seleccionat no està disponible\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:188
-msgid "   This key couldn't be imported to your keyring.\n"
-msgstr "   Aquesta clau no ha pogut ser importada al vostre anell de claus.\n"
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr "Desconnectat"
 
-#: src/plugins/pgpcore/pgp_viewer.c:189
-msgid "   Key servers are sometimes slow.\n"
-msgstr "   Els servidors de claus a veagdes van lents.\n"
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr "Desconnectat: %s"
 
-#: src/plugins/pgpcore/pgp_viewer.c:190
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Podeu intentar importar-lo manualment amb la comanda:\n"
-"\n"
-"     "
+#: src/plugins/managesieve/managesieve.c:570
+#: src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr "missatge desconegut en la sessió Sieve: %s\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:195
-msgid "   Key import isn't implemented in Windows.\n"
-msgstr "   Importar claus no és implementat a Windows.\n"
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr "TLS ha fallat"
 
-#: src/plugins/pgpcore/pgp_viewer.c:204
-msgid "   This key is in your keyring.\n"
-msgstr "   Aquesta clau és al vostre anell de claus.\n"
+#: src/plugins/managesieve/managesieve.c:651
+#: src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr "hi ha hagut un error en la sessió Sieve\n"
 
-#: src/plugins/pgpcore/plugin.c:37
-msgid "PGP/Core"
-msgstr "PGP/Core"
+#: src/plugins/managesieve/managesieve.c:725
+#, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "hi ha hagut un error en la sessió Sieve. dades: %s\n"
 
-#: src/plugins/pgpcore/plugin.c:71
-msgid ""
-"This plugin handles PGP core operations and provides address autocompletion "
-"from the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
-"\n"
-"Options can be found in /Configuration/Preferences/Plugins/GPG and /"
-"Configuration/[Account Preferences]/Plugins/GPG\n"
-"\n"
-"The plugin uses the GPGME library as a wrapper for GnuPG.\n"
-"\n"
-"GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
-msgstr ""
-"Aquest mòdul gestiona les operacions bàsiques PGP i completació automàtica "
-"d'adreces, és usat per altres mòduls, com PGP/Mime.\n"
-"\n"
-"Podeu trobar les opcions a /Configuració/Preferencies/Connectors/GPG i /"
-"Configuració/[Preferències de Compte]/Connectors/GPG\n"
-"\n"
-"El connector usa la llibreria GPGME com a encapsulació de GnuPG.\n"
-"\n"
-"GPGME és copyright 2001 per Werner Koch <dd9jn at gnu.org>"
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr "missatge desconegut en la sessió Sieve: %d\n"
 
-#: src/plugins/pgpcore/plugin.c:101
-msgid "Core operations"
-msgstr "Operacions principals"
+#: src/plugins/managesieve/managesieve.c:930
+msgid "Sieve: retrying auth\n"
+msgstr "Sieve: s'està reintentant autentifiació\n"
 
-#: src/plugins/pgpcore/prefs_gpg.c:122
-msgid "Automatically check signatures"
-msgstr "Verificar signatures automàticament"
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr "Mètode d'autenticació no disponible"
 
-#: src/plugins/pgpcore/prefs_gpg.c:125
-msgid "Use keyring for address autocompletion"
-msgstr "Utilitza l'anell de claus per la compleció automàtica d'adreces"
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_Filtre"
 
-#: src/plugins/pgpcore/prefs_gpg.c:130
-msgid "Use gpg-agent to manage passwords"
-msgstr "Useu gpg-agent per treballar amb passwords"
+#: src/plugins/managesieve/sieve_editor.c:84
+#: src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr "Comprovar la sinta_xi"
 
-#: src/plugins/pgpcore/prefs_gpg.c:135
-msgid "Store passphrase in memory"
-msgstr "Emmagatzemeu la frase de pas en memòria"
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr "Des_fer"
 
-#: src/plugins/pgpcore/prefs_gpg.c:145
-msgid "Expire after"
-msgstr "Caduca després de"
+#: src/plugins/managesieve/sieve_editor.c:282
+#: src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr "Incapaç d'aconseguir el contingut de la seqüència d'ordres"
 
-#: src/plugins/pgpcore/prefs_gpg.c:159
-msgid "Setting to '0' will store the passphrase for the whole session"
-msgstr "Establint-lo a '0' guarda la frase de pas durant tota la sessió"
-
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
-msgid "minute(s)"
-msgstr "minut(s)"
-
-#: src/plugins/pgpcore/prefs_gpg.c:173
-msgid "Grab input while entering a passphrase"
-msgstr "Capturar l'entrada al introduïr la frase de pas"
-
-#: src/plugins/pgpcore/prefs_gpg.c:180
-msgid "Display warning on start-up if GnuPG doesn't work"
-msgstr "Mostrar un avís a l'inici si GnuPG no funciona"
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr "Desfent..."
 
-#: src/plugins/pgpcore/prefs_gpg.c:183
-#, fuzzy
-msgid "Path to GnuPG executable"
-msgstr "Ruta de l'executable de bsfilter"
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr "Desfer la seqüència d'ordres"
 
-#: src/plugins/pgpcore/prefs_gpg.c:188
-msgid ""
-"If left blank the location of the GnuPG executable will be automatically "
-"determined."
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
 msgstr ""
+"Aquesta seqüència d'ordres s'ha modificat. Vols desfer els canvis no desats?"
 
-#: src/plugins/pgpcore/prefs_gpg.c:229
-msgid "Select GnuPG executable"
-msgstr ""
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr "Desfe_r"
 
-#: src/plugins/pgpcore/prefs_gpg.c:353
-msgid "Sign key"
-msgstr "Clau per signar"
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr "Seqüències d'ordres guardat satisfactòriament."
 
-#: src/plugins/pgpcore/prefs_gpg.c:361
-msgid "Use default GnuPG key"
-msgstr "Useu la clau GnuPG per omissió"
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr "Desant…"
 
-#: src/plugins/pgpcore/prefs_gpg.c:372
-msgid "Select key by your email address"
-msgstr "Seleccioneu la clau en base a l'adreça de correu"
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr "Comprovant la sintaxi..."
 
-#: src/plugins/pgpcore/prefs_gpg.c:383
-msgid "Specify key manually"
-msgstr "Especifiqueu la clau manualment"
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr ""
+"Aquesta seqüència d'ordres s'ha modificat. Vols desar els últims canvis?"
 
-#: src/plugins/pgpcore/prefs_gpg.c:393
-msgid "User or key ID:"
-msgstr "Usuari o ID de clau:"
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr "+De_sar"
 
-#: src/plugins/pgpcore/prefs_gpg.c:434
-msgid "No secret key found."
-msgstr "No s'ha trobat cap clau secreta."
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr "%s - filtre Sieve %s"
 
-#: src/plugins/pgpcore/prefs_gpg.c:437
-msgid "Generate a new key pair"
-msgstr "Generar un nou parell de claus"
+#: src/plugins/managesieve/sieve_manager.c:156
+#: src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr "Afegir seqüència d'ordres Sieve"
 
-#: src/plugins/pgpcore/prefs_gpg.c:615
-msgid "GPG"
-msgstr "GPG"
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr "Introduïu un nom per la nova seqüència d'ordres Sieve."
 
-#: src/plugins/pgpcore/select-keys.c:95
-#, c-format
-msgid "No exact match for '%s'; please select the key."
-msgstr "No casa exactament per '%s'; si us plau seleccioneu la clau."
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr "Introduïu un nom nou per la seqüència d'ordres."
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/managesieve/sieve_manager.c:338
 #, c-format
-msgid "Collecting info for '%s' ... %c"
-msgstr "Recollint info per '%s' ... %c"
-
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:141
-msgid "Undefined"
-msgstr "Indefinida"
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "Realment vols esborrar el filtre  '%s'?"
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:145
-#: src/plugins/pgpcore/sgpgme.c:161
-msgid "Marginal"
-msgstr "Marginal"
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "Esborrar el filtre"
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:149
-#: src/plugins/pgpcore/sgpgme.c:165
-msgid "Ultimate"
-msgstr "Final"
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "Actiu"
 
-#: src/plugins/pgpcore/select-keys.c:368
-msgid "Select Keys"
-msgstr "Seleccioneu tecles"
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr "Un compte només pot tenir una seqüència d'ordres activa alhora."
 
-#: src/plugins/pgpcore/select-keys.c:395
-msgid "Key ID"
-msgstr "ID tecla"
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr "Incapaç de connectar"
 
-#: src/plugins/pgpcore/select-keys.c:398
-msgid "Trust"
-msgstr "Confiança"
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr "Llista de seqüències d'ordres..."
 
-#: src/plugins/pgpcore/select-keys.c:423
-msgid "_Other"
-msgstr "_Altres"
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr "Connectant ..."
 
-#: src/plugins/pgpcore/select-keys.c:424
-msgid "Do_n't encrypt"
-msgstr "_No encriptar"
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr "Administra filtres Sieve"
 
-#: src/plugins/pgpcore/select-keys.c:583
-msgid "Add key"
-msgstr "Afegir clau"
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr "Per utilitzar Sieve, permetre'l en les preferències d'un compte."
 
-#: src/plugins/pgpcore/select-keys.c:584
-msgid "Enter another user or key ID:"
-msgstr "Entreu un altre usuari o clau ID:"
+#: src/plugins/managesieve/sieve_plugin.c:35
+#: src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr "ManageSieve"
 
-#: src/plugins/pgpcore/select-keys.c:606
-#, c-format
-msgid "Encrypt to %s <%s>"
-msgstr "Encriptat a %s <%s>"
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr "Administra filtres Sieve..."
 
-#: src/plugins/pgpcore/select-keys.c:607
-#, fuzzy, c-format
-msgid ""
-"This encryption key is not fully trusted.\n"
-"If you choose to encrypt the message with this key, you don't\n"
-"know for sure that it will go to the person you mean it to.\n"
-"\n"
-"Key details: ID %s, primary identity %s <%s>\n"
-"\n"
-"Do you trust this key enough to use it anyway?"
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr ""
-"La clau d'encriptació no es totalment de confiança.\n"
-"Si escolliu d'encriptar el missatge amb aquesta clau no podreu\n"
-"assegurar-vos de que aniría la persona que creieu que va.\n"
-"Detalls de la clau: ID %s, identitat primària %s <%s>\n"
-"\n"
-"Hi confieu lo suficient com per usar-la de totes maneres?"
+"Administra filtres Sieve en un servidor utilitzant el protocol ManageSieve."
 
-#: src/plugins/pgpcore/sgpgme.c:79 src/privacy.c:249 src/privacy.c:253
-#: src/privacy.c:270 src/privacy.c:274
-msgid "No signature found"
-msgstr "No s'ha trobat signatura"
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr "Activar Sieve"
 
-#: src/plugins/pgpcore/sgpgme.c:159
-msgid "Untrusted"
-msgstr "Desconfiat"
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "Informació del servidor"
 
-#: src/plugins/pgpcore/sgpgme.c:199 src/plugins/pgpcore/sgpgme.c:218
-#, c-format
-msgid "The signature can't be checked - %s"
-msgstr "La signatura no pot ser comprovada - %s"
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "Nom del servidor"
 
-#: src/plugins/pgpcore/sgpgme.c:203 src/plugins/pgpcore/sgpgme.c:207
-msgid "The signature has not been checked."
-msgstr "La signatura no ha estat comprovada"
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr ""
+"Connectar-se a aquest servidor en comptes del servidor utilitzat per rebre "
+"correu"
 
-#: src/plugins/pgpcore/sgpgme.c:213
-msgid "PGP Core: Can't get key - no gpg-agent running."
-msgstr "Nucli PGP: no es pot obtenir la clau - gpg-agent no s'està executant."
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "Port del servidor"
 
-#: src/plugins/pgpcore/sgpgme.c:231
-#, c-format
-msgid "Good signature from \"%s\" [ultimate]"
-msgstr "Signatura correcte de \"%s\" [definitiu]"
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr "Connectar-se a aquest port en comptes de al predeterminat"
 
-#: src/plugins/pgpcore/sgpgme.c:234
-#, c-format
-msgid "Good signature from \"%s\" [full]"
-msgstr "Signatura correcte de \"%s\" [ple]"
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "Xifratge"
 
-#: src/plugins/pgpcore/sgpgme.c:237
-#, c-format
-msgid "Good signature from \"%s\" [marginal]"
-msgstr "Signatura correcte de \"%s\" [insignificant]"
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "Sense TLS"
 
-#: src/plugins/pgpcore/sgpgme.c:244
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Signatura correcte de \"%s\""
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "Utilitzar TLS quan estigui disponible"
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "No s'ha trobat la clau 'x%s per verificar aquesta signatura"
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr "Requereix TLS"
 
-#: src/plugins/pgpcore/sgpgme.c:254
-#, c-format
-msgid "Expired signature from \"%s\""
-msgstr "Signatura expirada de \"%s\""
+#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "Sense autentificació"
 
-#: src/plugins/pgpcore/sgpgme.c:257
-#, c-format
-msgid "Good signature from \"%s\", but the key has expired"
-msgstr "Signatura correcte de \"%s\", però la Clau a expirat"
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr "Utilitzeu la mateixa autenticació que per rebre correu"
 
-#: src/plugins/pgpcore/sgpgme.c:260
-#, c-format
-msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "Signatura correcte de \"%s\", però la Clau ha sigut revocada"
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr "Especifiqueu l'autenticació"
 
-#: src/plugins/pgpcore/sgpgme.c:263
-#, c-format
-msgid "Bad signature from \"%s\""
-msgstr "Signatura dolenta de \"%s\""
+#: src/plugins/managesieve/sieve_prefs.c:225
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
+msgid "User ID"
+msgstr "ID d'usuari"
 
-#: src/plugins/pgpcore/sgpgme.c:272
-msgid "The signature has not been checked"
-msgstr "La signatura no ha sigut validada"
+#: src/plugins/managesieve/sieve_prefs.c:235
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "Contrasenya"
 
-#: src/plugins/pgpcore/sgpgme.c:291
-msgid "Error checking signature: no status\n"
-msgstr "Error comprovant la signatura: sense estat\n"
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "Mètode d'autentificació"
 
-#: src/plugins/pgpcore/sgpgme.c:309
-#, c-format
-msgid "Error checking signature: %s\n"
-msgstr "Error comprovant la signatura: %s\n"
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
+msgid "Automatic"
+msgstr "Automàtic"
 
-#: src/plugins/pgpcore/sgpgme.c:327
-#, c-format
-msgid "Signature made on %s using %s key ID %s\n"
-msgstr "Signatura realitzada el %s usant %s ID de clau %s\n"
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr "El servidor de Sieve no pot contenir un espai."
 
-#: src/plugins/pgpcore/sgpgme.c:333
-#, c-format
-msgid "Good signature from uid \"%s\" (Validity: %s)\n"
-msgstr "Signatura vàlida des de l'uid \"%s\" (Validesa: %s)\n"
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr "No s'ha especificat el servidor Sieve."
 
-#: src/plugins/pgpcore/sgpgme.c:338
-#, c-format
-msgid "Expired key uid \"%s\"\n"
-msgstr "Expirada l'uid de la clau \"%s\"\n"
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr "Sieve"
 
-#: src/plugins/pgpcore/sgpgme.c:343
-#, c-format
-msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
-msgstr "Signatura caducada des de l'uid \"%s\" (Validesa: %s)\n"
+#: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
+msgid "NewMail"
+msgstr "Nou Correu"
 
-#: src/plugins/pgpcore/sgpgme.c:348
-#, c-format
-msgid "Revoked key uid \"%s\"\n"
-msgstr "Revocada uid de la Clau \"%s\"\n"
+#: src/plugins/newmail/newmail.c:115
+msgid "Failed to register newmail hook"
+msgstr "Ha fallat el registre del ganxo per nous correus"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/newmail/newmail.c:132
 #, c-format
-msgid "BAD signature from \"%s\"\n"
-msgstr "Signatura INVÀLIDA de \"%s\"\n"
-
-#: src/plugins/pgpcore/sgpgme.c:366
-#, fuzzy, c-format
-msgid "uid \"%s\" (Validity: %s)\n"
-msgstr "Signatura vàlida des de l'uid \"%s\" (Validesa: %s)\n"
+msgid "Could not open log file %s: %s\n"
+msgstr "No s'ha pogut obrir el fitxer de traça %s: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
-msgid "Revoked"
-msgstr "Revocada"
-
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/newmail/newmail.c:145
 #, c-format
-msgid "Owner Trust: %s\n"
-msgstr "Confiança de propietari: %s\n"
-
-#: src/plugins/pgpcore/sgpgme.c:374
-msgid "No key!"
+msgid ""
+"This plugin writes a header summary to a log file for each mail received "
+"after sorting.\n"
+"\n"
+"Default is ~/Mail/NewLog\n"
+"\n"
+"Current log is %s"
 msgstr ""
+"Aquest plugin escriu un resum de les capçaleres en un fitxer de traça per a "
+"cada correu rebut després de la classificació.\n"
+"\n"
+"Per defecte ès ~/Mail/NewLog\n"
+"\n"
+"La traça actual ès %s"
 
-#: src/plugins/pgpcore/sgpgme.c:376
-msgid "Primary key fingerprint:"
-msgstr "Empremta digital de clau primària:"
-
-#: src/plugins/pgpcore/sgpgme.c:394
-#, c-format
-msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
-msgstr "AVÍS: l'adreça del signant «%s» no coincideix amb l'entrada DNS\n"
+#: src/plugins/newmail/newmail.c:179
+msgid "Log file"
+msgstr "Fitxer de traça"
 
-#: src/plugins/pgpcore/sgpgme.c:400
-#, c-format
-msgid "Verified signer's address is \"%s\"\n"
-msgstr "L'adreça verificada del signant és «%s»\n"
+#: src/plugins/notification/notification_banner.c:356
+msgid "Folder:"
+msgstr "Carpeta:"
 
-#: src/plugins/pgpcore/sgpgme.c:434
-#, c-format
-msgid "Couldn't get data from message, %s"
-msgstr "No s'ha pogut obtenir dades del missatge %s"
+#: src/plugins/notification/notification_foldercheck.c:478
+msgid "Select folder(s)"
+msgstr "Seleccionar carpeta(s)"
 
-#: src/plugins/pgpcore/sgpgme.c:450
-#, c-format
-msgid "Couldn't initialize data, %s"
-msgstr "No s'ha pogut inicialitzar les dades, %s"
+#: src/plugins/notification/notification_foldercheck.c:579
+msgid "select recursively"
+msgstr "seleccionar recursivament"
 
-#: src/plugins/pgpcore/sgpgme.c:605
-msgid "Secret key specification is ambiguous"
-msgstr "La especificació de la clau secreta es ambigua"
+#: src/plugins/notification/notification_lcdproc.c:155
+msgid "No new messages"
+msgstr "Cap missatge nou"
 
-#: src/plugins/pgpcore/sgpgme.c:615
-#, c-format
-msgid "Secret key not found (%s)"
-msgstr "Clau secreta no trobada (%s)"
+#: src/plugins/notification/notification_plugin.c:216
+#: src/plugins/notification/notification_plugin.c:417
+#: src/plugins/notification/notification_prefs.c:400
+#: src/plugins/notification/notification_prefs.c:415
+#: src/plugins/notification/notification_prefs.c:434
+#: src/plugins/notification/notification_prefs.c:452
+#: src/plugins/notification/notification_prefs.c:470
+#: src/plugins/notification/notification_prefs.c:488
+#: src/plugins/notification/notification_prefs.c:506
+#: src/plugins/notification/notification_prefs.c:524
+msgid "Notification"
+msgstr "Notificació"
 
-#: src/plugins/pgpcore/sgpgme.c:628
-#, c-format
-msgid "Error setting secret key: %s"
-msgstr "Error definint la clau secreta: %s"
+#: src/plugins/notification/notification_plugin.c:221
+msgid "The Notification plugin needs threading support."
+msgstr "El mòdul de notificació necessita suport de fils."
 
-#: src/plugins/pgpcore/sgpgme.c:717
-#, c-format
-msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
+#: src/plugins/notification/notification_plugin.c:228
+msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
-"Protocol gpgme '%s' no es usable: Motor '%s' no s'ha instal·lat correctament."
+"Error al registrar el canvi de l'element de la carpeta al mòdul de "
+"notificació"
 
-#: src/plugins/pgpcore/sgpgme.c:723
-#, c-format
-msgid ""
-"Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
-"version %s is required.\n"
-msgstr ""
-"Protocol gpgme '%s' no es usable: Motor '%s' versió '%s' s'ha instal·lat, "
-"però la versió %s és necessària.\n"
+#: src/plugins/notification/notification_plugin.c:236
+msgid "Failed to register folder update hook in the Notification plugin"
+msgstr "Error al registrar el canvi de la carpeta al mòdul de notificació"
 
-#: src/plugins/pgpcore/sgpgme.c:731
-#, c-format
-msgid "Gpgme protocol '%s' is unusable (unknown problem)"
-msgstr "Protocol gpgme '%s' no es usable (problema desconegut)"
+#: src/plugins/notification/notification_plugin.c:246
+msgid "Failed to register msginfo update hook in the Notification plugin"
+msgstr "Error al registrar el canvi de la informació al mòdul de notificació"
 
-#: src/plugins/pgpcore/sgpgme.c:747
-msgid ""
-"GnuPG is not installed properly, or needs to be upgraded.\n"
-"OpenPGP support disabled."
-msgstr ""
-"GnuPG no està adecuadament installat o necessita actualitzar-se.\n"
-"Soport de OpenPGP deshabilitat."
+#: src/plugins/notification/notification_plugin.c:256
+msgid "Failed to register offline switch hook in the Notification plugin"
+msgstr "Error al registrar el canvi a fora de línia al mòdul de notificació"
 
-#: src/plugins/pgpcore/sgpgme.c:781
-msgid ""
-"You have to save the account's information with \"OK\" before being able to "
-"generate a key pair.\n"
+#: src/plugins/notification/notification_plugin.c:267
+msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
-"Heu de desar l'informació del compte amb \"Acceptar\" abans de poder generar "
-"el parell de claus.\n"
+"Error al registrar el tancament de la finestra principal al mòdul de "
+"notificació"
 
-#: src/plugins/pgpcore/sgpgme.c:786
-msgid "No PGP key found"
-msgstr "No s'ha trobat una clau PGP"
+#: src/plugins/notification/notification_plugin.c:280
+msgid "Failed to register got iconified hook in the Notification plugin"
+msgstr "Error al registrar la iconificació al mòdul de notificació"
 
-#: src/plugins/pgpcore/sgpgme.c:787
-msgid ""
-"Claws Mail did not find a secret PGP key, which means that you won't be able "
-"to sign emails or receive encrypted emails.\n"
-"Do you want to create a new key pair now?"
+#: src/plugins/notification/notification_plugin.c:293
+msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
-"Claws Mail no ha trobat cap clau secreta PGP, la qual cosa vol dir que no "
-"podeu  signar missatges o rebre missatges encriptats.\n"
-"Vols crear un nou parell de claus ara?"
-
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
-#, c-format
-msgid "Couldn't generate a new key pair: %s"
-msgstr "No s'ha pogut generar un nou parell de claus: %s"
+"Error al registrar el canvi de la llista de comptes al mòdul de notificació"
 
-#: src/plugins/pgpcore/sgpgme.c:864
-msgid ""
-"Generating your new key pair... Please move the mouse around to help "
-"generate entropy..."
+#: src/plugins/notification/notification_plugin.c:306
+msgid "Failed to register theme change hook in the Notification plugin"
 msgstr ""
-"Generant el vostre nou parell de claus...Si us plau mogueu el ratolí per "
-"ajudar a generar entropia..."
-
-#: src/plugins/pgpcore/sgpgme.c:879
-msgid "Couldn't generate a new key pair: unknown error"
-msgstr "No s'ha pogut generar un nou parell de claus: error desconegut"
+"Error al registrar el ganxo de canvi de tema del connector de Notificació"
 
-#: src/plugins/pgpcore/sgpgme.c:883
-#, c-format
+#: src/plugins/notification/notification_plugin.c:422
 msgid ""
-"Your new key pair has been generated. Its fingerprint is:\n"
-"%s\n"
+"This plugin provides various ways to notify the user of new and unread "
+"email.\n"
+"The plugin is extensively configurable in the plugins section of the "
+"preferences dialog.\n"
 "\n"
-"Do you want to export it to a keyserver?"
+"Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"El vostre nou parell de claus ha estat generat. La polsada és:\n"
-"%s\n"
-"\n"
-"Vols exportar-la a un servidor de claus?"
+"Aquest mòdul ens permet notificar a l'usuari de maneres diferents dels "
+"correus nous i no llegits.\n"
+"El mòdul és extensament configurable a la secció de mòduls al diàleg de "
+"preferències.\n"
+"Opinions a <berndt at gmx.de> són benvingudes."
 
-#: src/plugins/pgpcore/sgpgme.c:887
-msgid "Key generated"
-msgstr "Clau generada"
+#: src/plugins/notification/notification_plugin.c:447
+msgid "Various tools"
+msgstr "Eines variades"
 
-#: src/plugins/pgpcore/sgpgme.c:926
-msgid "Key exported."
-msgstr "Clau exportada."
+#: src/plugins/notification/notification_popup.c:314
+msgid "New Mail message"
+msgstr "Nou missatge de correu"
 
-#: src/plugins/pgpcore/sgpgme.c:928
-msgid "Couldn't export key."
-msgstr "No s'ha pogut exportar la clau."
+#: src/plugins/notification/notification_popup.c:335
+msgid "New News post"
+msgstr "Nou missatge de notícies"
 
-#: src/plugins/pgpcore/sgpgme.c:932
-msgid "Key export isn't implemented in Windows."
-msgstr "La clau exportada no està implementada a Windows."
+#: src/plugins/notification/notification_popup.c:336
+msgid "A new message arrived"
+msgstr "Ha arribat un nou missatge"
 
-#: src/plugins/pgpinline/pgpinline.c:155
-msgid "Incorrect part"
-msgstr "Part incorrecta"
+#: src/plugins/notification/notification_popup.c:339
+msgid "New Calendar message"
+msgstr "Nou missatge de calendari"
 
-#: src/plugins/pgpinline/pgpinline.c:159
-msgid "Not a text part"
-msgstr "No es una part de text"
+#: src/plugins/notification/notification_popup.c:340
+#: src/plugins/notification/notification_trayicon.c:872
+msgid "A new calendar message arrived"
+msgstr "Ha arribat un nou missatge de calendari"
 
-#: src/plugins/pgpinline/pgpinline.c:170 src/plugins/pgpinline/pgpinline.c:322
-msgid "Couldn't get text data."
-msgstr "No s'ha pogut obtenir les dades del text."
+#: src/plugins/notification/notification_popup.c:343
+msgid "New RSS feed article"
+msgstr "Nou article de feed RSS"
 
-#: src/plugins/pgpinline/pgpinline.c:188
-msgid "Couldn't convert text data to any sane charset."
-msgstr "No s'ha pogut convertir dades de text a un joc de caràcters correcte"
+#: src/plugins/notification/notification_popup.c:344
+#: src/plugins/notification/notification_trayicon.c:875
+msgid "A new article in a RSS feed arrived"
+msgstr "Ha arribat un nou article a un feed RSS"
 
-#: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
-#: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
-#: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
-#: src/plugins/pgpmime/pgpmime.c:509 src/plugins/pgpmime/pgpmime.c:652
-#: src/plugins/smime/smime.c:415
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "No s'ha pogut inicialitzar el contexte GPG, %s"
+#: src/plugins/notification/notification_popup.c:347
+msgid "New unknown message"
+msgstr "Nou missatge desconegut"
 
-#: src/plugins/pgpinline/pgpinline.c:315
-msgid "Couldn't parse mime part."
-msgstr "No s'ha pogut parsejar la part mime del missatge."
+#: src/plugins/notification/notification_popup.c:348
+msgid "Unknown message type arrived"
+msgstr "Ha arribat un missatge de tipus desconegut"
 
-#: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
-#, c-format
-msgid "Couldn't open decrypted file %s"
-msgstr "No s'ha pogut obrir l'arxiu desencriptat %s"
+#: src/plugins/notification/notification_popup.c:381
+#: src/plugins/notification/notification_trayicon.c:644
+msgid "Present main window"
+msgstr "Finestra principal actual"
+
+#: src/plugins/notification/notification_popup.c:491
+msgid "Mail message"
+msgstr "Missatge de correu"
 
-#: 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/notification/notification_popup.c:492
+#: src/plugins/notification/notification_popup.c:498
 #, c-format
-msgid "Couldn't write to decrypted file %s"
-msgstr "No s'ha pogut escriure a l'arxiu desencriptat %s"
+msgid "%d new message arrived"
+msgid_plural "%d new messages arrived"
+msgstr[0] "Ha arribat %d missatge nou"
+msgstr[1] "Han arribat %d missatges nous"
 
-#: src/plugins/pgpinline/pgpinline.c:376 src/plugins/pgpinline/pgpinline.c:377
-#: src/plugins/pgpinline/pgpinline.c:378
-msgid ""
-"\n"
-"--- Start of PGP/Inline encrypted data ---\n"
-msgstr ""
-"\n"
-"--- Inici de les dades encriptades PGP/Inline ---\n"
+#: src/plugins/notification/notification_popup.c:497
+msgid "News message"
+msgstr "Missatge de notícies"
 
-#: src/plugins/pgpinline/pgpinline.c:394 src/plugins/pgpinline/pgpinline.c:395
-#: src/plugins/pgpinline/pgpinline.c:396
-msgid "--- End of PGP/Inline encrypted data ---\n"
-msgstr "--- Final de les dades encriptades PGP/Inline  ---\n"
+#: src/plugins/notification/notification_popup.c:503
+msgid "Calendar message"
+msgstr "Missatge de calendari"
 
-#: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
+#: src/plugins/notification/notification_popup.c:504
+#: src/plugins/notification/notification_trayicon.c:909
 #, c-format
-msgid "Couldn't close decrypted file %s"
-msgstr "No s'ha pogut tancar l'arxiu desencriptat %s"
+msgid "%d new calendar message arrived"
+msgid_plural "%d new calendar messages arrived"
+msgstr[0] "Ha arribat %d nou missatge de calendari"
+msgstr[1] "Han arribat %d nous missatges de calendari"
 
-#: src/plugins/pgpinline/pgpinline.c:427
-msgid "Couldn't scan decrypted file."
-msgstr "No s'ha pogut escanejar l'arxiu desencriptat."
+#: src/plugins/notification/notification_popup.c:509
+msgid "RSS news feed"
+msgstr "Feed RSS de notícies"
 
-#: src/plugins/pgpinline/pgpinline.c:435
-msgid "Couldn't scan decrypted file parts."
-msgstr "No s'ha escanejar les parts de l'arxiu desencriptat."
-
-#: src/plugins/pgpinline/pgpinline.c:492 src/plugins/pgpinline/pgpinline.c:684
-msgid "Malformed message"
-msgstr "Missatge mal format"
-
-#: src/plugins/pgpinline/pgpinline.c:503
-msgid "Couldn't create temporary file."
-msgstr "No s'ha pogut crear l'arxiu temporal."
-
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:536
+#: src/plugins/notification/notification_popup.c:510
 #, c-format
-msgid "Data signing failed, %s"
-msgstr "Signatura de dades fallida, %s"
+msgid "%d new article in a RSS feed arrived"
+msgid_plural "%d new articles in a RSS feed arrived"
+msgstr[0] "Ha arribat %d nou article de feed RSS"
+msgstr[1] "HAn arribat %d nous articles de feed RSS"
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:563
+#: src/plugins/notification/notification_popup.c:572
 #, c-format
-msgid "Data signing failed due to invalid signer: %s"
-msgstr "Signatura de dades fallida per signant no vàlid: %s"
-
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:572
-msgid "Data signing failed, no results."
-msgstr "Signatura de dades fallida, sense resultats."
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nou missatge"
+msgstr[1] "%d nous missatges"
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:583
-msgid "Data signing failed, no contents."
-msgstr "Signatura de dades fallidam, sense continguts."
+#: src/plugins/notification/notification_prefs.c:416
+msgid "Hotkeys"
+msgstr "Tecles d'accés directe"
 
-#: src/plugins/pgpinline/pgpinline.c:623
-msgid ""
-"Please note that attachments are not encrypted by the PGP/Inline system, nor "
-"are email headers, like Subject."
-msgstr ""
-"Si us plau, adoneu-vos que els arxius adjunts no estan encriptats per el "
-"sistema PGP/Inline, ni les capçaleres del missatge, com pot el l'Assumpte."
+#: src/plugins/notification/notification_prefs.c:435
+msgid "Banner"
+msgstr "Anunci"
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:662
-#, c-format
-msgid "Couldn't add GPG key %s, %s"
-msgstr "No s'ha pogut afegir la clau GPG %s, %s"
+#: src/plugins/notification/notification_prefs.c:453
+msgid "Popup"
+msgstr "Element emergent"
 
-#: src/plugins/pgpinline/pgpinline.c:695 src/plugins/pgpmime/pgpmime.c:691
-#, c-format
-msgid "Couldn't create temporary file, %s"
-msgstr "No s'ha pogut crear l'arxiu temporal, %s"
+#: src/plugins/notification/notification_prefs.c:471 src/prefs_actions.c:263
+#: src/prefs_receive.c:133
+msgid "Command"
+msgstr "Comanda"
 
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:718
-#, c-format
-msgid "Encryption failed, %s"
-msgstr "Encriptació fallida, %s"
+#: src/plugins/notification/notification_prefs.c:489
+msgid "LCD"
+msgstr "LCD"
 
-#: src/plugins/pgpinline/pgpinline.c:795
-msgid "PGP/Inline"
-msgstr "PGP/Inline"
+#: src/plugins/notification/notification_prefs.c:507
+msgid "SysTrayicon"
+msgstr "Icona de safata de sistema"
 
-#: src/plugins/pgpinline/plugin.c:34
-msgid "PGP/inline"
-msgstr "PGP/inline"
+#: src/plugins/notification/notification_prefs.c:525
+msgid "Indicator"
+msgstr "Indicador"
 
-#: src/plugins/pgpinline/plugin.c:60
+#: src/plugins/notification/notification_prefs.c:581
 msgid ""
-"This plugin handles the deprecated Inline method of signing and/or "
-"encrypting mails. You can decrypt mails, verify signatures or sign and "
-"encrypt your own mails.\n"
-"\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy "
-"System\n"
-"\n"
-"The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
-"GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
+"Notification Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
-"Aquest mòdul gestiona els mètodes inline obsolets de signatura i/o "
-"encriptació. Podeu encriptar correus, verificar signatures o signar i "
-"encriptar els vostres propis correus.\n"
-"\n"
-"Podeu seleccionar-lo com al sistema de privacitat per defecte a /"
-"Configuració/[Preferències de Compte]/Privacitat i quan escrigueu un "
-"missatge desde /Opcions/Sistema de Privacitat\n"
-"\n"
-"El mòdul usa la llibreria GPGME com a encapsulació de GnuPG.\n"
 "\n"
-"GPGME és copyright 2001 per Werner Koch <dd9jn at gnu.org>"
+"Connector de notificació: Error al escriure la configuració del mòdul a "
+"l'arxiu\n"
 
-#: src/plugins/pgpmime/pgpmime.c:203
-msgid "Signature boundary not found."
-msgstr "Límit de la signatura no trobat."
+#: src/plugins/notification/notification_prefs.c:608
+msgid "Include folder types"
+msgstr "Incloure tipus de carpeta"
 
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:496
-msgid "Couldn't parse decrypted file."
-msgstr "No s'ha pogut parsejar l'arxiu desencriptat."
+#: src/plugins/notification/notification_prefs.c:617
+msgid "Mail folders"
+msgstr "Carpetes de correus"
 
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:503
-msgid "Couldn't parse decrypted file parts."
-msgstr "No s'ha pogut parsejar les parts de l'arxiu desencriptat."
+#: src/plugins/notification/notification_prefs.c:625
+msgid "News folders"
+msgstr "Carpetes de notícies"
 
-#: src/plugins/pgpmime/pgpmime.c:455 src/plugins/pgpmime/pgpmime.c:494
-#, c-format
-msgid "Couldn't create temporary file: %s"
-msgstr "No s'ha pogut crear l'arxiu temporal: %s"
+#: src/plugins/notification/notification_prefs.c:633
+msgid "RSSyl folders"
+msgstr "Carpetes RSSyl"
 
-#: src/plugins/pgpmime/pgpmime.c:596
-msgid "OpenPGP digital signature"
-msgstr "Signatura digital OpenPGP"
+#: src/plugins/notification/notification_prefs.c:641
+msgid "vCalendar folders"
+msgstr "Carpetes vCalendar"
 
-#: src/plugins/pgpmime/pgpmime.c:618
-msgid ""
-"Please note that email headers, like Subject, are not encrypted by the PGP/"
-"Mime system."
+#: src/plugins/notification/notification_prefs.c:649
+msgid "These settings override folder-specific selections."
 msgstr ""
-"Si us plau, adoneu-vos que les capçaleres del missatge, com pot ser "
-"l'Assumpte, no estan encriptades per el sistemaPGP/Mime."
+"Aquestes configuracions sobreescriuran les seleccions especifiques de "
+"carpeta."
 
-#: src/plugins/pgpmime/pgpmime.c:790
-msgid "PGP/Mime"
-msgstr "PGP/Mime"
+#: src/plugins/notification/notification_prefs.c:660
+msgid "Global notification settings"
+msgstr "Configuració de notificació global"
 
-#: src/plugins/pgpmime/plugin.c:34
-msgid "PGP/MIME"
-msgstr "PGP/MIME"
+#: src/plugins/notification/notification_prefs.c:669
+msgid "Set window manager urgency hint when new messages exist"
+msgstr ""
+"Estableix el suggeriment d'urgencia del gestor de finestres quan existeixi "
+"un nou missatge"
 
-#: src/plugins/pgpmime/plugin.c:60
-msgid ""
-"This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
-"mails, verify signatures or sign and encrypt your own mails.\n"
-"\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy "
-"System\n"
-"\n"
-"The plugin uses the GPGME library as a wrapper for GnuPG.\n"
-"\n"
-"GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
+#: src/plugins/notification/notification_prefs.c:678
+msgid "Set window manager urgency hint when unread messages exist"
 msgstr ""
-"Aquest mòdul gestiona els correus signats i/o encriptats amb PGP/MIME. Podeu "
-"desencriptar correus, verificar signatures o signar i encriptar els correus "
-"propis.\n"
-"\n"
-"Podeu seleccionar-lo com al sistema de privacitat per defecte a /"
-"Configuració/[Preferències de Compte]/Privacitat i quan escrigueu un "
-"missatge desde /Opcions/Sistema de Privacitat\n"
-"\n"
-"El mòdul usa la llibreria GPGME com a encapsulació de GnuPG.\n"
-"\n"
-"GPGME és copyright 2001 per Werner Koch <dd9jn at gnu.org>"
+"Estableix el suggeriment d'urgencia del gestor de finestres quan existeixi "
+"un missatge no llegit"
 
-#: src/plugins/python/python_plugin.c:358
-#: src/plugins/python/python_plugin.c:502
-msgid "Python scripts"
-msgstr "Seqüències d'ordres Python"
+#: src/plugins/notification/notification_prefs.c:688
+msgid "Use sound theme"
+msgstr "Useu tema de so"
 
-#: src/plugins/python/python_plugin.c:497
-msgid "Show Python console..."
-msgstr "Mostra la consola de Python"
+#: src/plugins/notification/notification_prefs.c:762
+msgid "Show banner"
+msgstr "Mostra avís"
 
-#: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:482
-msgid "Refresh"
-msgstr "Refrescar"
+#: src/plugins/notification/notification_prefs.c:767
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
+#: src/prefs_receive.c:183 src/prefs_summaries.c:462
+msgid "Never"
+msgstr "Mai"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
-msgid "Browse"
-msgstr "Mostrar"
+#: src/plugins/notification/notification_prefs.c:769 src/prefs_receive.c:181
+#: src/prefs_summaries.c:444 src/prefs_summaries.c:463
+msgid "Always"
+msgstr "Sempre"
 
-#: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:735
-msgid "Python"
-msgstr "Python"
+#: src/plugins/notification/notification_prefs.c:771
+msgid "Only when not empty"
+msgstr "Només quan no estigui buit"
 
-#: src/plugins/python/python_plugin.c:657
-msgid "Failed to register \"compose create hook\" in the Python plugin"
-msgstr ""
-"Ha fallat el registre de \"composicó de creació del ganxo\" en el connector "
-"Python"
+#: src/plugins/notification/notification_prefs.c:790
+msgid "Banner speed"
+msgstr "Velocitat de l'avís"
 
-#: src/plugins/python/python_plugin.c:740
-msgid ""
-"This plugin provides Python integration features.\n"
-"Python code can be entered interactively into an embedded Python console, "
-"under Tools -> Show Python console, or stored in scripts.\n"
-"\n"
-"These scripts are then available via the menu. You can assign keyboard "
-"shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invocation into the toolbars using Claws Mail's "
-"builtin toolbar editor.\n"
-"\n"
-"You can provide scripts working on the main window by placing files into ~/."
-"claws-mail/python-scripts/main.\n"
-"\n"
-"You can also provide scripts working on an open compose window by placing "
-"files into ~/.claws-mail/python-scripts/compose.\n"
-"\n"
-"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
-"are automatically executed when certain events occur. Currently, the "
-"following files in this directory are recognised:\n"
-"\n"
-"compose_any\n"
-"Gets executed whenever a compose window is opened, no matter if that opening "
-"happened as a result of composing a new message, replying or forwarding a "
-"message.\n"
-"\n"
-"startup\n"
-"Executed at plugin load\n"
-"\n"
-"shutdown\n"
-"Executed at plugin unload\n"
-"\n"
-"\n"
-"For the most up-to-date API documentation, type\n"
-"\n"
-" help(clawsmail)\n"
-"\n"
-"in the interactive Python console.\n"
-"\n"
-"The source distribution of this plugin comes with various example scripts in "
-"the \"examples\" subdirectory. If you wrote a script that you would be "
-"interested in sharing, feel free to send it to me to have it considered for "
-"inclusion in the examples.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
+#: src/plugins/notification/notification_prefs.c:827
+msgid "Maximum number of messages"
+msgstr "Nombre màxim de missatges"
+
+#: src/plugins/notification/notification_prefs.c:833
+msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr ""
-"Aquest plugin ofereix funcions d'integració de Python.\n"
-"Codi Python es pot introduir de forma interactiva en una consola de Python "
-"incrustat, a Eines -> Mostra consola de Python, o emmagatzemat en scripts.\n"
-"\n"
-"Aquestes seqüències d'ordres estaran disponibles a través del menú. Podeu "
-"assignar dreceres de teclat per a ells igual que es fa amb altres elements "
-"del menú. També pots posar botons per a la invocació de l'escriptura en les "
-"barres d'eines utilitzant l'editor de barra d'eines d'ordre interna de Claws "
-"Mail.\n"
-"\n"
-"Pot proporcionar els scripts que treballen a la finestra principal "
-"col·locant arxius a ~ /.claws-mail/python-scripts/main.\n"
-"\n"
-"També pot proporcionar guions de treball en una finestra de composició "
-"oberta mitjançant la col·locació d'arxius en ~ /.claws-mail/ python-scripts/"
-"compose.\n"
-"\n"
-"La carpeta ~ /.claws-mail/python-scripts/auto/ pot contenir algunes "
-"seqüències d'ordres que s'executen automàticament quan es produeixen "
-"determinats esdeveniments. Actualment, els següents arxius en aquest "
-"directori es reconeixen:\n"
-"\n"
-"compose_any\n"
-"És executat cada vegada que s'obre una finestra de redacció, no importa si "
-"aquesta obertura que va ocórrer com a resultat de compondre un nou missatge, "
-"respondre o reenviar un missatge.\n"
-"\n"
-"startup\n"
-"Executat amb càrrega del connector\n"
-"\n"
-"shutdown\n"
-"Executat en descàrrega del connector\n"
-"\n"
-"\n"
-"Per a la majoria de la documentació de l'API fins a la data, executa\n"
-"\n"
-" help(clawsmail)\n"
-"\n"
-"a la consola de Python interactiva.\n"
-"\n"
-"La distribució de codi font d'aquest plugin ve amb diversos scripts "
-"d'exemple en el \"exemples\" subdirectori. Si has fet un script i estaries "
-"interessat en compartir-lo, no dubtis a enviar-m'ho per tenir-ho en compte "
-"en els exemples.\n"
-"\n"
-"La teva opinió és benvinguda en <berndth at gmx.de>."
-
-#: src/plugins/python/python_plugin.c:791
-msgid "Python integration"
-msgstr "Integració Python"
-
-#: src/plugins/rssyl/old_feeds.c:90
-#, c-format
-msgid ""
-"Couldn't read contents of old feeds.xml file:\n"
-"%s"
-msgstr ""
-"No s'ha pogut llegir el contingut del fitxer àntic feeds.xml:\n"
-"%s"
-
-#: src/plugins/rssyl/opml_export.c:110
-#, c-format
-msgid "RSSyl: Error while writing '%s' to feed export list.\n"
-msgstr "RSSyl: No s'ha pogut escriure '%s' a la llista de canals exportats.\n"
-
-#: src/plugins/rssyl/opml_export.c:131
-#, c-format
-msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
-msgstr "RSSyl: No s'ha pogut esborrar el fitxer àntic OPML '%s': %s\n"
-
-#: src/plugins/rssyl/opml_export.c:141
-#, c-format
-msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
-msgstr "RSSyl: No s'ha pogut obrir el fitxer '%s' per al canal exportat: %s\n"
-
-#: src/plugins/rssyl/opml_export.c:182
-msgid "RSSyl: Error during writing feed export file.\n"
-msgstr "RSSyl: Error al escriure el canal en el fitxer d'exportació.\n"
-
-#: src/plugins/rssyl/opml_import.c:109
-#, c-format
-msgid ""
-"Error while subscribing feed\n"
-"%s\n"
-"\n"
-"Folder name '%s' is not allowed."
-msgstr ""
-"Error al subscriure el canal\n"
-"%s\n"
-"\n"
-"No es permès el nom de carpeta '%s'."
-
-#: src/plugins/rssyl/plugin.c:65
-msgid ""
-"This plugin allows you to create a mailbox tree where you can add newsfeeds "
-"in RSS 1.0, RSS 2.0 or Atom format.\n"
-"\n"
-"Each newsfeed will create a folder with appropriate entries, fetched from "
-"the web. You can read them, and delete or keep old entries."
-msgstr ""
-"Aquest mòdul us permet crear un arbre de bústies on podeu afegir feeds de "
-"noticies en format RSS 1.0, RSS 2.0 o Atom.\n"
-"\n"
-"Cada feed de notícies crearà una carpeta amb les entrades apropiades, "
-"obtingudes desde la web. Podeu llegir-les, esborrar-les o mantenir entrades "
-"antigues."
-
-#: src/plugins/rssyl/plugin.c:89
-msgid "RSS feed"
-msgstr "Feed RSS"
-
-#: src/plugins/rssyl/rssyl_add_item.c:296
-msgctxt "Empty RSS feed title placeholder"
-msgid "(empty)"
-msgstr "(buit)"
-
-#: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
-msgid "Refresh all feeds"
-msgstr "Refrescar tots els feeds"
-
-#: src/plugins/rssyl/rssyl_cb_menu.c:65
-msgid "Subscribe feed"
-msgstr "Subscriviu-vos al feed"
-
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
-msgid "Input the URL of the news feed you wish to subscribe:"
-msgstr "Introduiu la URL dels nous feeds als que us volgueu subscriure:"
-
-#: src/plugins/rssyl/rssyl_cb_menu.c:98
-#, c-format
-msgid "'%c' can't be used in folder name."
-msgstr "No es pot utilitzar '%c' en el nom de la carpeta."
-
-#: src/plugins/rssyl/rssyl_cb_menu.c:253
-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 necessita accés a la xarxa per actualitzar el canal."
-msgstr[1] "Claws Mail necessita accés a la xarxa per actualitzar els canals."
-
-#: src/plugins/rssyl/rssyl_cb_menu.c:316
-#, c-format
-msgid "Really remove the feed tree `%s' ?\n"
-msgstr "Realment vols esborrar l'arbre del canal '%s'?\n"
-
-#: src/plugins/rssyl/rssyl_cb_menu.c:317
-msgid "Remove feed tree"
-msgstr "Esborra l'arbre del canal"
-
-#: src/plugins/rssyl/rssyl_cb_menu.c:351
-msgid "Select an OPML file"
-msgstr "Selecciona un fitxer OPML"
-
-#: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:155
-#, c-format
-msgid "Couldn't create folder for new feed '%s'."
-msgstr "No s'ha pogut crear la carpeta per les noticies del canal '%s'."
-
-#: src/plugins/rssyl/rssyl_feed.h:10
-#, c-format
-msgid "RSSyl: Subscribing new feed: %s\n"
-msgstr "RSSyl: Subcribint al new canal: %s\n"
-
-#: src/plugins/rssyl/rssyl_feed.h:11
-#, c-format
-msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
-msgstr "RSSyl: Subscripció al nou canal '%s' (%s)\n"
-
-#: src/plugins/rssyl/rssyl_feed.h:12
-#, c-format
-msgid "RSSyl: Updating feed: %s\n"
-msgstr "RSSyl: Actualitzan el canal: %s\n"
-
-#: src/plugins/rssyl/rssyl_feed.h:13
-#, c-format
-msgid "RSSyl: Feed update finished: %s\n"
-msgstr "RSSyl: Actualització del feed finalitzada: %s\n"
-
-#: src/plugins/rssyl/rssyl_feed.h:14
-#, c-format
-msgid "RSSyl: Error fetching feed at '%s': %s\n"
-msgstr "RSSyl: No s'ha pogut obtenir el canal en '%s': %s\n"
-
-#: src/plugins/rssyl/rssyl_feed.h:15
-#, c-format
-msgid "RSSyl: No valid feed found at '%s'\n"
-msgstr "RSSyl: No s'ha trobat un canal valid en '%s'\n"
-
-#: src/plugins/rssyl/rssyl_feed.h:16
-#, c-format
-msgid "RSSyl: Couldn't process feed at '%s'\n"
-msgstr "RSSyl: No s'ha pogut processar el canal n '%s'\n"
-
-#: src/plugins/rssyl/rssyl_feed.h:17
-#, c-format
-msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
-msgstr ""
-"RSSyl: Aplicació està sortint, no va poder culminar l'actualització del "
-"canal en '%s'\n"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:273
-msgid "HTTP Basic authentication"
-msgstr "Autentificació basica HTTP"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:290
-msgid "Use default refresh interval"
-msgstr "Usar l'interval de refresc per defecte"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:302
-msgid "Keep old items"
-msgstr "Mantenir els elements antics"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:308
-msgid "_Trim"
-msgstr "Re_tallar"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:310
-msgid "Update feed, deleting items which are no longer in the source feed"
-msgstr ""
-"Actualització del canal, esborrant elements que ja no es troben en la font "
-"del canal"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:313
-msgid "Fetch comments if possible"
-msgstr "Obtenir els comentaris si es possible"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:338
-#, fuzzy
-msgid "Always mark it as new"
-msgstr "Sempre marca com a nou"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:344
-#, fuzzy
-msgid "Only mark it as new if its text has changed"
-msgstr "Si només el text canvia"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:350
-#, fuzzy
-msgid "Never mark it as new"
-msgstr "Mai marca com a nou"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:355
-#, fuzzy
-msgid "Add item title to the top of message"
-msgstr "Afegeix el titól de l'element amunt del missatge"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:362
-msgid "Ignore title rename"
-msgstr "Ignorar el rebateix del titól"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:367
-msgid ""
-"Enable this to keep current folder name, even if feed author changes title "
-"of the feed."
-msgstr ""
-"Activa això per mantenir el nom de la carpeta actual, fins i tot si l'autor "
-"canvia el títol del canal."
-
-#: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
-msgid "Verify SSL certificate validity"
-msgstr "Cer_tificats SSL"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:391
-msgid "User name"
-msgstr "Nom d'usuari"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:404
-#, fuzzy
-msgid "Source URL"
-msgstr "<b>URL d'origen:</b>"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:417
-#, fuzzy
-msgid "Fetch comments on posts aged less than"
-msgstr "Obtenir els comentaris si es possible"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:425
-msgid "day(s)"
-msgstr ""
-
-#: src/plugins/rssyl/rssyl_feed_props.c:426
-msgid "Set to -1 to fetch all comments"
-msgstr ""
-
-#: src/plugins/rssyl/rssyl_feed_props.c:450
-#, fuzzy
-msgid "If an item changes"
-msgstr "Si nomes ha canviat el seu text"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:455
-msgid "Items"
-msgstr ""
-
-#: src/plugins/rssyl/rssyl_feed_props.c:468
-#, fuzzy
-msgid "Refresh interval"
-msgstr "Interval d'actualització de la memòria cau"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:476
-#, fuzzy
-msgid "Set to 0 to disable automatic refreshing for this feed"
-msgstr "Poseu a 0 per desactivar el refresc automàtic"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:528
-msgid "_OK"
-msgstr "_OK"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:536
-msgid "Set feed properties"
-msgstr "Informar les propietat del feed"
-
-#: src/plugins/rssyl/rssyl_gtk.c:48
-msgid "_Refresh feed"
-msgstr "_Refrescar el feed"
-
-#: src/plugins/rssyl/rssyl_gtk.c:49
-msgid "Feed pr_operties"
-msgstr "Pr_opietats del Canal"
-
-#: src/plugins/rssyl/rssyl_gtk.c:50
-msgid "Rena_me..."
-msgstr "Reno_mbrar..."
-
-#: src/plugins/rssyl/rssyl_gtk.c:51
-msgid "R_efresh recursively"
-msgstr "Actualitza r_ecursivament"
-
-#: src/plugins/rssyl/rssyl_gtk.c:52
-msgid "Subscribe _new feed..."
-msgstr "Subscriure's al _nou feed..."
-
-#: src/plugins/rssyl/rssyl_gtk.c:53
-msgid "Create new _folder..."
-msgstr "Crear _nova carpeta..."
-
-#: src/plugins/rssyl/rssyl_gtk.c:54
-msgid "Import feed list..."
-msgstr "Importar una llista de feeds..."
-
-#: src/plugins/rssyl/rssyl_gtk.c:56
-msgid "Remove tree"
-msgstr "Esborra l'arbre"
-
-#: src/plugins/rssyl/rssyl_gtk.c:126
-msgid "Add RSS folder tree"
-msgstr "Afegir arbre de carpetes per RSS"
-
-#: src/plugins/rssyl/rssyl_gtk.c:127
-msgid "Enter name for a new RSS folder tree."
-msgstr "Introduïu un nom per a un nou arbre de carpetes per RSS."
-
-#: src/plugins/rssyl/rssyl_gtk.c:143
-msgid ""
-"Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
-msgstr ""
-"La creació de l'arbre de carpetes ha fallat.\n"
-"Potser alguns arxius ja existeixen, o potser es perquè no teniu permisos "
-"d'escriptura?"
-
-#: src/plugins/rssyl/rssyl.h:17
-msgid "My Feeds"
-msgstr "Els meus feeds"
-
-#: src/plugins/rssyl/rssyl_prefs.c:111
-msgid "Select cookies file"
-msgstr "Selecciona el fitxer de galetes"
-
-#: src/plugins/rssyl/rssyl_prefs.c:141
-msgid "Default refresh interval"
-msgstr "Interval d'actualització per defecte"
-
-#: src/plugins/rssyl/rssyl_prefs.c:161
-msgid "Refresh all feeds on application start"
-msgstr "Refrescar tots els feed a l'iniciar l'aplicació"
-
-#: src/plugins/rssyl/rssyl_prefs.c:170
-msgid "Verify SSL certificates validity for new feeds"
-msgstr "Verifica els certificats SSL pels nous canals"
-
-#: src/plugins/rssyl/rssyl_prefs.c:177
-msgid "Path to cookies file"
-msgstr "Ruta a l'arxiu de les cookies"
-
-#: src/plugins/rssyl/rssyl_prefs.c:184
-msgid "Path to Netscape-style cookies.txt file containing your cookies"
-msgstr ""
-"Ruta a l'arxiu d'estil Netscape cookies.txt que conté les vostres cookies"
-
-#: src/plugins/rssyl/rssyl_prefs.c:195
-msgid "Refreshing"
-msgstr "Actualitzant"
-
-#: src/plugins/rssyl/rssyl_prefs.c:199
-msgid "Security and privacy"
-msgstr "Seguretat i Privadesa"
-
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
-msgid "Subscribe new feed?"
-msgstr "Subscriure's el nou canal?"
-
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
-#, fuzzy
-msgid "Feed folder:"
-msgstr "<b>Carpeta del Canal:</b>"
-
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
-msgid ""
-"Instead of using official title, you can enter a different folder name for "
-"the feed."
-msgstr ""
-"En lloc d'utilitzar el títol oficial, pots fer servir un nom diferent per a "
-"la carpeta del canal."
-
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
-msgid "_Edit feed properties after subscribing"
-msgstr "_Editar les propietats del canal després de subscriure's"
-
-#: src/plugins/rssyl/rssyl_update_comments.c:105
-#, c-format
-msgid "Updating comments for '%s'..."
-msgstr "Actualitzant els comentaris per '%s'..."
-
-#: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
-msgid "401 (Authorisation required)"
-msgstr "401 (Autorització requerida)"
-
-#: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
-msgid "403 (Unauthorised)"
-msgstr "403 (No autoritzat)"
-
-#: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
-msgid "404 (Not found)"
-msgstr "404 (No trobat)"
-
-#: src/plugins/rssyl/rssyl_update_feed.c:114
-#, c-format
-msgid "Error %d"
-msgstr "Error %d"
-
-#: src/plugins/rssyl/rssyl_update_feed.c:127
-#, c-format
-msgctxt "First parameter is URL, second is error text"
-msgid ""
-"Error fetching feed at\n"
-"<b>%s</b>:\n"
-"\n"
-"%s"
-msgstr ""
-"No s'ha pogut obtenir el canal a\n"
-"<b>%s</b>:\n"
-"\n"
-"%s"
-
-#: src/plugins/rssyl/rssyl_update_feed.c:140
-#, c-format
-msgid ""
-"No valid feed found at\n"
-"<b>%s</b>"
-msgstr ""
-"No s'ha trobat un canal valid en\n"
-"<b>%s</b>"
-
-#: src/plugins/rssyl/rssyl_update_feed.c:152
-#, fuzzy
-msgid "Untitled feed"
-msgstr "Sense títol"
-
-#: src/plugins/rssyl/rssyl_update_feed.c:154
-#, fuzzy, c-format
-msgid "RSSyl: Possibly invalid feed without title at %s.\n"
-msgstr "RSSyl: No s'ha trobat un canal valid en '%s'\n"
-
-#: src/plugins/rssyl/rssyl_update_feed.c:228
-#, c-format
-msgid "Updating feed '%s'..."
-msgstr "Actualitzant el canal '%s'..."
-
-#: src/plugins/rssyl/rssyl_update_feed.c:250
-#, c-format
-msgid ""
-"Couldn't process feed at\n"
-"<b>%s</b>\n"
-"\n"
-"Please contact developers, this should not happen."
-msgstr ""
-"No s'ha pogut procesar els canals a\n"
-"<b>%s</b>\n"
-"\n"
-"Si us plau, poseu-vos en contacte amb els desenvolupadors, això no hauria de "
-"succeir."
-
-#: src/plugins/rssyl/rssyl_update_feed.c:334
-msgid "Claws Mail needs network access in order to update your feeds."
-msgstr ""
-"Claws Mail necessita tenir accés a la xarxa per tal d'actualitzar els seus "
-"canals."
-
-#: src/plugins/rssyl/rssyl_update_format.c:127
-msgid ""
-"Internal problem while upgrading storage format. This should not happen. "
-"Please report this, with debug output attached.\n"
-msgstr ""
-"Problema intern mentre s'actualitza el format d'emmagatzematge. Això no "
-"hauria de succeir. Si us plau aviseu-nos incloent el resultat de la "
-"depuració adjunta.\n"
-
-#: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:915
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: src/plugins/smime/plugin.c:59
-msgid ""
-"This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
-"mails, verify signatures or sign and encrypt your own mails.\n"
-"\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy "
-"System\n"
-"\n"
-"This plugin uses the GPGME library as a wrapper for GnuPG.\n"
-"This plugin also needs gpgsm, gnupg-agent and dirmngr installed and "
-"configured.\n"
-"\n"
-"Information about how to get S/MIME certificates working with GPGSM can be "
-"found at:\n"
-"http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
-"\n"
-"GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
-msgstr ""
-"Aquest mòdul gestiona els correus signats i/o encriptats amb S/MIME. Podeu "
-"desencriptar correus, verificar signatures o signar i encriptar els correus "
-"propis.\n"
-"\n"
-"Podeu seleccionar-lo com al sistema de privacitat per defecte a /"
-"Configuració/[Preferències de Compte]/Privacitat i quan escrigueu un "
-"missatge desde /Opcions/Sistema de Privacitat\n"
-"\n"
-"Aquest mòdul usa la llibreria GPGME com a encapsulació de GnuPG.\n"
-"Aquest mòdul també necesita que gpgsm, gnupg-agent i dirmngr estiguin "
-"instal·lats i configurats.\n"
-"\n"
-"Podeu trobar informació sobre com obtenir certificats S/MIME treballant amb "
-"GPGSM a:\n"
-"http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
-"\n"
-"GPGME és copyright 2001 per Werner Koch <dd9jn at gnu.org>"
-
-#: src/plugins/smime/smime.c:423
-#, c-format
-msgid "Couldn't set GPG protocol, %s"
-msgstr "No s'ha pogut establir el protocol GPG, %s"
-
-#: src/plugins/smime/smime.c:451
-msgid "Couldn't open temporary file"
-msgstr "No s'ha pogut obrir l'arxiu temporal"
-
-#: src/plugins/smime/smime.c:462 src/plugins/smime/smime.c:477
-msgid "Couldn't write to temporary file"
-msgstr "No s'ha pogut escriure a l'arxiu temporal"
-
-#: src/plugins/smime/smime.c:488
-msgid "Couldn't close temporary file"
-msgstr "No s'ha pogut tancar l'arxiu temporal"
-
-#: src/plugins/smime/smime.c:710
-msgid ""
-"Please note that email headers, like Subject, are not encrypted by the S/"
-"MIME system."
-msgstr ""
-"Si us plau, adoneu-vos que les capçaleres del missatge, com pot ser "
-"l'Assumpte, no estan encriptades per el sistema S/Mime."
-
-#: src/plugins/spam_report/spam_report.c:299
-msgid "Reporting spam..."
-msgstr "Reportant correu brossa..."
-
-#: src/plugins/spam_report/spam_report.c:334
-msgid "Report spam online..."
-msgstr "Reportar correu brossa en línia..."
-
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
-msgid "SpamReport"
-msgstr "InformeCorreuBrossa"
-
-#: src/plugins/spam_report/spam_report.c:388
-msgid ""
-"This plugin reports spam to various places.\n"
-"Currently the following sites or methods are supported:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * lists.debian.org nomination system"
-msgstr ""
-"Aquest mòdul reporta correu brossa a diferents localitzacions.\n"
-"Actualment els següents sites o mètodes són suportats:\n"
-"\n"
-" * spam-signal.fr\n"
-" * spamcop.net\n"
-" * Systema de nominacions lists.debian.org"
-
-#: src/plugins/spam_report/spam_report.c:418
-msgid "Spam reporting"
-msgstr "Informe de Correu Brossa"
-
-#: src/plugins/spam_report/spam_report_prefs.c:124
-msgid "Enabled"
-msgstr "Activat"
-
-#: src/plugins/spam_report/spam_report_prefs.c:156
-msgid "Forward to:"
-msgstr "Reenvia a:"
-
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
-msgid "Password:"
-msgstr "Contrasenya:"
-
-#: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
-
-#: src/plugins/spamassassin/spamassassin.c:169
-msgid "SpamAssassin plugin couldn't connect to spamd.\n"
-msgstr "Spamassassin no pot connectar amb spamd.\n"
-
-#: src/plugins/spamassassin/spamassassin.c:185
-msgid "SpamAssassin plugin filtering failed.\n"
-msgstr "Ha fallat el filtratge del mòdul SpamAssassin.\n"
-
-#: src/plugins/spamassassin/spamassassin.c:238
-msgid "SpamAssassin plugin is disabled by its preferences.\n"
-msgstr "El mòdul Spamassassin està deshabilitat per les seves preferències.\n"
-
-#: src/plugins/spamassassin/spamassassin.c:243
-msgid "SpamAssassin: filtering message..."
-msgstr "SpamAssassin: filtrant missatge..."
-
-#: src/plugins/spamassassin/spamassassin.c:372
-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 "
-"accessible."
-msgstr ""
-"El mòdul SpamAssassin no pot filtrar el missatge. La causa més probable de "
-"l'error es que no s'hagi pogut arribar al dimoni spamd. Si us plau, "
-"assegureu-vos de que spamd séstà executant i és accessible."
-
-#: src/plugins/spamassassin/spamassassin.c:429
-msgid ""
-"Claws Mail needs network access in order to feed this mail(s) to the remote "
-"learner."
-msgstr ""
-"Claws Mail necessita accés a xarxa per enviar aquest correu al programa "
-"d'aprenentatge remot."
-
-#: src/plugins/spamassassin/spamassassin.c:574
-msgid "Failed to get username"
-msgstr "Ha fallat la recepció del nom d'usuari"
-
-#: src/plugins/spamassassin/spamassassin.c:586
-msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
-msgstr ""
-"El mòdul Spamassassin està carregat però deshabilitat per les seves "
-"preferències.\n"
-
-#: src/plugins/spamassassin/spamassassin.c:620
-msgid ""
-"This plugin can check all messages that are received from an IMAP, LOCAL or "
-"POP account for spam using a SpamAssassin server. You will need a "
-"SpamAssassin Server (spamd) running somewhere.\n"
-"\n"
-"It can also be used for marking messages as Ham or Spam.\n"
-"\n"
-"When a message is identified as spam it can be deleted or saved in a "
-"specially designated folder.\n"
-"\n"
-"Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
-msgstr ""
-"Aquest mòdul pot comprovar tots els missatges que son rebuts desde un compte "
-"IMAP, LOCAL o POP si són spam amb un servidor SpamAssassin. Necessitareu "
-"unservidor SpamAssassin (spamd) executant-se en alguna màquina.\n"
-"\n"
-"També pot ser usat per marcar els missatges con a bons o dolents(Spam).\n"
-"\n"
-"Quan un missatge s'identifica com a spam es pot esborrar o es pot desar en "
-"una carpeta especial.\n"
-"\n"
-"Les opcions les podeu trobar a /Configuració/Preferències/Connectors/"
-"SpamAssassin"
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:90
-msgid "Localhost"
-msgstr "Màquina local"
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
-msgid "TCP"
-msgstr "TCP"
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
-msgid "Unix Socket"
-msgstr "Socket Unix"
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:268
-msgid "Enable SpamAssassin plugin"
-msgstr "Activar mòdul SpamAssassin"
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:272
-msgid "Transport"
-msgstr "Transport"
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:280
-msgid "Type of transport"
-msgstr "Tipus de transport"
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:301
-msgid "User"
-msgstr "Usuari"
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:314
-msgid "User to use with spamd server"
-msgstr "Usuari a usar amb el servidor spamd"
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:316
-msgid "spamd"
-msgstr "spamd"
+"Limitar el nombre de missatges mostrats, fes servir 0 per a il·limitats"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:334
-msgid "Hostname or IP address of spamd server"
-msgstr "Nom o adreça IP del servidor spamd"
+#: src/plugins/notification/notification_prefs.c:842
+msgid "Banner width"
+msgstr "Amplada del Banner"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:345
-msgid "Port of spamd server"
-msgstr "Port del servidor spamd"
+#: src/plugins/notification/notification_prefs.c:848
+msgid "Limit the size of banner, use 0 for screen width"
+msgstr "Amplada de l'anunci en pixels (0 significa pantalla sencera)"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
-msgid "Path of Unix socket"
-msgstr "Ruta al socket Unix"
+#: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
+#: src/prefs_message.c:223
+msgid "pixel(s)"
+msgstr "punt(s)"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:386
-msgid ""
-"Maximum time allowed for checking. If the check takes longer it will be "
-"aborted."
-msgstr ""
-"Temps màxim permès per a la comprovació. Si la comprovació dura més aquesta "
-"serà cancel·lada."
+#: src/plugins/notification/notification_prefs.c:859
+msgid "Include unread mails in banner"
+msgstr "Incloure correus no llegit a l'avís"
 
-#: src/plugins/tnef_parse/tnef_parse.c:65
-#, c-format
-msgid ""
-"\n"
-"Claws Mail TNEF parser:\n"
-"\n"
-"%s\n"
-msgstr ""
-"\n"
-"Parser TNEF de Claws Mail:\n"
-"\n"
-"%s\n"
+#: src/plugins/notification/notification_prefs.c:867
+msgid "Make banner sticky"
+msgstr "Fer que l'avís s'enganxi"
 
-#: src/plugins/tnef_parse/tnef_parse.c:122
-#: src/plugins/tnef_parse/tnef_parse.c:129
-msgid "Failed to write the part data."
-msgstr "Error al escriure les dades de part."
+#: src/plugins/notification/notification_prefs.c:877
+#: src/plugins/notification/notification_prefs.c:1082
+#: src/plugins/notification/notification_prefs.c:1377
+#: src/plugins/notification/notification_prefs.c:1612
+msgid "Only include selected folders"
+msgstr "Incloure només carpetes seleccionades"
 
-#: src/plugins/tnef_parse/tnef_parse.c:174
-msgid "Failed to parse VCalendar data."
-msgstr "Error al parsejar les dades de VCalendar."
+#: src/plugins/notification/notification_prefs.c:886
+#: src/plugins/notification/notification_prefs.c:1091
+#: src/plugins/notification/notification_prefs.c:1386
+#: src/plugins/notification/notification_prefs.c:1621
+msgid "Select folders..."
+msgstr "Seleccionar carpetes..."
 
-#: src/plugins/tnef_parse/tnef_parse.c:213
-msgid "Failed to parse VTask data."
-msgstr "Error al parsejar les dades de VTask."
+#: src/plugins/notification/notification_prefs.c:898
+msgid "Banner colors"
+msgstr "Colors del Banner"
 
-#: src/plugins/tnef_parse/tnef_parse.c:263
-msgid "Failed to parse VCard data."
-msgstr "Error al parsejar les dades de VCard."
+#: src/plugins/notification/notification_prefs.c:902
+#: src/plugins/notification/notification_prefs.c:1123
+msgid "Use custom colors"
+msgstr "Usar colors definits"
 
-#: src/plugins/tnef_parse/tnef_parse.c:399
-#: src/plugins/tnef_parse/tnef_parse.c:423
-msgid "TNEF Parser"
-msgstr "Parsejador TNEF"
+#: src/plugins/notification/notification_prefs.c:917
+#: src/plugins/notification/notification_prefs.c:1136
+msgid "Foreground"
+msgstr "Primer pla"
 
-#: src/plugins/tnef_parse/tnef_parse.c:428
-msgid ""
-"This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
-"\n"
-"The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall "
-"Hand <yerase at yerot.com>"
-msgstr ""
-"Aquest mòdul de Claws Mail us permet llegir adjunts application/ms-tnef.\n"
-"\n"
-"El mòdul usa la llibreria Ytnef, la qual té copyright 2002-2007 per Randall "
-"Hand <yerase at yerot.com>"
+#: src/plugins/notification/notification_prefs.c:923
+#: src/plugins/notification/notification_prefs.c:1142
+msgid "Foreground color"
+msgstr "Color de primer pla"
 
-#: src/plugins/vcalendar/common-views.c:62
-msgid "_Edit this meeting..."
-msgstr "_Editar aquesta reunió..."
+#: src/plugins/notification/notification_prefs.c:928
+#: src/plugins/notification/notification_prefs.c:1147
+#: src/prefs_msg_colors.c:281 src/prefs_msg_colors.c:302
+#: src/prefs_msg_colors.c:323
+msgid "Background"
+msgstr "Fons"
 
-#: src/plugins/vcalendar/common-views.c:63
-msgid "_Cancel this meeting..."
-msgstr "_Cancel·lar aquesta reunió..."
+#: src/plugins/notification/notification_prefs.c:934
+#: src/plugins/notification/notification_prefs.c:1153
+msgid "Background color"
+msgstr "Color de fons"
 
-#: src/plugins/vcalendar/common-views.c:65
-msgid "_Create new meeting..."
-msgstr "_Crear una nova reunió..."
+#: src/plugins/notification/notification_prefs.c:1046
+#: src/plugins/notification/notification_prefs.c:1647
+msgid "Enable popup"
+msgstr "Activar elements emergents"
 
-#: src/plugins/vcalendar/common-views.c:67
-msgid "_Go to today"
-msgstr "_Anar a avui"
+#: src/plugins/notification/notification_prefs.c:1063
+#: src/plugins/notification/notification_prefs.c:1665
+msgid "Popup timeout"
+msgstr "Temps espera de la finestra emergent"
 
-#: src/plugins/vcalendar/day-view.c:593 src/plugins/vcalendar/month-view.c:690
-msgid "Start"
-msgstr "Inici"
+#: src/plugins/notification/notification_prefs.c:1073
+#: src/plugins/notification/notification_prefs.c:1368
+#: src/plugins/notification/notification_prefs.c:1674
+msgid "second(s)"
+msgstr "segon(s)"
 
-#: src/plugins/vcalendar/day-view.c:606 src/plugins/vcalendar/month-view.c:703
-msgid "Show"
-msgstr "Mostrar"
+#: src/plugins/notification/notification_prefs.c:1102
+msgid "Make popup sticky"
+msgstr "Fer que l'element emergent s'enganxi"
 
-#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
-msgid "days"
-msgstr "dies"
+#: src/plugins/notification/notification_prefs.c:1112
+msgid "Set popup window width and position"
+msgstr "Definir amplada i posició de les finestres emergents"
 
-#: src/plugins/vcalendar/month-view.c:109
-msgid "Monday"
-msgstr "Dilluns"
+#: src/plugins/notification/notification_prefs.c:1117
+msgid "(the window manager is free to ignore this)"
+msgstr "(el gestor de finestres és lliure d'ignorar-ho)"
 
-#: src/plugins/vcalendar/month-view.c:110
-msgid "Tuesday"
-msgstr "dimarts"
+#: src/plugins/notification/notification_prefs.c:1165
+#: src/plugins/notification/notification_prefs.c:1677
+msgid "Display folder name"
+msgstr "Mostra el nom de la carpeta"
 
-#: src/plugins/vcalendar/month-view.c:111
-msgid "Wednesday"
-msgstr "dimecres"
+#: src/plugins/notification/notification_prefs.c:1230
+msgid "Sample popup window"
+msgstr "Mostra finestra emergent"
 
-#: src/plugins/vcalendar/month-view.c:112
-msgid "Thursday"
-msgstr "dijous"
+#: src/plugins/notification/notification_prefs.c:1236
+msgid "Done"
+msgstr "Fet"
 
-#: src/plugins/vcalendar/month-view.c:113
-msgid "Friday"
-msgstr "divendres"
+#: src/plugins/notification/notification_prefs.c:1294
+msgid "Select command"
+msgstr "Selecciona l'ordre"
 
-#: src/plugins/vcalendar/month-view.c:114
-msgid "Saturday"
-msgstr "dissabte"
+#: src/plugins/notification/notification_prefs.c:1323
+msgid "Enable command"
+msgstr "Activar comanda"
 
-#: src/plugins/vcalendar/month-view.c:115
-msgid "Sunday"
-msgstr "diumenge"
+#: src/plugins/notification/notification_prefs.c:1340
+msgid "Command to execute"
+msgstr "Ordre a executar"
 
-#: src/plugins/vcalendar/month-view.c:118
-msgid "January"
-msgstr "gener"
+#: src/plugins/notification/notification_prefs.c:1358
+msgid "Block command after execution for"
+msgstr "Bloqeujar comanda després de l'execució per"
 
-#: src/plugins/vcalendar/month-view.c:119
-msgid "February"
-msgstr "febrer"
+#: src/plugins/notification/notification_prefs.c:1465
+msgid "Enable LCD"
+msgstr "Activar LCD"
 
-#: src/plugins/vcalendar/month-view.c:120
-msgid "March"
-msgstr "març"
+#: src/plugins/notification/notification_prefs.c:1484
+msgid "Hostname:Port of LCDd server"
+msgstr "Nom de servidor:Port del servei LCDd"
 
-#: src/plugins/vcalendar/month-view.c:121
-msgid "April"
-msgstr "abril"
+#: src/plugins/notification/notification_prefs.c:1569
+msgid "Enable Trayicon"
+msgstr "Activar la icona de safata"
 
-#: src/plugins/vcalendar/month-view.c:122
-msgid "May"
-msgstr "maig"
+#: src/plugins/notification/notification_prefs.c:1585
+msgid "Hide at start-up"
+msgstr "Ocultar a l'inici"
 
-#: src/plugins/vcalendar/month-view.c:123
-msgid "June"
-msgstr "juny"
+#: src/plugins/notification/notification_prefs.c:1593
+msgid "Close to tray"
+msgstr "Tancar a la safata"
 
-#: src/plugins/vcalendar/month-view.c:124
-msgid "July"
-msgstr "juliol"
+#: src/plugins/notification/notification_prefs.c:1601
+msgid "Hide when iconified"
+msgstr "Ocultar al iconificar"
 
-#: src/plugins/vcalendar/month-view.c:125
-msgid "August"
-msgstr "agost"
+#. TRANSLATORS: "Toaster" does not refer to the kitchen appliance.
+#. A toast is a small passive (non-focus-stealing)
+#. notification bubble. If your language does not have a word
+#. for that, go for something along the lines of "passive popup"
+#. instead.See also
+#. http://en.wikipedia.org/wiki/Toast_(computing)
+#: src/plugins/notification/notification_prefs.c:1638
+msgid "Passive toaster popup"
+msgstr "Avís emergent passiu"
 
-#: src/plugins/vcalendar/month-view.c:126
-msgid "September"
-msgstr "setembre"
+#: src/plugins/notification/notification_prefs.c:1865
+msgid "Add to Indicator Applet"
+msgstr "Afegir a un applet indicador"
 
-#: src/plugins/vcalendar/month-view.c:127
-msgid "October"
-msgstr "octubre"
+#: src/plugins/notification/notification_prefs.c:1879
+msgid "Hide mainwindow when minimized"
+msgstr "Ocultar la finestra principal quan es minimitzi"
 
-#: src/plugins/vcalendar/month-view.c:128
-msgid "November"
-msgstr "novembre"
+#: src/plugins/notification/notification_prefs.c:1885
+msgid "Register Claws Mail"
+msgstr "Registrar Claws Mail"
 
-#: src/plugins/vcalendar/month-view.c:129
-msgid "December"
-msgstr "desembre"
+#: src/plugins/notification/notification_prefs.c:1946
+msgid "Enable global hotkeys"
+msgstr "Habilitar accessos directes per teclat globals"
 
-#: src/plugins/vcalendar/month-view.c:796
-msgid "Week number"
-msgstr "Número del mes"
+#: src/plugins/notification/notification_prefs.c:1960
+#, c-format
+msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
+msgstr "Exemples per tecles d'accés ràpid inclouen <b>%s</b> i <b>%s</b>"
 
-#: src/plugins/vcalendar/month-view.c:887
-msgid "Previous month"
-msgstr "Mes anterior"
+#: src/plugins/notification/notification_prefs.c:1960
+msgid "<control><shift>F11"
+msgstr "<control><shift>F11"
 
-#: src/plugins/vcalendar/month-view.c:907
-msgid "Next month"
-msgstr "Mes següent"
+#: src/plugins/notification/notification_prefs.c:1960
+msgid "<alt>N"
+msgstr "<alt>N"
 
-#: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
-msgid "vCalendar"
-msgstr "vCalendar"
+#: src/plugins/notification/notification_prefs.c:1971
+msgid "Toggle minimize"
+msgstr "Commutar minimitzar"
 
-#: src/plugins/vcalendar/plugin.c:73
-msgid ""
-"This plugin enables vCalendar message handling like that produced by "
-"Evolution or Outlook.\n"
-"\n"
-"When loaded, it will create a vCalendar mailbox in the Folder List, which "
-"will be populated by meetings that you have accepted or created.\n"
-"Meeting requests that you receive will be presented in an appropriate form "
-"and you will be able to accept or decline them.\n"
-"To create a meeting right-click on the vCalendar or Meetings folder and "
-"choose \"New meeting...\".\n"
-"\n"
-"You will also be able to subscribe to remote webCal feeds,export your "
-"meetings and calendars, publish your free/busy information and retrieve that "
-"information from others."
-msgstr ""
-"Aquest mòdul activa vCalendar, el manegador de missatges com els produïts "
-"per l'Evolution o l'Outlook.\n"
-"\n"
-"Quan estigui carregat, creará una bústia vCalendar a la llista de carpetes, "
-"on es guardaran totes les reunions que hagueu acceptat o creat.\n"
-"Les peticions de reunions que hagueu rebut seran presentats en el format "
-"apropiat i podreu acceptar-les o refusar-les.\n"
-"Per crear una reunió, pulseu el botó dret a les carpetes vCalendar o "
-"Reunions i escolliu \"Nova reunió...\".\n"
-"\n"
-"També podreu subscriure-us a feeds remotes webCal, exportar les vostres "
-"reunions i calendaris, publicar la vostra informació de lliure/ocupat i "
-"recuperar la informació d'altres persones."
+#: src/plugins/notification/notification_trayicon.c:114
+msgid "_Get Mail"
+msgstr "_Rebre Correu"
 
-#: src/plugins/vcalendar/plugin.c:111
-msgid "Calendar"
-msgstr "Calendari"
+#: src/plugins/notification/notification_trayicon.c:116
+msgid "_Email"
+msgstr "Corr_eu"
 
-#: src/plugins/vcalendar/vcalendar.c:100
-msgid "Create meeting from message..."
-msgstr "Crear reunió des del missatge..."
+#: src/plugins/notification/notification_trayicon.c:117
+msgid "E_mail from account"
+msgstr "_Correu des del compte"
 
-#: 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às a punt de crear %d reunions, una a una. Vols continuar?"
+#: src/plugins/notification/notification_trayicon.c:118
+msgid "Open A_ddressbook"
+msgstr "Obrir l'A_genda d'adreces"
 
-#: src/plugins/vcalendar/vcalendar.c:139
-msgid "Creating meeting..."
-msgstr "Creant reunió..."
+#: src/plugins/notification/notification_trayicon.c:119
+msgid "E_xit Claws Mail"
+msgstr "_Sortir de Claws Mail"
 
-#: src/plugins/vcalendar/vcalendar.c:158
-msgid "no subject"
-msgstr "Sense assumpte"
+#: src/plugins/notification/notification_trayicon.c:124
+msgid "_Work Offline"
+msgstr "_Treballar sense connexió"
+
+#: src/plugins/notification/notification_trayicon.c:126
+msgid "Show Trayicon Notifications"
+msgstr "Mostrar safata de notificacions"
 
-#: src/plugins/vcalendar/vcalendar.c:393
-msgid "Accept"
-msgstr "Acceptar"
+#: src/plugins/notification/notification_trayicon.c:269
+#, c-format
+msgid "New %d, Unread: %d, Total: %d"
+msgstr "Nous %d, No llegits: %d, Totals: %d"
 
-#: src/plugins/vcalendar/vcalendar.c:394
-msgid "Tentatively accept"
-msgstr "Acceptar provisionalment"
+#: src/plugins/notification/notification_trayicon.c:822
+msgid "New mail message"
+msgstr "Nou missatge de correu"
 
-#: src/plugins/vcalendar/vcalendar.c:395
-msgid "Decline"
-msgstr "Refusar"
+#: src/plugins/notification/notification_trayicon.c:824
+msgid "New news post"
+msgstr "Nou missatge de notícies"
 
-#: src/plugins/vcalendar/vcalendar.c:482
-msgid "You have a Todo item."
-msgstr "Teniu un item pendent."
+#: src/plugins/notification/notification_trayicon.c:826
+msgid "New calendar message"
+msgstr "Nou missatge de calendari"
 
-#: src/plugins/vcalendar/vcalendar.c:483 src/plugins/vcalendar/vcalendar.c:490
-#: src/plugins/vcalendar/vcalendar.c:495 src/plugins/vcalendar/vcalendar.c:503
-#: src/plugins/vcalendar/vcalendar.c:512 src/plugins/vcalendar/vcalendar.c:753
-msgid "Details follow:"
-msgstr "Els detalls són els que segueixen:"
+#: src/plugins/notification/notification_trayicon.c:828
+msgid "New article in RSS feed"
+msgstr "Nou article d'un feed RSS"
 
-#: src/plugins/vcalendar/vcalendar.c:489
-msgid "You have created a meeting."
-msgstr "Heu creat una reunió."
+#: src/plugins/notification/notification_trayicon.c:831
+msgid "New messages arrived"
+msgstr "Ha arribat un nou missatge"
 
-#: src/plugins/vcalendar/vcalendar.c:494
-msgid "You have been invited to a meeting."
-msgstr "Heu estat convidat a una reunió."
+#: src/plugins/notification/notification_trayicon.c:887
+#, c-format
+msgid "%d new mail message arrived"
+msgid_plural "%d new mail messages arrived"
+msgstr[0] "Ha arribat %d missatge nou"
+msgstr[1] "Han arribat %d missatges nous"
 
-#: src/plugins/vcalendar/vcalendar.c:502
-msgid "A meeting to which you had been invited has been cancelled."
-msgstr "Una reunió a la qual heu estat convidat ha estat cencel·lada."
+#: src/plugins/notification/notification_trayicon.c:898
+#, c-format
+msgid "%d new news post arrived"
+msgid_plural "%d new news posts arrived"
+msgstr[0] "Ha arribat %d missatge de noticies nou"
+msgstr[1] "Han arribat %d missatges de noticies nous"
 
-#: src/plugins/vcalendar/vcalendar.c:511
-msgid "You have been forwarded an appointment."
-msgstr "Heu reenviat una cita."
+#: src/plugins/notification/notification_trayicon.c:920
+#, c-format
+msgid "%d new article in RSS feeds arrived"
+msgid_plural "%d new articles in RSS feeds arrived"
+msgstr[0] "Ha arribat %d nou article de feeds RSS"
+msgstr[1] "Han arribat %d nous articles de feeds RSS"
 
-#: src/plugins/vcalendar/vcalendar.c:565
-msgid "(this event recurs)"
-msgstr ""
+#: src/plugins/pdf_viewer/poppler_viewer.c:701
+msgid "Title:"
+msgstr "Títol:"
 
-#: src/plugins/vcalendar/vcalendar.c:572
-#, fuzzy
-msgid "(this event is part of a recurring event)"
-msgstr ""
-"%s <span weight=\"bold\">(aquest event forma part d'un event recurrent)</"
-"span>"
+#: src/plugins/pdf_viewer/poppler_viewer.c:703
+msgid "Author:"
+msgstr "Autor:"
 
-#: src/plugins/vcalendar/vcalendar.c:752
-msgid "You have received an answer to an unknown meeting proposal."
-msgstr "Heu rebut una resposta a una proposta de reunió desconeguda."
+#: src/plugins/pdf_viewer/poppler_viewer.c:705
+msgid "Creator:"
+msgstr "Creador:"
 
-#: src/plugins/vcalendar/vcalendar.c:756
-#, c-format
-msgid ""
-"You have received an answer to a meeting proposal.\n"
-"%s has %s the invitation whose details follow:"
-msgstr ""
-"Heu rebut una resposta a una proposta de reunió.\n"
-"%s ha %s la invitació amb els següents detalls:"
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
+msgid "Producer:"
+msgstr "Generador:"
 
-#: src/plugins/vcalendar/vcalendar.c:835
-msgid "Error - could not get the calendar MIME part."
-msgstr "Error - No es pot obtenir la part MIME del calendari."
+#: src/plugins/pdf_viewer/poppler_viewer.c:709
+msgid "Created:"
+msgstr "Creat:"
 
-#: src/plugins/vcalendar/vcalendar.c:842
-msgid "Error - no calendar part found."
-msgstr "Error - no s'ha trobar la part de calendari."
+#: src/plugins/pdf_viewer/poppler_viewer.c:713
+msgid "Modified:"
+msgstr "Modificat"
 
-#: src/plugins/vcalendar/vcalendar.c:856
-msgid "Error - Unknown calendar component type."
-msgstr "Error - Tipus de component de calendari desconegut."
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
+msgid "Format:"
+msgstr "Format:"
 
-#: src/plugins/vcalendar/vcalendar.c:985
-msgid "Send a notification to the attendees"
-msgstr "Enviar notificació als convocats"
+#: src/plugins/pdf_viewer/poppler_viewer.c:718
+#: src/plugins/pdf_viewer/poppler_viewer.c:721
+msgid "Optimized:"
+msgstr "Optimitzat:"
 
-#: src/plugins/vcalendar/vcalendar.c:994
-msgid "Cancel meeting"
-msgstr "Cancel·lar reunió"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1179
+msgid "PDF properties"
+msgstr "Propietats del PDF"
 
-#: src/plugins/vcalendar/vcalendar.c:995
-msgid "Are you sure you want to cancel this meeting?"
-msgstr "Estàs segur que vols cancel·lar aquesta reunió?"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1276
+msgid "Loading..."
+msgstr "Carregant..."
 
-#: src/plugins/vcalendar/vcalendar.c:1090
-msgid "No account found"
-msgstr "No s'ha trobat cap compte"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1335
+#, c-format
+msgid "%s Document"
+msgstr "%s Document"
 
-#: src/plugins/vcalendar/vcalendar.c:1091
-msgid ""
-"You have no account matching any attendee.\n"
-"Do you want to reply anyway?"
-msgstr ""
-"No tens cap compte que coincideixi amb cap convocat.\n"
-"Vols contestar de totes maneres?"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1341
+#, c-format
+msgid "of %d"
+msgstr "de %d"
 
-#: src/plugins/vcalendar/vcalendar.c:1093
-#, fuzzy
-msgid "Reply anyway"
-msgstr "+Respondre igualment"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1358
+msgid "PDF rendering failed for an unknown reason."
+msgstr "La visualtizació del PDF ha fallar per un motiu desconegut."
 
-#: src/plugins/vcalendar/vcalendar.c:1222
-msgid "Answer"
-msgstr "Respondre"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1721
+#: src/plugins/pdf_viewer/poppler_viewer.c:1939
+msgid "Document Index"
+msgstr "Índex del Document"
 
-#: src/plugins/vcalendar/vcalendar.c:1223
-msgid "Edit meeting..."
-msgstr "Editar reunió..."
+#: src/plugins/pdf_viewer/poppler_viewer.c:1907
+msgid "First Page"
+msgstr "Primera pàgina"
 
-#: src/plugins/vcalendar/vcalendar.c:1224
-msgid "Cancel meeting..."
-msgstr "Cancel·lar reunió..."
+#: src/plugins/pdf_viewer/poppler_viewer.c:1910
+msgid "Previous Page"
+msgstr "Pàgina anterior"
 
-#: src/plugins/vcalendar/vcalendar.c:1225
-msgid "Launch website"
-msgstr "Obrir pàgina web"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1913
+msgid "Next Page"
+msgstr "Pàgina següent"
 
-#: src/plugins/vcalendar/vcalendar.c:1229
-msgid "You are already busy at this time."
-msgstr "Ja estàs ocupat a aquesta hora."
+#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+msgid "Last Page"
+msgstr "Última pàgina"
 
-#: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
-msgid "Event:"
-msgstr "Event:"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+msgid "Zoom In"
+msgstr "Augmentar"
 
-#: src/plugins/vcalendar/vcalendar.c:1269
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
-msgid "Organizer:"
-msgstr "Organitzador:"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+msgid "Zoom Out"
+msgstr "Disminuir"
 
-#: src/plugins/vcalendar/vcalendar.c:1270
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
-msgid "Location:"
-msgstr "Localització:"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+msgid "Fit Page"
+msgstr "Ajustar pàgina"
 
-#: src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
-msgid "Summary:"
-msgstr "Sumari:"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+msgid "Fit Page Width"
+msgstr "Ajustar l'ample de pàgina"
 
-#: src/plugins/vcalendar/vcalendar.c:1272
-msgid "Starting:"
-msgstr "Inici:"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+msgid "Rotate Left"
+msgstr "Rotar a l'esquerra"
 
-#: src/plugins/vcalendar/vcalendar.c:1273
-msgid "Ending:"
-msgstr "Final:"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1933
+msgid "Rotate Right"
+msgstr "Rotar a la dreta"
 
-#: src/plugins/vcalendar/vcalendar.c:1275
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1723
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1733
-msgid "Attendees:"
-msgstr "Convocats:"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+msgid "Document Info"
+msgstr "Informació del Document"
 
-#: src/plugins/vcalendar/vcalendar.c:1277
-msgid "Action:"
-msgstr "Acció:"
+#: src/plugins/pdf_viewer/poppler_viewer.c:1941
+msgid "Page Number"
+msgstr "Número de Pàgina"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
-msgid "_New meeting..."
-msgstr "_Nova reunió..."
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
+msgid "Zoom Factor"
+msgstr "Factor d'augment"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
-msgid "_Export calendar..."
-msgstr "_Exportar calendari..."
+#: src/plugins/pdf_viewer/poppler_viewer.c:2048
+#, c-format
+msgid ""
+"This plugin enables the viewing of PDF and PostScript attachments using the "
+"Poppler %s Lib and the gs tool.\n"
+"\n"
+"Any feedback is welcome: iwkse at claws-mail.org"
+msgstr ""
+"Aquest mòdul permet veure adjunts en format PDF i PostScript usant la "
+"illibreria Poppler %s i l'eina gs.\n"
+"\n"
+"Qualsevol sugeriment serà benvingut: iwkse at claws-mail.org"
 
-#: src/plugins/vcalendar/vcal_folder.c:167
-msgid "_Subscribe to webCal..."
-msgstr "_Subscriure's a webCal..."
+#: src/plugins/pdf_viewer/poppler_viewer.c:2054
+#: src/plugins/pdf_viewer/poppler_viewer.c:2062
+#: src/plugins/pdf_viewer/poppler_viewer.c:2082
+msgid "PDF Viewer"
+msgstr "Visor de PDFs"
 
-#: src/plugins/vcalendar/vcal_folder.c:169
-msgid "_Rename..."
-msgstr "_Renombrar..."
+#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#, c-format
+msgid ""
+"Warning: could not find ghostscript binary (gs) required for %s plugin to "
+"process PostScript attachments, only PDF attachments will be displayed. To "
+"enable PostScript support please install gs program.\n"
+"\n"
+"%s"
+msgstr ""
+"Advertència: no s'ha pogut trobar el binàri ghostscript (gs) requerit per el "
+"connector %s per processar arxius adjunts PostScript, es mostrarà només els "
+"arxius adjunts PDF. Per habilitar el suport PostScript instal el programa "
+"gs.\n"
+"\n"
+"\n"
+"%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:170
-msgid "U_pdate subscriptions"
-msgstr "Actualitzar subscri_pcions"
+#: src/plugins/perl/perl_gtk.c:50
+msgid "Edit perl filter rules (ext)..."
+msgstr "Editar les regles de filtres perl (ext)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
-msgid "_List view"
-msgstr "Vista de _llista"
+#: src/plugins/pgpcore/autocompletion.c:125
+msgid "Failed to register PGP address autocompletion hook"
+msgstr ""
+"Ha fallat el registre del ganxo per completació automàtica d'adreces PGP"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
-msgid "_Week view"
-msgstr "_Vista setmanal"
+#: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:116
+msgid "Passphrase"
+msgstr "Frase de pas"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
-msgid "_Month view"
-msgstr "Vista _mensual"
+#: src/plugins/pgpcore/passphrase.c:249
+msgid "[no user id]"
+msgstr "[sense id d'usuari]"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
-msgid "Meetings"
-msgstr "Reunions"
+#: src/plugins/pgpcore/passphrase.c:260
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
+"new key:</span>\n"
+"\n"
+"%.*s\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%sSi us plau, escriviu la frase de pas "
+"per a la nova clau: </span>\n"
+"\n"
+"%.*s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
-msgid "in the past"
-msgstr "en el passat"
+#: src/plugins/pgpcore/passphrase.c:263
+msgid "Passphrases did not match.\n"
+msgstr "La frase de pas no coincideix.\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
-msgid "today"
-msgstr "avui"
+#: src/plugins/pgpcore/passphrase.c:266
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
+"new key:</span>\n"
+"\n"
+"%.*s\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Si us plau, re-escriviu la frase de "
+"pas per a la nova clau: </span>\n"
+"\n"
+"%.*s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
-msgid "tomorrow"
-msgstr "demà"
+#: src/plugins/pgpcore/passphrase.c:270
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
+"span>\n"
+"\n"
+"%.*s\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%sSi us plau, escriviu la paraula de "
+"pas per: </span>\n"
+"\n"
+"%.*s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
-msgid "this week"
-msgstr "aquesta setmana"
+#: src/plugins/pgpcore/passphrase.c:273
+msgid "Bad passphrase.\n"
+msgstr "Paraula de pas errònia\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
-msgid "later"
-msgstr "més tard"
+#: src/plugins/pgpcore/pgp_viewer.c:121
+msgid "Key import"
+msgstr "Importar clau"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
-#, c-format
+#: src/plugins/pgpcore/pgp_viewer.c:122
+msgid ""
+"This key is not in your keyring. Do you want Claws Mail to try and import it "
+"from a keyserver?"
+msgstr ""
+"Aquesta clau no és al vostre anell de claus. Vols que Claws Mail intenti "
+"importar-la desde un servidor de claus?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:201
 msgid ""
 "\n"
-"These are the events planned %s:\n"
+"  Key ID "
 msgstr ""
 "\n"
-"Aquests són els events planejats %s:\n"
+"  ID tecla"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
-#, c-format
-msgid "Timeout (%d seconds) connecting to %s\n"
-msgstr "Excedit el temps (%d segons) connectant a %s\n"
+#: src/plugins/pgpcore/pgp_viewer.c:132 src/plugins/pgpcore/pgp_viewer.c:194
+msgid "   This key is not in your keyring.\n"
+msgstr "   Aquesta clau no és al vostre anell de claus.\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
-#, c-format
-msgid "Error %ld"
-msgstr "Error %ld"
+#: src/plugins/pgpcore/pgp_viewer.c:133
+msgid "   It should be possible to import it "
+msgstr "   Hauria de ser possible importar-la"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
-#, c-format
+#: src/plugins/pgpcore/pgp_viewer.c:135
 msgid ""
-"Could not retrieve the Webcal URL:\n"
-"%s:\n"
+"when working online,\n"
+"   or "
+msgstr ""
+"mentre treballeu amb connexió,\n"
+"   o "
+
+#: src/plugins/pgpcore/pgp_viewer.c:136
+msgid ""
+"with the following command: \n"
 "\n"
-"%s"
+"     "
 msgstr ""
-"No s'ha pogut recuperar la URL Webcal:\n"
-"%s\n"
+"amb la següent comanda: \n"
 "\n"
-"%s"
+"     "
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
-#, c-format
+#: src/plugins/pgpcore/pgp_viewer.c:143
 msgid ""
-"Could not retrieve the Webcal URL:\n"
-"%s:\n"
 "\n"
-"%s\n"
+"  Importing key ID "
 msgstr ""
-"No s'ha pogut recuperar la URL Webcal:\n"
-"%s\n"
 "\n"
-"%s\n"
+"  Important l'ID de la clau "
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
-#, c-format
+#: src/plugins/pgpcore/pgp_viewer.c:186
+msgid "   This key has been imported to your keyring.\n"
+msgstr "   Aquesta clau ha estat importada al vostre anell de claus.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:188
+msgid "   This key couldn't be imported to your keyring.\n"
+msgstr "   Aquesta clau no ha pogut ser importada al vostre anell de claus.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:189
+msgid "   Key servers are sometimes slow.\n"
+msgstr "   Els servidors de claus a veagdes van lents.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid ""
-"This URL does not look like a WebCal URL:\n"
-"%s\n"
-"%s"
+"   You can try to import it manually with the command:\n"
+"\n"
+"     "
 msgstr ""
-"Aquesta URL no sembla una URL de WebCal:\n"
-"%s\n"
-"%s"
+"   Podeu intentar importar-lo manualment amb la comanda:\n"
+"\n"
+"     "
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
-#, c-format
+#: src/plugins/pgpcore/pgp_viewer.c:195
+msgid "   Key import isn't implemented in Windows.\n"
+msgstr "   Importar claus no és implementat a Windows.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:204
+msgid "   This key is in your keyring.\n"
+msgstr "   Aquesta clau és al vostre anell de claus.\n"
+
+#: src/plugins/pgpcore/plugin.c:37
+msgid "PGP/Core"
+msgstr "PGP/Core"
+
+#: src/plugins/pgpcore/plugin.c:71
 msgid ""
-"This URL does not look like a WebCal URL:\n"
-"%s\n"
-"%s\n"
+"This plugin handles PGP core operations and provides address autocompletion "
+"from the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
+"\n"
+"Options can be found in /Configuration/Preferences/Plugins/GPG and /"
+"Configuration/[Account Preferences]/Plugins/GPG\n"
+"\n"
+"The plugin uses the GPGME library as a wrapper for GnuPG.\n"
+"\n"
+"GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Aquesta URL no sembla una URL de WebCal:\n"
-"%s\n"
-"%s\n"
+"Aquest mòdul gestiona les operacions bàsiques PGP i completació automàtica "
+"d'adreces, és usat per altres mòduls, com PGP/Mime.\n"
+"\n"
+"Podeu trobar les opcions a /Configuració/Preferencies/Connectors/GPG i /"
+"Configuració/[Preferències de Compte]/Connectors/GPG\n"
+"\n"
+"El connector usa la llibreria GPGME com a encapsulació de GnuPG.\n"
+"\n"
+"GPGME és copyright 2001 per Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
-#, c-format
-msgid "Could not create directory %s"
-msgstr "No s'ha pogut crear el directori %s"
+#: src/plugins/pgpcore/plugin.c:101
+msgid "Core operations"
+msgstr "Operacions principals"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
-msgid "Claws Mail needs network access in order to update the Webcal feed."
-msgstr "Claws Mail necessita accés a xarxa per actualitzar el feed de Webcal."
+#: src/plugins/pgpcore/prefs_gpg.c:111
+msgid "Automatically check signatures"
+msgstr "Verificar signatures automàticament"
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
-#, c-format
-msgid "Fetching calendar for %s..."
-msgstr "Actualitzant el calendari per %s..."
+#: src/plugins/pgpcore/prefs_gpg.c:114
+msgid "Use keyring for address autocompletion"
+msgstr "Utilitza l'anell de claus per la compleció automàtica d'adreces"
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
-msgid "new subscription"
-msgstr "Nova subscripció"
+#: src/plugins/pgpcore/prefs_gpg.c:119
+msgid "Use gpg-agent to manage passwords"
+msgstr "Useu gpg-agent per treballar amb passwords"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
-msgid "Claws Mail needs network access in order to update the subscription."
-msgstr "Claws Mail necessita accés a xarxa per actualitzar la subscripció."
+#: src/plugins/pgpcore/prefs_gpg.c:124
+msgid "Store passphrase in memory"
+msgstr "Emmagatzemeu la frase de pas en memòria"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
-msgid "Subscribe to WebCal"
-msgstr "Subscriure's a WebCal"
+#: src/plugins/pgpcore/prefs_gpg.c:134
+msgid "Expire after"
+msgstr "Caduca després de"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
-msgid "Enter the WebCal URL:"
-msgstr "Entreu la URL de WebCal:"
+#: src/plugins/pgpcore/prefs_gpg.c:149
+msgid "Setting to '0' will store the passphrase for the whole session"
+msgstr "Establint-lo a '0' guarda la frase de pas durant tota la sessió"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
-msgid "Could not parse the URL."
-msgstr "No s'ha pogut processar la URL."
+#: src/plugins/pgpcore/prefs_gpg.c:153 src/plugins/rssyl/rssyl_prefs.c:154
+#: src/prefs_receive.c:159
+msgid "minute(s)"
+msgstr "minut(s)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
-msgid "Do you really want to unsubscribe?"
-msgstr "Realment vols desubscriure't?"
+#: src/plugins/pgpcore/prefs_gpg.c:163
+msgid "Grab input while entering a passphrase"
+msgstr "Capturar l'entrada al introduïr la frase de pas"
 
-#: src/plugins/vcalendar/vcal_manager.c:109
-msgid "accepted"
-msgstr "acceptat"
+#: src/plugins/pgpcore/prefs_gpg.c:170
+msgid "Display warning on start-up if GnuPG doesn't work"
+msgstr "Mostrar un avís a l'inici si GnuPG no funciona"
 
-#: src/plugins/vcalendar/vcal_manager.c:110
-msgid "tentatively accepted"
-msgstr "acceptada provisionalment"
+#: src/plugins/pgpcore/prefs_gpg.c:308
+msgid "Sign key"
+msgstr "Clau per signar"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
-msgid "declined"
-msgstr "refusada"
+#: src/plugins/pgpcore/prefs_gpg.c:316
+msgid "Use default GnuPG key"
+msgstr "Useu la clau GnuPG per omissió"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
-msgid "did not answer"
-msgstr "no va respondre"
+#: src/plugins/pgpcore/prefs_gpg.c:327
+msgid "Select key by your email address"
+msgstr "Seleccioneu la clau en base a l'adreça de correu"
 
-#: src/plugins/vcalendar/vcal_manager.c:142
-msgid "individual"
-msgstr "individual"
+#: src/plugins/pgpcore/prefs_gpg.c:338
+msgid "Specify key manually"
+msgstr "Especifiqueu la clau manualment"
 
-#: src/plugins/vcalendar/vcal_manager.c:143
-msgid "group"
-msgstr "grup"
+#: src/plugins/pgpcore/prefs_gpg.c:348
+msgid "User or key ID:"
+msgstr "Usuari o ID de clau:"
 
-#: src/plugins/vcalendar/vcal_manager.c:144
-msgid "resource"
-msgstr "recurs"
+#: src/plugins/pgpcore/prefs_gpg.c:389
+msgid "No secret key found."
+msgstr "No s'ha trobat cap clau secreta."
 
-#: src/plugins/vcalendar/vcal_manager.c:145
-msgid "room"
-msgstr "lloc"
+#: src/plugins/pgpcore/prefs_gpg.c:392
+msgid "Generate a new key pair"
+msgstr "Generar un nou parell de claus"
+
+#: src/plugins/pgpcore/prefs_gpg.c:570
+msgid "GPG"
+msgstr "GPG"
+
+#: src/plugins/pgpcore/select-keys.c:95
+#, c-format
+msgid "No exact match for '%s'; please select the key."
+msgstr "No casa exactament per '%s'; si us plau seleccioneu la clau."
 
-#: src/plugins/vcalendar/vcal_manager.c:556
-msgid "Past"
-msgstr "Pasat"
+#: src/plugins/pgpcore/select-keys.c:98
+#, c-format
+msgid "Collecting info for '%s' ... %c"
+msgstr "Recollint info per '%s' ... %c"
 
-#: src/plugins/vcalendar/vcal_manager.c:559
-msgid "Today"
-msgstr "Avui"
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:142
+msgid "Undefined"
+msgstr "Indefinida"
 
-#: src/plugins/vcalendar/vcal_manager.c:562
-msgid "Tomorrow"
-msgstr "Demà"
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/sgpgme.c:162
+msgid "Marginal"
+msgstr "Marginal"
 
-#: src/plugins/vcalendar/vcal_manager.c:565
-msgid "This week"
-msgstr "Aquesta setmana"
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/sgpgme.c:166
+msgid "Ultimate"
+msgstr "Final"
 
-#: src/plugins/vcalendar/vcal_manager.c:568
-msgid "Later"
-msgstr "Més tard"
+#: src/plugins/pgpcore/select-keys.c:368
+msgid "Select Keys"
+msgstr "Seleccioneu tecles"
 
-#: src/plugins/vcalendar/vcal_manager.c:1242
-msgid "Accepted: "
-msgstr "Acceptada: "
+#: src/plugins/pgpcore/select-keys.c:395
+msgid "Key ID"
+msgstr "ID tecla"
 
-#: src/plugins/vcalendar/vcal_manager.c:1244
-msgid "Declined: "
-msgstr "Refusada: "
+#: src/plugins/pgpcore/select-keys.c:398
+msgid "Trust"
+msgstr "Confiança"
 
-#: src/plugins/vcalendar/vcal_manager.c:1246
-msgid "Tentatively Accepted: "
-msgstr "Acceptada provisionalment:"
+#: src/plugins/pgpcore/select-keys.c:423
+msgid "_Other"
+msgstr "_Altres"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:307
-msgid "Individual"
-msgstr "Individu"
+#: src/plugins/pgpcore/select-keys.c:424
+msgid "Do_n't encrypt"
+msgstr "_No encriptar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
-msgid "Resource"
-msgstr "Recurs"
+#: src/plugins/pgpcore/select-keys.c:583
+msgid "Add key"
+msgstr "Afegir clau"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
-msgid "Room"
-msgstr "Lloc"
+#: src/plugins/pgpcore/select-keys.c:584
+msgid "Enter another user or key ID:"
+msgstr "Entreu un altre usuari o clau ID:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
-msgid "Add..."
-msgstr "Afegir..."
+#: src/plugins/pgpcore/select-keys.c:606
+#, c-format
+msgid "Encrypt to %s <%s>"
+msgstr "Encriptat a %s <%s>"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:779
+#: src/plugins/pgpcore/select-keys.c:607
+#, c-format
 msgid ""
-"The following person(s) are busy at the time of your planned meeting:\n"
-"- "
+"This encryption key is not fully trusted.\n"
+"If you choose to encrypt the message with this key, you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"\n"
+"Key details: ID %s, primary identity %s <%s>\n"
+"\n"
+"Do you trust this key enough to use it anyway?"
 msgstr ""
-"Les següents persones estan ocupades a l'hora planejada de la reunió:\n"
-"- "
+"La clau d'encriptació no es totalment de confiança.\n"
+"Si escolliu d'encriptar el missatge amb aquesta clau no podreu\n"
+"assegurar-vos de que aniría la persona que creieu que va.\n"
+"Detalls de la clau: ID %s, identitat primària %s <%s>\n"
+"\n"
+"Hi confieu lo suficient com per usar-la de totes maneres?"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:869
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:955
-msgid "You"
-msgstr "Vostè"
+#: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:249 src/privacy.c:253
+#: src/privacy.c:270 src/privacy.c:274
+msgid "No signature found"
+msgstr "No s'ha trobat signatura"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:781
-msgid "You are busy at the time of your planned meeting"
-msgstr "Vostè està ocupat a l'hora planejada de la reunió"
+#: src/plugins/pgpcore/sgpgme.c:160
+msgid "Untrusted"
+msgstr "Desconfiat"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:783
+#: src/plugins/pgpcore/sgpgme.c:200 src/plugins/pgpcore/sgpgme.c:219
 #, c-format
-msgid "%s is busy at the time of your planned meeting"
-msgstr "%s està ocupat a l'hora planejada de la reunió"
+msgid "The signature can't be checked - %s"
+msgstr "La signatura no pot ser comprovada - %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
+#: src/plugins/pgpcore/sgpgme.c:204 src/plugins/pgpcore/sgpgme.c:208
+msgid "The signature has not been checked."
+msgstr "La signatura no ha estat comprovada"
+
+#: src/plugins/pgpcore/sgpgme.c:214 src/plugins/pgpcore/sgpgme.c:216
+msgid "PGP Core: Can't get key - no gpg-agent running."
+msgstr "Nucli PGP: no es pot obtenir la clau - gpg-agent no s'està executant."
+
+#: src/plugins/pgpcore/sgpgme.c:231
 #, c-format
-msgid "%d hour sooner"
-msgstr "%d hora més d'hora"
+msgid "Good signature from \"%s\" [ultimate]"
+msgstr "Signatura correcte de \"%s\" [definitiu]"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
+#: src/plugins/pgpcore/sgpgme.c:234
 #, c-format
-msgid "%d hours sooner"
-msgstr "%d hores més d'hora"
+msgid "Good signature from \"%s\" [full]"
+msgstr "Signatura correcte de \"%s\" [ple]"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
+#: src/plugins/pgpcore/sgpgme.c:237
 #, c-format
-msgid "%d hours and %d minutes sooner"
-msgstr "%d hores i %d minutes mes d'hora"
+msgid "Good signature from \"%s\" [marginal]"
+msgstr "Signatura correcte de \"%s\" [insignificant]"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:791
+#: src/plugins/pgpcore/sgpgme.c:243
 #, c-format
-msgid "%d minutes sooner"
-msgstr "%d minuts més d'hora"
+msgid "Good signature from \"%s\""
+msgstr "Signatura correcte de \"%s\""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:796
+#: src/plugins/pgpcore/sgpgme.c:248
 #, c-format
-msgid "%d hour later"
-msgstr "%d hora més tard"
+msgid "Expired signature from \"%s\""
+msgstr "Signatura expirada de \"%s\""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:798
+#: src/plugins/pgpcore/sgpgme.c:251
 #, c-format
-msgid "%d hours later"
-msgstr "%d hores més tard"
+msgid "Good signature from \"%s\", but the key has expired"
+msgstr "Signatura correcte de \"%s\", però la Clau a expirat"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:800
+#: src/plugins/pgpcore/sgpgme.c:254
 #, c-format
-msgid "%d hours and %d minutes later"
-msgstr "%d hores i %d minuts més tard"
+msgid "Good signature from \"%s\", but the key has been revoked"
+msgstr "Signatura correcte de \"%s\", però la Clau ha sigut revocada"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:802
+#: src/plugins/pgpcore/sgpgme.c:257
 #, c-format
-msgid "%d minutes later"
-msgstr "%d minuts més tard"
+msgid "Bad signature from \"%s\""
+msgstr "Signatura dolenta de \"%s\""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:808
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Everyone would be available %s or %s."
-msgstr ""
-"\n"
-"\n"
-"Tothom estarà disponible %s o %s."
+msgid "Key 0x%s not available to verify this signature"
+msgstr "No s'ha trobat la clau 'x%s per verificar aquesta signatura"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:810
+#: src/plugins/pgpcore/sgpgme.c:266
+msgid "The signature has not been checked"
+msgstr "La signatura no ha sigut validada"
+
+#: src/plugins/pgpcore/sgpgme.c:285
+msgid "Error checking signature: no status\n"
+msgstr "Error comprovant la signatura: sense estat\n"
+
+#: src/plugins/pgpcore/sgpgme.c:303
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Everyone would be available %s."
-msgstr ""
-"\n"
-"\n"
-"Tothom estarà disponible %s."
+msgid "Error checking signature: %s\n"
+msgstr "Error comprovant la signatura: %s\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:812
-msgid ""
-"\n"
-"\n"
-"It isn't possible to have this meeting with everyone in the previous or next "
-"6 hours."
-msgstr ""
-"\n"
-"\n"
-"No és possible tenir aquesta reunió amb tothom entre les 6 hores prèvies o "
-"posteriors."
+#: src/plugins/pgpcore/sgpgme.c:321
+#, c-format
+msgid "Signature made on %s using %s key ID %s\n"
+msgstr "Signatura realitzada el %s usant %s ID de clau %s\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:817
+#: src/plugins/pgpcore/sgpgme.c:327
 #, c-format
-msgid "would be available %s or %s"
-msgstr "estaria disponible %s o %s"
+msgid "Good signature from uid \"%s\" (Validity: %s)\n"
+msgstr "Signatura vàlida des de l'uid \"%s\" (Validesa: %s)\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:819
+#: src/plugins/pgpcore/sgpgme.c:332
 #, c-format
-msgid "would be available %s"
-msgstr "estaria disponible %s"
+msgid "Expired key uid \"%s\"\n"
+msgstr "Expirada l'uid de la clau \"%s\"\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:821
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:882
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:952
-msgid "not available"
-msgstr "no està disponible"
+#: src/plugins/pgpcore/sgpgme.c:337
+#, c-format
+msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
+msgstr "Signatura caducada des de l'uid \"%s\" (Validesa: %s)\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:824
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
-msgid ", but would be available %s or %s."
-msgstr ", però estaria disponible %s o %s."
+msgid "Revoked key uid \"%s\"\n"
+msgstr "Revocada uid de la Clau \"%s\"\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:826
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
-msgid ", but would be available %s."
-msgstr ", però estaria disponible %s."
+msgid "BAD signature from \"%s\"\n"
+msgstr "Signatura INVÀLIDA de \"%s\"\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:828
-msgid ", and isn't available in the previous or next 6 hours."
-msgstr ", i no està disponiible entre les sis hores prèvies o posteriors."
+#: src/plugins/pgpcore/sgpgme.c:358
+#, c-format
+msgid "                    uid \"%s\" (Validity: %s)\n"
+msgstr "               uid \"%s\" (Validesa: %s)\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:885
-msgid "available"
-msgstr "disponible"
+#: src/plugins/pgpcore/sgpgme.c:360
+msgid "Revoked"
+msgstr "Revocada"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:887
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1136
-msgid "Free/busy retrieval failed"
-msgstr "Ha fallat la recuperació de lliure/ocupat"
+#: src/plugins/pgpcore/sgpgme.c:364
+#, c-format
+msgid "Owner Trust: %s\n"
+msgstr "Confiança de propietari: %s\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:969
-msgid "Not everyone is available"
-msgstr "No tothom està disponible"
+#: src/plugins/pgpcore/sgpgme.c:367
+msgid "Primary key fingerprint:"
+msgstr "Empremta digital de clau primària:"
+
+#: src/plugins/pgpcore/sgpgme.c:385
+#, c-format
+msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
+msgstr "AVÍS: l'adreça del signant «%s» no coincideix amb l'entrada DNS\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:970
-msgid "Send anyway"
-msgstr "Enviar de totes maneres"
+#: src/plugins/pgpcore/sgpgme.c:391
+#, c-format
+msgid "Verified signer's address is \"%s\"\n"
+msgstr "L'adreça verificada del signant és «%s»\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:981
-msgid "Not everyone is available. See tooltips for more info..."
-msgstr "No tothom està disponible. Mireu les notes per més informació..."
+#: src/plugins/pgpcore/sgpgme.c:425
+#, c-format
+msgid "Couldn't get data from message, %s"
+msgstr "No s'ha pogut obtenir dades del missatge %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
+#: src/plugins/pgpcore/sgpgme.c:441
 #, c-format
-msgid "Fetching planning for %s..."
-msgstr "Actualitzant la planificació per %s ..."
+msgid "Couldn't initialize data, %s"
+msgstr "No s'ha pogut inicialitzar les dades, %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1145
-msgid "Available"
-msgstr "Disponible"
+#: src/plugins/pgpcore/sgpgme.c:596
+msgid "Secret key specification is ambiguous"
+msgstr "La especificació de la clau secreta es ambigua"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1158
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1165
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
-msgid "Everyone is available."
-msgstr "Tothom està disponible."
+#: src/plugins/pgpcore/sgpgme.c:606
+#, c-format
+msgid "Secret key not found (%s)"
+msgstr "Clau secreta no trobada (%s)"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1174
-msgid ""
-"Everyone seems available, but some free/busy information failed to be "
-"retrieved."
+#: src/plugins/pgpcore/sgpgme.c:619
+#, c-format
+msgid "Error setting secret key: %s"
+msgstr "Error definint la clau secreta: %s"
+
+#: src/plugins/pgpcore/sgpgme.c:703
+#, c-format
+msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
-"Tothom sembla disponible, però alguna informació de lliure/ocupat no s'ha "
-"pogut recuperar."
+"Protocol gpgme '%s' no es usable: Motor '%s' no s'ha instal·lat correctament."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1353
+#: src/plugins/pgpcore/sgpgme.c:709
+#, c-format
 msgid ""
-"Could not send the meeting invitation.\n"
-"Check the recipients."
+"Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
+"version %s is required.\n"
 msgstr ""
-"No s'ha pogut enviar la invitació a la reunió.\n"
-"Reviseu els destinataris."
-
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1474
-msgid "Save & Send"
-msgstr "Desar i Enviar"
-
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1475
-msgid "Check availability"
-msgstr "Comprovar disponibilitat"
-
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
-#, fuzzy
-msgid "Starts at:"
-msgstr "<b>Comença a les:</b>"
+"Protocol gpgme '%s' no es usable: Motor '%s' versió '%s' s'ha instal·lat, "
+"però la versió %s és necessària.\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1628
-#, fuzzy
-msgid "on:"
-msgstr "activat"
+#: src/plugins/pgpcore/sgpgme.c:717
+#, c-format
+msgid "Gpgme protocol '%s' is unusable (unknown problem)"
+msgstr "Protocol gpgme '%s' no es usable (problema desconegut)"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
-#, fuzzy
-msgid "Ends at:"
-msgstr "<b>Finalitza a:</b>"
+#: src/plugins/pgpcore/sgpgme.c:733
+msgid ""
+"GnuPG is not installed properly, or needs to be upgraded.\n"
+"OpenPGP support disabled."
+msgstr ""
+"GnuPG no està adecuadament installat o necessita actualitzar-se.\n"
+"Soport de OpenPGP deshabilitat."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
-msgid "New meeting"
-msgstr "Nova reunió"
+#: src/plugins/pgpcore/sgpgme.c:767
+msgid ""
+"You have to save the account's information with \"OK\" before being able to "
+"generate a key pair.\n"
+msgstr ""
+"Heu de desar l'informació del compte amb \"Acceptar\" abans de poder generar "
+"el parell de claus.\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1665
-#, c-format
-msgid "%s - Edit meeting"
-msgstr "%s - Editar reunió"
+#: src/plugins/pgpcore/sgpgme.c:772
+msgid "No PGP key found"
+msgstr "No s'ha trobat una clau PGP"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1744
-msgid "Time:"
-msgstr "Hora:"
+#: src/plugins/pgpcore/sgpgme.c:773
+msgid ""
+"Claws Mail did not find a secret PGP key, which means that you won't be able "
+"to sign emails or receive encrypted emails.\n"
+"Do you want to create a new key pair now?"
+msgstr ""
+"Claws Mail no ha trobat cap clau secreta PGP, la qual cosa vol dir que no "
+"podeu  signar missatges o rebre missatges encriptats.\n"
+"Vols crear un nou parell de claus ara?"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1877
+#: src/plugins/pgpcore/sgpgme.c:843 src/plugins/pgpcore/sgpgme.c:859
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d hores"
+msgid "Couldn't generate a new key pair: %s"
+msgstr "No s'ha pogut generar un nou parell de claus: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1880
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minut"
-msgstr[1] "%d minuts"
+#: src/plugins/pgpcore/sgpgme.c:850
+msgid ""
+"Generating your new key pair... Please move the mouse around to help "
+"generate entropy..."
+msgstr ""
+"Generant el vostre nou parell de claus...Si us plau mogueu el ratolí per "
+"ajudar a generar entropia..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1891
-#, c-format
-msgid "Upcoming event: %s"
-msgstr "Event inminent: %s"
+#: src/plugins/pgpcore/sgpgme.c:865
+msgid "Couldn't generate a new key pair: unknown error"
+msgstr "No s'ha pogut generar un nou parell de claus: error desconegut"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/pgpcore/sgpgme.c:869
 #, c-format
 msgid ""
-"You have a meeting or event soon.\n"
-"It starts at %s and ends %s later.\n"
-"Location: %s\n"
-"More information:\n"
+"Your new key pair has been generated. Its fingerprint is:\n"
+"%s\n"
 "\n"
-"%s"
+"Do you want to export it to a keyserver?"
 msgstr ""
-"Teniu una reunió o event en breu.\n"
-"Comença a les %s i finalitza %s després.\n"
-"Localització: %s\n"
-"Més informació:\n"
+"El vostre nou parell de claus ha estat generat. La polsada és:\n"
+"%s\n"
 "\n"
-"%s"
+"Vols exportar-la a un servidor de claus?"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1909
-#, c-format
-msgid "Remind me in %d minute"
-msgid_plural "Remind me in %d minutes"
-msgstr[0] "Recorda-m'ho en %d minut"
-msgstr[1] "Recorda-m'ho en %d minuts"
+#: src/plugins/pgpcore/sgpgme.c:873
+msgid "Key generated"
+msgstr "Clau generada"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2035
-msgid "Empty calendar"
-msgstr "Calendari buit"
+#: src/plugins/pgpcore/sgpgme.c:912
+msgid "Key exported."
+msgstr "Clau exportada."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
-msgid "There is nothing to export."
-msgstr "No hi ha res a exportar."
+#: src/plugins/pgpcore/sgpgme.c:914
+msgid "Couldn't export key."
+msgstr "No s'ha pogut exportar la clau."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2076
-msgid "Could not export the calendar."
-msgstr "No es pot exportar el calendari."
+#: src/plugins/pgpcore/sgpgme.c:918
+msgid "Key export isn't implemented in Windows."
+msgstr "La clau exportada no està implementada a Windows."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2093
-msgid "Export calendar to ICS"
-msgstr "Exportar calendari a ICS"
+#: src/plugins/pgpinline/pgpinline.c:157
+msgid "Incorrect part"
+msgstr "Part incorrecta"
+
+#: src/plugins/pgpinline/pgpinline.c:161
+msgid "Not a text part"
+msgstr "No es una part de text"
+
+#: src/plugins/pgpinline/pgpinline.c:172 src/plugins/pgpinline/pgpinline.c:324
+msgid "Couldn't get text data."
+msgstr "No s'ha pogut obtenir les dades del text."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/pgpinline/pgpinline.c:190
+msgid "Couldn't convert text data to any sane charset."
+msgstr "No s'ha pogut convertir dades de text a un joc de caràcters correcte"
+
+#: src/plugins/pgpinline/pgpinline.c:198 src/plugins/pgpinline/pgpinline.c:520
+#: src/plugins/pgpinline/pgpinline.c:659 src/plugins/pgpinline/pgpinline.c:715
+#: src/plugins/pgpmime/pgpmime.c:74 src/plugins/pgpmime/pgpmime.c:184
+#: src/plugins/pgpmime/pgpmime.c:330 src/plugins/pgpmime/pgpmime.c:510
+#: src/plugins/pgpmime/pgpmime.c:651 src/plugins/smime/smime.c:415
 #, c-format
-msgid "Couldn't export calendar to '%s'\n"
-msgstr "No es pot exportar el calendari a '%s'\n"
+msgid "Couldn't initialize GPG context, %s"
+msgstr "No s'ha pogut inicialitzar el contexte GPG, %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
-msgid "Could not export the freebusy info."
-msgstr "No es pot exportar la informació de lliure/ocupat."
+#: src/plugins/pgpinline/pgpinline.c:317
+msgid "Couldn't parse mime part."
+msgstr "No s'ha pogut parsejar la part mime del missatge."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2264
+#: src/plugins/pgpinline/pgpinline.c:347 src/plugins/pgpmime/pgpmime.c:353
 #, c-format
-msgid "Couldn't export free/busy to '%s'\n"
-msgstr "No es pot exportar la informació de lliure/ocupat a '%s'\n"
+msgid "Couldn't open decrypted file %s"
+msgstr "No s'ha pogut obrir l'arxiu desencriptat %s"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
-msgid "Reminders"
-msgstr "Recordatoris"
+#: src/plugins/pgpinline/pgpinline.c:364 src/plugins/pgpinline/pgpinline.c:373
+#: src/plugins/pgpinline/pgpinline.c:382 src/plugins/pgpinline/pgpinline.c:390
+#: src/plugins/pgpinline/pgpinline.c:400 src/plugins/pgpinline/pgpinline.c:409
+#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
+#, c-format
+msgid "Couldn't write to decrypted file %s"
+msgstr "No s'ha pogut escriure a l'arxiu desencriptat %s"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
-msgid "Alert me"
-msgstr "Avisa'm"
+#: src/plugins/pgpinline/pgpinline.c:378 src/plugins/pgpinline/pgpinline.c:379
+#: src/plugins/pgpinline/pgpinline.c:380
+msgid ""
+"\n"
+"--- Start of PGP/Inline encrypted data ---\n"
+msgstr ""
+"\n"
+"--- Inici de les dades encriptades PGP/Inline ---\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
-msgid "minutes before an event"
-msgstr "minuts abans d'un event"
+#: src/plugins/pgpinline/pgpinline.c:396 src/plugins/pgpinline/pgpinline.c:397
+#: src/plugins/pgpinline/pgpinline.c:398
+msgid "--- End of PGP/Inline encrypted data ---\n"
+msgstr "--- Final de les dades encriptades PGP/Inline  ---\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
-msgid "Calendar export"
-msgstr "Exportació del calendari"
+#: src/plugins/pgpinline/pgpinline.c:417 src/plugins/pgpmime/pgpmime.c:390
+#, c-format
+msgid "Couldn't close decrypted file %s"
+msgstr "No s'ha pogut tancar l'arxiu desencriptat %s"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
-msgid "Automatically export calendar to"
-msgstr "Exportar automàticament el calendari a"
+#: src/plugins/pgpinline/pgpinline.c:429
+msgid "Couldn't scan decrypted file."
+msgstr "No s'ha pogut escanejar l'arxiu desencriptat."
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
-msgid "You can export to a local file or URL"
-msgstr "Podeu exportar a un fitxer local o URL"
+#: src/plugins/pgpinline/pgpinline.c:437
+msgid "Couldn't scan decrypted file parts."
+msgstr "No s'ha escanejar les parts de l'arxiu desencriptat."
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
-msgid "Specify a local file or URL (http://server/path/file.ics)"
-msgstr "Especifiqueu un fitxer local o URL(http://servidor/ruta/fitxer.ics)"
+#: src/plugins/pgpinline/pgpinline.c:494 src/plugins/pgpinline/pgpinline.c:686
+msgid "Malformed message"
+msgstr "Missatge mal format"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
-msgid "Include webcal subscriptions in export"
-msgstr "Incloure subscripcions webcal a l'exportació"
+#: src/plugins/pgpinline/pgpinline.c:505
+msgid "Couldn't create temporary file."
+msgstr "No s'ha pogut crear l'arxiu temporal."
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
-msgid "Command to run after calendar export"
-msgstr "Comanda a executar després de l'exportació del calendari"
+#: src/plugins/pgpinline/pgpinline.c:544 src/plugins/pgpmime/pgpmime.c:537
+#, c-format
+msgid "Data signing failed, %s"
+msgstr "Signatura de dades fallida, %s"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
-msgid "Register Claws' calendar in XFCE's Orage clock"
-msgstr "Calendari de Register Claws al rellotge Orage de XFCE"
+#: src/plugins/pgpinline/pgpinline.c:562 src/plugins/pgpmime/pgpmime.c:562
+#, c-format
+msgid "Data signing failed due to invalid signer: %s"
+msgstr "Signatura de dades fallida per signant no vàlid: %s"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
-msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
-msgstr ""
-"Permet a Orage (versió superior a la 4.4) veure el calendari de Claws Mail"
+#: src/plugins/pgpinline/pgpinline.c:571 src/plugins/pgpmime/pgpmime.c:571
+msgid "Data signing failed, no results."
+msgstr "Signatura de dades fallida, sense resultats."
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
-msgid "Export as GNOME shell calendar server"
-msgstr ""
+#: src/plugins/pgpinline/pgpinline.c:581 src/plugins/pgpmime/pgpmime.c:582
+msgid "Data signing failed, no contents."
+msgstr "Signatura de dades fallidam, sense continguts."
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/pgpinline/pgpinline.c:625
 msgid ""
-"Register D-Bus calendar server interface to export Claws Mail's calendar"
+"Please note that attachments are not encrypted by the PGP/Inline system, nor "
+"are email headers, like Subject."
 msgstr ""
+"Si us plau, adoneu-vos que els arxius adjunts no estan encriptats per el "
+"sistema PGP/Inline, ni les capçaleres del missatge, com pot el l'Assumpte."
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
-msgid "Free/Busy information"
-msgstr "Informació de Lliure/Ocupat"
+#: src/plugins/pgpinline/pgpinline.c:669 src/plugins/pgpmime/pgpmime.c:661
+#, c-format
+msgid "Couldn't add GPG key %s, %s"
+msgstr "No s'ha pogut afegir la clau GPG %s, %s"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
-msgid "Automatically export free/busy status to"
-msgstr "Exportar automàticament l'estat de lliure/ocupat a"
+#: src/plugins/pgpinline/pgpinline.c:697 src/plugins/pgpmime/pgpmime.c:690
+#, c-format
+msgid "Couldn't create temporary file, %s"
+msgstr "No s'ha pogut crear l'arxiu temporal, %s"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
-msgid "Specify a local file or URL (http://server/path/file.ifb)"
-msgstr "Especificar un fitxer local o URL (http://servidor/ruta/fitxer.ifb)"
+#: src/plugins/pgpinline/pgpinline.c:728 src/plugins/pgpmime/pgpmime.c:717
+#, c-format
+msgid "Encryption failed, %s"
+msgstr "Encriptació fallida, %s"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
-msgid "Command to run after free/busy status export"
-msgstr "Comanda a executar després de l'exportació de l'estat de lliure/ocupat"
+#: src/plugins/pgpinline/pgpinline.c:797
+msgid "PGP/Inline"
+msgstr "PGP/Inline"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
-msgid "Get free/busy status of others from"
-msgstr "Obtenir l'estat de lliure/ocupat d'altres desde"
+#: src/plugins/pgpinline/plugin.c:34
+msgid "PGP/inline"
+msgstr "PGP/inline"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
-#, c-format
+#: src/plugins/pgpinline/plugin.c:60
 msgid ""
-"Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
-"left part of the email address, %d for the domain"
+"This plugin handles the deprecated Inline method of signing and/or "
+"encrypting mails. You can decrypt mails, verify signatures or sign and "
+"encrypt your own mails.\n"
+"\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account "
+"Preferences]/Privacy and when composing a message from /Options/Privacy "
+"System\n"
+"\n"
+"The plugin uses the GPGME library as a wrapper for GnuPG.\n"
+"\n"
+"GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Especificar un fitxer local o URL (http://servidor/ruta/fitxer.ifb). Useu %u "
-"de la part esquerra de l'adreça de correu, %d per el domini"
-
-#: src/plugins/vcalendar/vcal_prefs.c:538
-msgid "SSL options"
-msgstr "Opcions de SSL"
-
-#: src/pop.c:152
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "No s'ha trobat en la salutació la marca de temps APOP necessària\n"
-
-#: src/pop.c:159
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Error de sintaxis a la marca de temps de la salutació\n"
+"Aquest mòdul gestiona els mètodes inline obsolets de signatura i/o "
+"encriptació. Podeu encriptar correus, verificar signatures o signar i "
+"encriptar els vostres propis correus.\n"
+"\n"
+"Podeu seleccionar-lo com al sistema de privacitat per defecte a /"
+"Configuració/[Preferències de Compte]/Privacitat i quan escrigueu un "
+"missatge desde /Opcions/Sistema de Privacitat\n"
+"\n"
+"El mòdul usa la llibreria GPGME com a encapsulació de GnuPG.\n"
+"\n"
+"GPGME és copyright 2001 per Werner Koch <dd9jn at gnu.org>"
 
-#: src/pop.c:166
-msgid "Timestamp syntax error in greeting (not ASCII)\n"
-msgstr "Error de sintaxis a la marca de temps a la salutació (no ascii)\n"
+#: src/plugins/pgpmime/pgpmime.c:204
+msgid "Signature boundary not found."
+msgstr "Límit de la signatura no trobat."
 
-#: src/pop.c:190 src/pop.c:217
-msgid "POP3 protocol error\n"
-msgstr "Error del protocol POP3\n"
+#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:496
+msgid "Couldn't parse decrypted file."
+msgstr "No s'ha pogut parsejar l'arxiu desencriptat."
 
-#: src/pop.c:263
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "resposta UIDL invàlida: %s\n"
+#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:503
+msgid "Couldn't parse decrypted file parts."
+msgstr "No s'ha pogut parsejar les parts de l'arxiu desencriptat."
 
-#: src/pop.c:841
+#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
 #, c-format
-msgid "POP3: Deleting expired message %d [%s]\n"
-msgstr "POP3: Esborrant missatge caducat %d [%s]\n"
+msgid "Couldn't create temporary file: %s"
+msgstr "No s'ha pogut crear l'arxiu temporal: %s"
 
-#: src/pop.c:857
-#, c-format
-msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
-msgstr "POP3: Saltant-se missatge %d [%s](%d bytes)\n"
+#: src/plugins/pgpmime/pgpmime.c:595
+msgid "OpenPGP digital signature"
+msgstr "Signatura digital OpenPGP"
 
-#: src/pop.c:889
-msgid "mailbox is locked\n"
-msgstr "la bústia està bloquejada\n"
+#: src/plugins/pgpmime/pgpmime.c:617
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
+msgstr ""
+"Si us plau, adoneu-vos que les capçaleres del missatge, com pot ser "
+"l'Assumpte, no estan encriptades per el sistemaPGP/Mime."
 
-#: src/pop.c:892
-msgid "Session timeout\n"
-msgstr "Excedit el temps límit de la sessió\n"
+#: src/plugins/pgpmime/pgpmime.c:789
+msgid "PGP/Mime"
+msgstr "PGP/Mime"
 
-#: src/pop.c:911
-msgid "command not supported\n"
-msgstr "ordre no soportada\n"
+#: src/plugins/pgpmime/plugin.c:34
+msgid "PGP/MIME"
+msgstr "PGP/MIME"
 
-#: src/pop.c:916
-msgid "error occurred on POP3 session\n"
-msgstr "hi ha hagut un error a la sessió POP3\n"
+#: src/plugins/pgpmime/plugin.c:60
+msgid ""
+"This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
+"mails, verify signatures or sign and encrypt your own mails.\n"
+"\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account "
+"Preferences]/Privacy and when composing a message from /Options/Privacy "
+"System\n"
+"\n"
+"The plugin uses the GPGME library as a wrapper for GnuPG.\n"
+"\n"
+"GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
+msgstr ""
+"Aquest mòdul gestiona els correus signats i/o encriptats amb PGP/MIME. Podeu "
+"desencriptar correus, verificar signatures o signar i encriptar els correus "
+"propis.\n"
+"\n"
+"Podeu seleccionar-lo com al sistema de privacitat per defecte a /"
+"Configuració/[Preferències de Compte]/Privacitat i quan escrigueu un "
+"missatge desde /Opcions/Sistema de Privacitat\n"
+"\n"
+"El mòdul usa la llibreria GPGME com a encapsulació de GnuPG.\n"
+"\n"
+"GPGME és copyright 2001 per Werner Koch <dd9jn at gnu.org>"
 
-#: src/pop.c:1111
-msgid "TOP command unsupported\n"
-msgstr "ordre TOP no soportada\n"
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
+msgid "Python scripts"
+msgstr "Seqüències d'ordres Python"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
-msgid "POP3"
-msgstr "POP3"
+#: src/plugins/python/python_plugin.c:497
+msgid "Show Python console..."
+msgstr "Mostra la consola de Python"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
-msgid "IMAP4"
-msgstr "IMAP4"
+#: src/plugins/python/python_plugin.c:503
+msgid "Refresh"
+msgstr "Refrescar"
 
-#: src/prefs_account.c:338
-msgid "News (NNTP)"
-msgstr "Notícies (NNTP)"
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1195
+#: src/wizard.c:1610
+msgid "Browse"
+msgstr "Mostrar"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
-msgid "Local mbox file"
-msgstr "Arxiu mbox local"
+#: src/plugins/python/python_plugin.c:651
+#: src/plugins/python/python_plugin.c:733
+msgid "Python"
+msgstr "Python"
 
-#: src/prefs_account.c:340
-msgid "None (SMTP only)"
-msgstr "Cap (només SMTP)"
+#: src/plugins/python/python_plugin.c:657
+msgid "Failed to register \"compose create hook\" in the Python plugin"
+msgstr ""
+"Ha fallat el registre de \"composicó de creació del ganxo\" en el connector "
+"Python"
 
-#: src/prefs_account.c:1033
-msgid "Name of account"
-msgstr "Nom del compte"
+#: src/plugins/python/python_plugin.c:738
+msgid ""
+"This plugin provides Python integration features.\n"
+"Python code can be entered interactively into an embedded Python console, "
+"under Tools -> Show Python console, or stored in scripts.\n"
+"\n"
+"These scripts are then available via the menu. You can assign keyboard "
+"shortcuts to them just like it is done with other menu items. You can also "
+"put buttons for script invocation into the toolbars using Claws Mail's "
+"builtin toolbar editor.\n"
+"\n"
+"You can provide scripts working on the main window by placing files into ~/."
+"claws-mail/python-scripts/main.\n"
+"\n"
+"You can also provide scripts working on an open compose window by placing "
+"files into ~/.claws-mail/python-scripts/compose.\n"
+"\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
+"are automatically executed when certain events occur. Currently, the "
+"following files in this directory are recognised:\n"
+"\n"
+"compose_any\n"
+"Gets executed whenever a compose window is opened, no matter if that opening "
+"happened as a result of composing a new message, replying or forwarding a "
+"message.\n"
+"\n"
+"startup\n"
+"Executed at plugin load\n"
+"\n"
+"shutdown\n"
+"Executed at plugin unload\n"
+"\n"
+"\n"
+"For the most up-to-date API documentation, type\n"
+"\n"
+" help(clawsmail)\n"
+"\n"
+"in the interactive Python console.\n"
+"\n"
+"The source distribution of this plugin comes with various example scripts in "
+"the \"examples\" subdirectory. If you wrote a script that you would be "
+"interested in sharing, feel free to send it to me to have it considered for "
+"inclusion in the examples.\n"
+"\n"
+"Feedback to <berndth at gmx.de> is welcome."
+msgstr ""
+"Aquest plugin ofereix funcions d'integració de Python.\n"
+"Codi Python es pot introduir de forma interactiva en una consola de Python "
+"incrustat, a Eines -> Mostra consola de Python, o emmagatzemat en scripts.\n"
+"\n"
+"Aquestes seqüències d'ordres estaran disponibles a través del menú. Podeu "
+"assignar dreceres de teclat per a ells igual que es fa amb altres elements "
+"del menú. També pots posar botons per a la invocació de l'escriptura en les "
+"barres d'eines utilitzant l'editor de barra d'eines d'ordre interna de Claws "
+"Mail.\n"
+"\n"
+"Pot proporcionar els scripts que treballen a la finestra principal "
+"col·locant arxius a ~ /.claws-mail/python-scripts/main.\n"
+"\n"
+"També pot proporcionar guions de treball en una finestra de composició "
+"oberta mitjançant la col·locació d'arxius en ~ /.claws-mail/ python-scripts/"
+"compose.\n"
+"\n"
+"La carpeta ~ /.claws-mail/python-scripts/auto/ pot contenir algunes "
+"seqüències d'ordres que s'executen automàticament quan es produeixen "
+"determinats esdeveniments. Actualment, els següents arxius en aquest "
+"directori es reconeixen:\n"
+"\n"
+"compose_any\n"
+"És executat cada vegada que s'obre una finestra de redacció, no importa si "
+"aquesta obertura que va ocórrer com a resultat de compondre un nou missatge, "
+"respondre o reenviar un missatge.\n"
+"\n"
+"startup\n"
+"Executat amb càrrega del connector\n"
+"\n"
+"shutdown\n"
+"Executat en descàrrega del connector\n"
+"\n"
+"\n"
+"Per a la majoria de la documentació de l'API fins a la data, executa\n"
+"\n"
+" help(clawsmail)\n"
+"\n"
+"a la consola de Python interactiva.\n"
+"\n"
+"La distribució de codi font d'aquest plugin ve amb diversos scripts "
+"d'exemple en el \"exemples\" subdirectori. Si has fet un script i estaries "
+"interessat en compartir-lo, no dubtis a enviar-m'ho per tenir-ho en compte "
+"en els exemples.\n"
+"\n"
+"La teva opinió és benvinguda en <berndth at gmx.de>."
 
-#: src/prefs_account.c:1042
-msgid "Set as default"
-msgstr "Marcar com a primària"
+#: src/plugins/python/python_plugin.c:789
+msgid "Python integration"
+msgstr "Integració Python"
 
-#: src/prefs_account.c:1050
-msgid "Personal information"
-msgstr "Informació personal"
+#: src/plugins/rssyl/old_feeds.c:90
+#, c-format
+msgid ""
+"Couldn't read contents of old feeds.xml file:\n"
+"%s"
+msgstr ""
+"No s'ha pogut llegir el contingut del fitxer àntic feeds.xml:\n"
+"%s"
 
-#: src/prefs_account.c:1059
-msgid "Full name"
-msgstr "Nom complet"
+#: src/plugins/rssyl/opml_export.c:110
+#, c-format
+msgid "RSSyl: Error while writing '%s' to feed export list.\n"
+msgstr "RSSyl: No s'ha pogut escriure '%s' a la llista de canals exportats.\n"
 
-#: src/prefs_account.c:1065
-msgid "Mail address"
-msgstr "Adreça de correu"
+#: src/plugins/rssyl/opml_export.c:131
+#, c-format
+msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
+msgstr "RSSyl: No s'ha pogut esborrar el fitxer àntic OPML '%s': %s\n"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
-msgid "Auto-configure"
-msgstr "Configurar automàticament"
+#: src/plugins/rssyl/opml_export.c:141
+#, c-format
+msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
+msgstr "RSSyl: No s'ha pogut obrir el fitxer '%s' per al canal exportat: %s\n"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
-msgid "Cancel"
-msgstr "Cancel·lar"
+#: src/plugins/rssyl/opml_export.c:182
+msgid "RSSyl: Error during writing feed export file.\n"
+msgstr "RSSyl: Error al escriure el canal en el fitxer d'exportació.\n"
 
-#: src/prefs_account.c:1147
-#, fuzzy
+#: src/plugins/rssyl/opml_import.c:109
+#, c-format
 msgid ""
-"Warning: this version of Claws Mail\n"
-"has been built without IMAP and News support."
+"Error while subscribing feed\n"
+"%s\n"
+"\n"
+"Folder name '%s' is not allowed."
 msgstr ""
-"<span weight=\"bold\">Avís: aquesta versió de Claws Mail\n"
-"ha estat compilat sense suport IMAP ni suport per grups de Notícies.</span>"
-
-#: src/prefs_account.c:1176
-msgid "This server requires authentication"
-msgstr "Aquest servidor requereix autentificació"
-
-#: src/prefs_account.c:1183
-msgid "Authenticate on connect"
-msgstr "Autentificació al connectar"
+"Error al subscriure el canal\n"
+"%s\n"
+"\n"
+"No es permès el nom de carpeta '%s'."
 
-#: src/prefs_account.c:1237
-msgid "News server"
-msgstr "Servidor de news"
+#: src/plugins/rssyl/plugin.c:65
+msgid ""
+"This plugin allows you to create a mailbox tree where you can add newsfeeds "
+"in RSS 1.0, RSS 2.0 or Atom format.\n"
+"\n"
+"Each newsfeed will create a folder with appropriate entries, fetched from "
+"the web. You can read them, and delete or keep old entries."
+msgstr ""
+"Aquest mòdul us permet crear un arbre de bústies on podeu afegir feeds de "
+"noticies en format RSS 1.0, RSS 2.0 o Atom.\n"
+"\n"
+"Cada feed de notícies crearà una carpeta amb les entrades apropiades, "
+"obtingudes desde la web. Podeu llegir-les, esborrar-les o mantenir entrades "
+"antigues."
 
-#: src/prefs_account.c:1243
-msgid "Server for receiving"
-msgstr "Servidor de recepció"
+#: src/plugins/rssyl/plugin.c:89
+msgid "RSS feed"
+msgstr "Feed RSS"
 
-#: src/prefs_account.c:1249
-msgid "Local mailbox"
-msgstr "Bústia local"
+#: src/plugins/rssyl/rssyl_add_item.c:295
+msgctxt "Empty RSS feed title placeholder"
+msgid "(empty)"
+msgstr "(buit)"
 
-#: src/prefs_account.c:1256
-msgid "SMTP server (send)"
-msgstr "Servidor SMTP (enviar)"
+#: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
+msgid "Refresh all feeds"
+msgstr "Refrescar tots els feeds"
 
-#: src/prefs_account.c:1264
-msgid "Use mail command rather than SMTP server"
-msgstr "Useu commanda per correu enlloc de servidor SMTP"
+#: src/plugins/rssyl/rssyl_cb_menu.c:66
+msgid "Subscribe feed"
+msgstr "Subscriviu-vos al feed"
 
-#: src/prefs_account.c:1273
-msgid "command to send mails"
-msgstr "ordre per enviar els correus"
+#: src/plugins/rssyl/rssyl_cb_menu.c:67
+msgid "Input the URL of the news feed you wish to subscribe:"
+msgstr "Introduiu la URL dels nous feeds als que us volgueu subscriure:"
 
-#: src/prefs_account.c:1338
+#: src/plugins/rssyl/rssyl_cb_menu.c:100
 #, c-format
-msgid "Account%d"
-msgstr "Compte%d"
+msgid "'%c' can't be used in folder name."
+msgstr "No es pot utilitzar '%c' en el nom de la carpeta."
 
-#: src/prefs_account.c:1424
-msgid "Local"
-msgstr "Local"
+#: src/plugins/rssyl/rssyl_cb_menu.c:255
+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 necessita accés a la xarxa per actualitzar el canal."
+msgstr[1] "Claws Mail necessita accés a la xarxa per actualitzar els canals."
 
-#: src/prefs_account.c:1430 src/prefs_account.c:1519
-msgid "Default Inbox"
-msgstr "Bústia d'entrada per defecte"
+#: src/plugins/rssyl/rssyl_cb_menu.c:318
+#, c-format
+msgid "Really remove the feed tree `%s' ?\n"
+msgstr "Realment vols esborrar l'arbre del canal '%s'?\n"
 
-#: src/prefs_account.c:1437 src/prefs_account.c:1444 src/prefs_account.c:1526
-#: src/prefs_account.c:1533
-msgid "Unfiltered messages will be stored in this folder"
-msgstr "Els missatges sense filtrar es guardaran en aquesta carpeta"
+#: src/plugins/rssyl/rssyl_cb_menu.c:319
+msgid "Remove feed tree"
+msgstr "Esborra l'arbre del canal"
 
-#: src/prefs_account.c:1452
-msgid "Use secure authentication (APOP)"
-msgstr "Usar autentificació segura (APOP)"
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
+msgid "Select an OPML file"
+msgstr "Selecciona un fitxer OPML"
 
-#: src/prefs_account.c:1455
-msgid "Remove messages on server when received"
-msgstr "Esborrar missatges del servidor quan s'hagin rebut"
+#: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:155
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "No s'ha pogut crear la carpeta per les noticies del canal '%s'."
 
-#: src/prefs_account.c:1466
-msgid "Remove after"
-msgstr "Esborrar després de"
+#: src/plugins/rssyl/rssyl_feed.h:10
+#, c-format
+msgid "RSSyl: Subscribing new feed: %s\n"
+msgstr "RSSyl: Subcribint al new canal: %s\n"
 
-#: src/prefs_account.c:1473 src/prefs_account.c:1483
-msgid "0 days and 0 hours : remove immediately"
-msgstr "0 dies i 0 hores : esborrar immediatament"
+#: src/plugins/rssyl/rssyl_feed.h:11
+#, c-format
+msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
+msgstr "RSSyl: Subscripció al nou canal '%s' (%s)\n"
 
-#: src/prefs_account.c:1496
-msgid "Receive size limit"
-msgstr "Límit de tamany al rebre"
+#: src/plugins/rssyl/rssyl_feed.h:12
+#, c-format
+msgid "RSSyl: Updating feed: %s\n"
+msgstr "RSSyl: Actualitzan el canal: %s\n"
 
-#: src/prefs_account.c:1499
-msgid ""
-"Messages over this limit will be partially retrieved. When selecting them "
-"you will be able to download them fully or delete them."
-msgstr ""
-"Els missatges que sobrepassin aquest límit seran parcialment recuperats. "
-"Quan els seleccioneu podreu descarregar-los completament o esborrar-los"
+#: src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
+msgid "RSSyl: Feed update finished: %s\n"
+msgstr "RSSyl: Actualització del feed finalitzada: %s\n"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
-msgid "NNTP"
-msgstr "NNTP"
+#: src/plugins/rssyl/rssyl_feed.h:14
+#, c-format
+msgid "RSSyl: Error fetching feed at '%s': %s\n"
+msgstr "RSSyl: No s'ha pogut obtenir el canal en '%s': %s\n"
 
-#: src/prefs_account.c:1546
-msgid "Maximum number of articles to download"
-msgstr "Nmero màxim d'articles a descarregar"
+#: src/plugins/rssyl/rssyl_feed.h:15
+#, c-format
+msgid "RSSyl: No valid feed found at '%s'\n"
+msgstr "RSSyl: No s'ha trobat un canal valid en '%s'\n"
 
-#: src/prefs_account.c:1556
-msgid "unlimited if 0 is specified"
-msgstr "sense límit si s'especifica 0"
+#: src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
+msgid "RSSyl: Couldn't process feed at '%s'\n"
+msgstr "RSSyl: No s'ha pogut processar el canal n '%s'\n"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Cercar text:"
+#: src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
+msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
+msgstr ""
+"RSSyl: Aplicació està sortint, no va poder culminar l'actualització del "
+"canal en '%s'\n"
 
-#: src/prefs_account.c:1594
-msgid "IMAP server directory"
-msgstr "Directori del servidor IMAP"
+#: src/plugins/rssyl/rssyl_feed_props.c:274
+msgid "HTTP Basic authentication"
+msgstr "Autentificació basica HTTP"
 
-#: src/prefs_account.c:1598
-msgid "(usually empty)"
-msgstr "(normalment buït)"
+#: src/plugins/rssyl/rssyl_feed_props.c:291
+msgid "Use default refresh interval"
+msgstr "Usar l'interval de refresc per defecte"
 
-#: src/prefs_account.c:1612
-msgid "Show subscribed folders only"
-msgstr "Mostrar només les carpetes subscrites"
+#: src/plugins/rssyl/rssyl_feed_props.c:303
+msgid "Keep old items"
+msgstr "Mantenir els elements antics"
 
-#: src/prefs_account.c:1619
-msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
-msgstr "Mode d'ample de banda eficient (evita recuperar etiquetes remotes)"
+#: src/plugins/rssyl/rssyl_feed_props.c:309
+msgid "_Trim"
+msgstr "Re_tallar"
 
-#: src/prefs_account.c:1621
-msgid "This mode uses less bandwidth, but can be slower with some servers."
+#: src/plugins/rssyl/rssyl_feed_props.c:311
+msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
-"Aquest mode usa menys ample de banda, però pot ser més lent amb alguns "
-"servidors..."
-
-#: src/prefs_account.c:1628
-msgid "Filter messages on receiving"
-msgstr "Filtrar missatges al rebre"
-
-#: src/prefs_account.c:1635
-msgid "Allow filtering using plugins on receiving"
-msgstr "Permetre filtrar usant mòduls al rebre"
-
-#: src/prefs_account.c:1639
-msgid "'Get Mail' checks for new messages on this account"
-msgstr "'Rebre' comprova si hi ha nous missatges en aquest compte"
-
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
-msgid "Header"
-msgstr "Capçalera"
+"Actualització del canal, esborrant elements que ja no es troben en la font "
+"del canal"
 
-#: src/prefs_account.c:1722
-msgid "Generate Message-ID"
-msgstr "Generar Message-ID"
+#: src/plugins/rssyl/rssyl_feed_props.c:314
+msgid "Fetch comments if possible"
+msgstr "Obtenir els comentaris si es possible"
 
-#: src/prefs_account.c:1725
-msgid "Send account mail address in Message-ID"
-msgstr "Enviar adreça de correu dins el Message-ID"
+#: src/plugins/rssyl/rssyl_feed_props.c:339
+msgid "Always mark as new"
+msgstr "Sempre marca com a nou"
 
-#: src/prefs_account.c:1728
-msgid "Add user agent header"
-msgstr "Afegir capçalera Agent d'Usuari"
+#: src/plugins/rssyl/rssyl_feed_props.c:345
+msgid "If only its text changed"
+msgstr "Si nomes ha canviat el seu text"
 
-#: src/prefs_account.c:1735
-msgid "Add user-defined header"
-msgstr "Afegir capçaleres d'usuari"
+#: src/plugins/rssyl/rssyl_feed_props.c:351
+msgid "Never mark as new"
+msgstr "Mai marca com a nou"
 
-#: src/prefs_account.c:1750
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Autentificació SMTP (SMTP AUTH)"
+#: src/plugins/rssyl/rssyl_feed_props.c:356
+msgid "Add item title to top of message"
+msgstr "Afegeix el titól de l'element amunt del missatge"
+
+#: src/plugins/rssyl/rssyl_feed_props.c:363
+msgid "Ignore title rename"
+msgstr "Ignorar el rebateix del titól"
 
-#: src/prefs_account.c:1835
+#: src/plugins/rssyl/rssyl_feed_props.c:368
 msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
+"Enable this to keep current folder name, even if feed author changes title "
+"of the feed."
 msgstr ""
-"Si deixeu aquests camps buits, s'usarà el mateix ID d'usuari i contrasenya "
-"usats per a la recepció."
-
-#: src/prefs_account.c:1846
-msgid "Authenticate with POP3 before sending"
-msgstr "Autentificació amb POP3 abans d'enviar"
+"Activa això per mantenir el nom de la carpeta actual, fins i tot si l'autor "
+"canvia el títol del canal."
 
-#: src/prefs_account.c:1861
-msgid "POP authentication timeout: "
-msgstr "Temps límit per autentificació POP: "
+#: src/plugins/rssyl/rssyl_feed_props.c:372
+#: src/plugins/vcalendar/vcal_prefs.c:518
+msgid "Verify SSL certificate validity"
+msgstr "Cer_tificats SSL"
 
-#: src/prefs_account.c:1869
-msgid "minutes"
-msgstr "minuts"
+#: src/plugins/rssyl/rssyl_feed_props.c:388
+msgid "<b>Source URL:</b>"
+msgstr "<b>URL d'origen:</b>"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
-msgid "Signature"
-msgstr "Signatura"
+#: src/plugins/rssyl/rssyl_feed_props.c:410
+msgid "User name"
+msgstr "Nom d'usuari"
 
-#: src/prefs_account.c:1942
-msgid "Automatically insert signature"
-msgstr "Insertar signatura automàticament"
+#: src/plugins/rssyl/rssyl_feed_props.c:433
+msgid ""
+"<b>Fetch comments on posts aged less than:</b>\n"
+"<small>(In days; set to -1 to fetch all comments)</small>"
+msgstr ""
+"<b>Recupera comentaris afegit abans de :</b>\n"
+"<small>(En dies; escriu -1 per recuperar tots els comentaris)</small>"
 
-#: src/prefs_account.c:1947
-msgid "Signature separator"
-msgstr "Separador de signatura"
+#: src/plugins/rssyl/rssyl_feed_props.c:491
+msgid ""
+"<b>Refresh interval in minutes:</b>\n"
+"<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
+msgstr ""
+"<b>Interval de refresc en minuts:</b>\n"
+"<small>(Poseu a 0 per desactivar el refresc automàtic per aquest feed)</"
+"small>"
 
-#: src/prefs_account.c:1972
-msgid "Command output"
-msgstr "Sortida de l'ordre"
+#: src/plugins/rssyl/rssyl_feed_props.c:517
+msgid "<b>If an item changes, do not mark it as new:</b>"
+msgstr "<b>Si un element canvia, no marcar-lo com nou.</b>"
 
-#: src/prefs_account.c:2005
-msgid "Automatically set the following addresses"
-msgstr "Establir les següents adreces automàticament"
+#: src/plugins/rssyl/rssyl_feed_props.c:609
+msgid "_OK"
+msgstr "_OK"
 
-#: src/prefs_account.c:2057
-msgid "Spell check dictionaries"
-msgstr "Diccionaris de correcció ortogràfica"
+#: src/plugins/rssyl/rssyl_feed_props.c:617
+msgid "Set feed properties"
+msgstr "Informar les propietat del feed"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
-#: src/prefs_spelling.c:163
-msgid "Default dictionary"
-msgstr "Diccionari per omissió"
+#: src/plugins/rssyl/rssyl_gtk.c:48
+msgid "_Refresh feed"
+msgstr "_Refrescar el feed"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
-#: src/prefs_spelling.c:176
-msgid "Default alternate dictionary"
-msgstr "Diccionari alternatiu per omissió"
+#: src/plugins/rssyl/rssyl_gtk.c:49
+msgid "Feed pr_operties"
+msgstr "Pr_opietats del Canal"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
-#: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
-msgid "Compose"
-msgstr "Composar"
+#: src/plugins/rssyl/rssyl_gtk.c:50
+msgid "Rena_me..."
+msgstr "Reno_mbrar..."
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
-#: src/toolbar.c:409
-msgid "Reply"
-msgstr "Respondre"
+#: src/plugins/rssyl/rssyl_gtk.c:51
+msgid "R_efresh recursively"
+msgstr "Actualitza r_ecursivament"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
-msgid "Forward"
-msgstr "Reenviar"
+#: src/plugins/rssyl/rssyl_gtk.c:52
+msgid "Subscribe _new feed..."
+msgstr "Subscriure's al _nou feed..."
 
-#: src/prefs_account.c:2243
-msgid "Default privacy system"
-msgstr "Sistema de privacitat per omissió"
+#: src/plugins/rssyl/rssyl_gtk.c:53
+msgid "Create new _folder..."
+msgstr "Crear _nova carpeta..."
 
-#: src/prefs_account.c:2272
-msgid "Always sign messages"
-msgstr "Sempre missatges signats"
+#: src/plugins/rssyl/rssyl_gtk.c:54
+msgid "Import feed list..."
+msgstr "Importar una llista de feeds..."
 
-#: src/prefs_account.c:2274
-msgid "Always encrypt messages"
-msgstr "Sempre missatges encriptats"
+#: src/plugins/rssyl/rssyl_gtk.c:56
+msgid "Remove tree"
+msgstr "Esborra l'arbre"
 
-#: src/prefs_account.c:2276
-msgid "Always sign messages when replying to a signed message"
-msgstr "Encriptar missatges sempre que se'n contesti un d'escriptat"
+#: src/plugins/rssyl/rssyl_gtk.c:126
+msgid "Add RSS folder tree"
+msgstr "Afegir arbre de carpetes per RSS"
 
-#: src/prefs_account.c:2279
-msgid "Always encrypt messages when replying to an encrypted message"
-msgstr "Encriptar missatges sempre que se'n contesti un escriptat"
+#: src/plugins/rssyl/rssyl_gtk.c:127
+msgid "Enter name for a new RSS folder tree."
+msgstr "Introduïu un nom per a un nou arbre de carpetes per RSS."
 
-#: src/prefs_account.c:2282
-msgid "Encrypt sent messages with your own key in addition to recipient's"
+#: src/plugins/rssyl/rssyl_gtk.c:143
+msgid ""
+"Creation of folder tree failed.\n"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
 msgstr ""
-"Encriptar els missatges enviats amb la vostra pròpia clau a més de la del "
-"destinatari"
+"La creació de l'arbre de carpetes ha fallat.\n"
+"Potser alguns arxius ja existeixen, o potser es perquè no teniu permisos "
+"d'escriptura?"
 
-#: src/prefs_account.c:2284
-msgid "Save sent encrypted messages as clear text"
-msgstr "Desar en clar els missatges enviats encriptats"
+#: src/plugins/rssyl/rssyl.h:17
+msgid "My Feeds"
+msgstr "Els meus feeds"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
-msgid "Don't use SSL"
-msgstr "No usar SSL"
+#: src/plugins/rssyl/rssyl_prefs.c:111
+msgid "Select cookies file"
+msgstr "Selecciona el fitxer de galetes"
 
-#: src/prefs_account.c:2443
-msgid "Use SSL for POP3 connection"
-msgstr "Usar SSL per a la connexió POP3"
+#: src/plugins/rssyl/rssyl_prefs.c:141
+msgid "Default refresh interval"
+msgstr "Interval d'actualització per defecte"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Usar l'ordre STARTTLS per obrir la sessió SSL"
+#: src/plugins/rssyl/rssyl_prefs.c:161
+msgid "Refresh all feeds on application start"
+msgstr "Refrescar tots els feed a l'iniciar l'aplicació"
 
-#: src/prefs_account.c:2458
-msgid "Use SSL for IMAP4 connection"
-msgstr "Usar SSL per a la connexió IMAP4"
+#: src/plugins/rssyl/rssyl_prefs.c:170
+msgid "Verify SSL certificates validity for new feeds"
+msgstr "Verifica els certificats SSL pels nous canals"
 
-#: src/prefs_account.c:2478
-msgid "Use SSL for NNTP connection"
-msgstr "Usar SSL per a la connexió NNTP"
+#: src/plugins/rssyl/rssyl_prefs.c:177
+msgid "Path to cookies file"
+msgstr "Ruta a l'arxiu de les cookies"
 
-#: src/prefs_account.c:2482
-msgid "Send (SMTP)"
-msgstr "Enviar (SMTP)"
+#: src/plugins/rssyl/rssyl_prefs.c:184
+msgid "Path to Netscape-style cookies.txt file containing your cookies"
+msgstr ""
+"Ruta a l'arxiu d'estil Netscape cookies.txt que conté les vostres cookies"
 
-#: src/prefs_account.c:2486
-msgid "Don't use SSL (but, if necessary, use STARTTLS)"
-msgstr "No usar SSL (però usar STARTTLS si és necessari)"
+#: src/plugins/rssyl/rssyl_prefs.c:195
+msgid "Refreshing"
+msgstr "Actualitzant"
 
-#: src/prefs_account.c:2489
-msgid "Use SSL for SMTP connection"
-msgstr "Usar SSL per a la connexió SMTP"
+#: src/plugins/rssyl/rssyl_prefs.c:199
+msgid "Security and privacy"
+msgstr "Seguretat i Privadesa"
 
-#: src/prefs_account.c:2497
-msgid "Client certificates"
-msgstr "Certificats del client"
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
+msgid "Subscribe new feed?"
+msgstr "Subscriure's el nou canal?"
 
-#: src/prefs_account.c:2505
-msgid "Certificate for receiving"
-msgstr "Servidor per recepció"
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
+msgid "<b>Feed folder:</b>"
+msgstr "<b>Carpeta del Canal:</b>"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
-msgid "Client certificate file as a PKCS12 or PEM file"
-msgstr "Certificat de client com a arxiu PKCS12 o PEM"
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
+msgid ""
+"Instead of using official title, you can enter a different folder name for "
+"the feed."
+msgstr ""
+"En lloc d'utilitzar el títol oficial, pots fer servir un nom diferent per a "
+"la carpeta del canal."
 
-#: src/prefs_account.c:2527
-msgid "Certificate for sending"
-msgstr "Certificat per enviar"
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
+msgid "_Edit feed properties after subscribing"
+msgstr "_Editar les propietats del canal després de subscriure's"
 
-#: src/prefs_account.c:2560
-#, fuzzy
-msgid "Automatically accept valid SSL certificates"
-msgstr "Accepta automàticament els certificats SSL vàlids desconeguts"
+#: src/plugins/rssyl/rssyl_update_comments.c:105
+#, c-format
+msgid "Updating comments for '%s'..."
+msgstr "Actualitzant els comentaris per '%s'..."
 
-#: src/prefs_account.c:2563
-msgid "Use non-blocking SSL"
-msgstr "Usar SSL no-bloquejant"
+#: src/plugins/rssyl/rssyl_update_feed.c:105
+#: src/plugins/vcalendar/vcal_folder.c:1598
+msgid "401 (Authorisation required)"
+msgstr "401 (Autorització requerida)"
 
-#: src/prefs_account.c:2575
-msgid "Turn this off if you have SSL connection problems"
-msgstr "Desactiveu això si teniu problemes de connexió amb SSL"
+#: src/plugins/rssyl/rssyl_update_feed.c:108
+#: src/plugins/vcalendar/vcal_folder.c:1601
+msgid "403 (Unauthorised)"
+msgstr "403 (No autoritzat)"
 
-#: src/prefs_account.c:2693
-msgid "SMTP port"
-msgstr "Port SMTP"
+#: src/plugins/rssyl/rssyl_update_feed.c:111
+#: src/plugins/vcalendar/vcal_folder.c:1604
+msgid "404 (Not found)"
+msgstr "404 (No trobat)"
 
-#: src/prefs_account.c:2700
-msgid "POP3 port"
-msgstr "Port POP3"
+#: src/plugins/rssyl/rssyl_update_feed.c:114
+#, c-format
+msgid "Error %d"
+msgstr "Error %d"
 
-#: src/prefs_account.c:2707
-msgid "IMAP4 port"
-msgstr "Port IMAP4"
+#: src/plugins/rssyl/rssyl_update_feed.c:127
+#, c-format
+msgctxt "First parameter is URL, second is error text"
+msgid ""
+"Error fetching feed at\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
+msgstr ""
+"No s'ha pogut obtenir el canal a\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
 
-#: src/prefs_account.c:2714
-msgid "NNTP port"
-msgstr "Port NNTP"
+#: src/plugins/rssyl/rssyl_update_feed.c:142
+#, c-format
+msgid ""
+"No valid feed found at\n"
+"<b>%s</b>"
+msgstr ""
+"No s'ha trobat un canal valid en\n"
+"<b>%s</b>"
+
+#: src/plugins/rssyl/rssyl_update_feed.c:224
+#, c-format
+msgid "Updating feed '%s'..."
+msgstr "Actualitzant el canal '%s'..."
+
+#: src/plugins/rssyl/rssyl_update_feed.c:246
+#, c-format
+msgid ""
+"Couldn't process feed at\n"
+"<b>%s</b>\n"
+"\n"
+"Please contact developers, this should not happen."
+msgstr ""
+"No s'ha pogut procesar els canals a\n"
+"<b>%s</b>\n"
+"\n"
+"Si us plau, poseu-vos en contacte amb els desenvolupadors, això no hauria de "
+"succeir."
 
-#: src/prefs_account.c:2720
-msgid "Domain name"
-msgstr "Nom del domini"
+#: src/plugins/rssyl/rssyl_update_feed.c:330
+msgid "Claws Mail needs network access in order to update your feeds."
+msgstr ""
+"Claws Mail necessita tenir accés a la xarxa per tal d'actualitzar els seus "
+"canals."
 
-#: src/prefs_account.c:2723
+#: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
-"The domain name will be used in the generated Message-ID, and when "
-"connecting to SMTP servers."
+"Internal problem while upgrading storage format. This should not happen. "
+"Please report this, with debug output attached.\n"
 msgstr ""
-"El nom del domini serà usat al Message-ID generat i al connectar a servidors "
-"SMTP."
-
-#: src/prefs_account.c:2737
-msgid "Use command to communicate with server"
-msgstr "Usar comanda per a comunicar-se amb el servidor"
+"Problema intern mentre s'actualitza el format d'emmagatzematge. Això no "
+"hauria de succeir. Si us plau aviseu-nos incloent el resultat de la "
+"depuració adjunta.\n"
 
-#: src/prefs_account.c:2745
-msgid "Move deleted mails to trash and expunge immediately"
-msgstr "Moure correus esborrats a la paperera i purgar immediatament"
+#: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
+#: src/plugins/smime/smime.c:911
+msgid "S/MIME"
+msgstr "S/MIME"
 
-#: src/prefs_account.c:2747
+#: src/plugins/smime/plugin.c:59
 msgid ""
-"Moves deleted mails to trash instead of using the \\Deleted flag without "
-"expunging."
+"This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
+"mails, verify signatures or sign and encrypt your own mails.\n"
+"\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account "
+"Preferences]/Privacy and when composing a message from /Options/Privacy "
+"System\n"
+"\n"
+"This plugin uses the GPGME library as a wrapper for GnuPG.\n"
+"This plugin also needs gpgsm, gnupg-agent and dirmngr installed and "
+"configured.\n"
+"\n"
+"Information about how to get S/MIME certificates working with GPGSM can be "
+"found at:\n"
+"http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
+"\n"
+"GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Moure correus esborrats a la paperera enlloc d'usar el \\Marca d'esborrat "
-"sense expurgar."
-
-#: src/prefs_account.c:2751
-msgid "Mark cross-posted messages as read and color:"
-msgstr "Marcar els misstages creuats com a llegits i de color:"
-
-#: src/prefs_account.c:2807
-msgid "Put sent messages in"
-msgstr "Posar missatges enviats a"
-
-#: src/prefs_account.c:2809
-msgid "Put queued messages in"
-msgstr "Posar missatges encuats a"
-
-#: src/prefs_account.c:2811
-msgid "Put draft messages in"
-msgstr "Posar borradors de missatges a"
-
-#: src/prefs_account.c:2813
-msgid "Put deleted messages in"
-msgstr "Posar missatges esborrats a"
-
-#: src/prefs_account.c:2873
-msgid "Account name is not entered."
-msgstr "No s'ha especificat el nom del compte."
-
-#: src/prefs_account.c:2877
-msgid "Mail address is not entered."
-msgstr "No s'ha especificat l'adreça de correu."
-
-#: src/prefs_account.c:2884
-msgid "SMTP server is not entered."
-msgstr "No s'ha especificat el servidor SMTP."
-
-#: src/prefs_account.c:2889
-msgid "User ID is not entered."
-msgstr "No s'ha especificat l'usuari."
-
-#: src/prefs_account.c:2894
-msgid "POP3 server is not entered."
-msgstr "No s'ha especificat el servidor POP3."
-
-#: src/prefs_account.c:2914
-msgid "The default Inbox folder doesn't exist."
-msgstr "La bústia d'entrada per omissió no existeix."
+"Aquest mòdul gestiona els correus signats i/o encriptats amb S/MIME. Podeu "
+"desencriptar correus, verificar signatures o signar i encriptar els correus "
+"propis.\n"
+"\n"
+"Podeu seleccionar-lo com al sistema de privacitat per defecte a /"
+"Configuració/[Preferències de Compte]/Privacitat i quan escrigueu un "
+"missatge desde /Opcions/Sistema de Privacitat\n"
+"\n"
+"Aquest mòdul usa la llibreria GPGME com a encapsulació de GnuPG.\n"
+"Aquest mòdul també necesita que gpgsm, gnupg-agent i dirmngr estiguin "
+"instal·lats i configurats.\n"
+"\n"
+"Podeu trobar informació sobre com obtenir certificats S/MIME treballant amb "
+"GPGSM a:\n"
+"http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
+"\n"
+"GPGME és copyright 2001 per Werner Koch <dd9jn at gnu.org>"
 
-#: src/prefs_account.c:2920
-msgid "IMAP4 server is not entered."
-msgstr "No s'ha especificat el servidor IMAP4."
+#: src/plugins/smime/smime.c:423
+#, c-format
+msgid "Couldn't set GPG protocol, %s"
+msgstr "No s'ha pogut establir el protocol GPG, %s"
 
-#: src/prefs_account.c:2925
-msgid "NNTP server is not entered."
-msgstr "No s'ha especificat el servidor NNTP."
+#: src/plugins/smime/smime.c:451
+msgid "Couldn't open temporary file"
+msgstr "No s'ha pogut obrir l'arxiu temporal"
 
-#: src/prefs_account.c:2931
-msgid "local mailbox filename is not entered."
-msgstr "no s'ha especificat el nom de l'arxiu de la bústia local."
+#: src/plugins/smime/smime.c:462 src/plugins/smime/smime.c:477
+msgid "Couldn't write to temporary file"
+msgstr "No s'ha pogut escriure a l'arxiu temporal"
 
-#: src/prefs_account.c:2937
-msgid "mail command is not entered."
-msgstr "no s'ha especificat la comanda de correu."
+#: src/plugins/smime/smime.c:488
+msgid "Couldn't close temporary file"
+msgstr "No s'ha pogut tancar l'arxiu temporal"
 
-#: src/prefs_account.c:3254
-msgid "Receive"
-msgstr "Rebre"
+#: src/plugins/smime/smime.c:708
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the S/"
+"MIME system."
+msgstr ""
+"Si us plau, adoneu-vos que les capçaleres del missatge, com pot ser "
+"l'Assumpte, no estan encriptades per el sistema S/Mime."
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
-msgid "Templates"
-msgstr "Plantilles"
+#: src/plugins/spam_report/spam_report.c:293
+msgid "Reporting spam..."
+msgstr "Reportant correu brossa..."
 
-#: src/prefs_account.c:3326
-msgid "Privacy"
-msgstr "Privacitat"
+#: src/plugins/spam_report/spam_report.c:328
+msgid "Report spam online..."
+msgstr "Reportar correu brossa en línia..."
 
-#: src/prefs_account.c:3437
-msgid "Advanced"
-msgstr "Avançades"
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
+msgid "SpamReport"
+msgstr "InformeCorreuBrossa"
 
-#: src/prefs_account.c:3728
-msgid "Preferences for new account"
-msgstr "Preferències per a un nou compte"
+#: src/plugins/spam_report/spam_report.c:382
+msgid ""
+"This plugin reports spam to various places.\n"
+"Currently the following sites or methods are supported:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * lists.debian.org nomination system"
+msgstr ""
+"Aquest mòdul reporta correu brossa a diferents localitzacions.\n"
+"Actualment els següents sites o mètodes són suportats:\n"
+"\n"
+" * spam-signal.fr\n"
+" * spamcop.net\n"
+" * Systema de nominacions lists.debian.org"
 
-#: src/prefs_account.c:3730
-#, c-format
-msgid "%s - Account preferences"
-msgstr "%s - Preferències del compte"
+#: src/plugins/spam_report/spam_report.c:407
+msgid "Spam reporting"
+msgstr "Informe de Correu Brossa"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
-msgid "Failed (wrong address)"
-msgstr "Ha fallat (adreça incorrecte)"
+#: src/plugins/spam_report/spam_report_prefs.c:122
+msgid "Enabled"
+msgstr "Activat"
 
-#: src/prefs_account.c:3936
-msgid "Select signature file"
-msgstr "Seleccionar arxiu de signatura"
+#: src/plugins/spam_report/spam_report_prefs.c:149
+msgid "Forward to:"
+msgstr "Reenvia a:"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
-msgid "Select certificate file"
-msgstr "Seleccionar arxiu de certificat"
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1558
+msgid "Password:"
+msgstr "Contrasenya:"
 
-#: src/prefs_account.c:4067
-msgid "Protocol:"
-msgstr "Protocol:"
+#: src/plugins/spamassassin/spamassassin.c:77
+#: src/plugins/spamassassin/spamassassin_gtk.c:649
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
 
-#: src/prefs_account.c:4207
-#, c-format
-msgid "%s (plugin not loaded)"
-msgstr "%s (mòdul no carregat)"
+#: src/plugins/spamassassin/spamassassin.c:169
+msgid "SpamAssassin plugin couldn't connect to spamd.\n"
+msgstr "Spamassassin no pot connectar amb spamd.\n"
 
-#: src/prefs_actions.c:223
-msgid "Actions configuration"
-msgstr "Configuració d'accions"
+#: src/plugins/spamassassin/spamassassin.c:185
+msgid "SpamAssassin plugin filtering failed.\n"
+msgstr "Ha fallat el filtratge del mòdul SpamAssassin.\n"
 
-#: src/prefs_actions.c:250
-msgid "Menu name"
-msgstr "Nom de menú"
+#: src/plugins/spamassassin/spamassassin.c:238
+msgid "SpamAssassin plugin is disabled by its preferences.\n"
+msgstr "El mòdul Spamassassin està deshabilitat per les seves preferències.\n"
 
-#: src/prefs_actions.c:283
-msgid "Shell command"
-msgstr "Comanda de shell"
+#: src/plugins/spamassassin/spamassassin.c:243
+msgid "SpamAssassin: filtering message..."
+msgstr "SpamAssassin: filtrant missatge..."
 
-#: src/prefs_actions.c:293
-msgid "Filter action"
-msgstr "Acció de filtrat"
+#: src/plugins/spamassassin/spamassassin.c:372
+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 "
+"accessible."
+msgstr ""
+"El mòdul SpamAssassin no pot filtrar el missatge. La causa més probable de "
+"l'error es que no s'hagi pogut arribar al dimoni spamd. Si us plau, "
+"assegureu-vos de que spamd séstà executant i és accessible."
 
-#: src/prefs_actions.c:299
-msgid "Edit filter action"
-msgstr "Editar acció de filtrat"
+#: src/plugins/spamassassin/spamassassin.c:429
+msgid ""
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
+"learner."
+msgstr ""
+"Claws Mail necessita accés a xarxa per enviar aquest correu al programa "
+"d'aprenentatge remot."
 
-#: src/prefs_actions.c:327
-msgid "Append the new action above to the list"
-msgstr "Afegir la nova acció a sobre de la llista"
+#: src/plugins/spamassassin/spamassassin.c:574
+msgid "Failed to get username"
+msgstr "Ha fallat la recepció del nom d'usuari"
 
-#: src/prefs_actions.c:335
-msgid "Replace the selected action in list with the action above"
-msgstr "Substituïr l'acció seleccionada a la llista amb la acció de dalt"
+#: src/plugins/spamassassin/spamassassin.c:586
+msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
+msgstr ""
+"El mòdul Spamassassin està carregat però deshabilitat per les seves "
+"preferències.\n"
 
-#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:779 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1056
-msgid "Re_move"
-msgstr "Es_borrar"
+#: src/plugins/spamassassin/spamassassin.c:620
+msgid ""
+"This plugin can check all messages that are received from an IMAP, LOCAL or "
+"POP account for spam using a SpamAssassin server. You will need a "
+"SpamAssassin Server (spamd) running somewhere.\n"
+"\n"
+"It can also be used for marking messages as Ham or Spam.\n"
+"\n"
+"When a message is identified as spam it can be deleted or saved in a "
+"specially designated folder.\n"
+"\n"
+"Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
+msgstr ""
+"Aquest mòdul pot comprovar tots els missatges que son rebuts desde un compte "
+"IMAP, LOCAL o POP si són spam amb un servidor SpamAssassin. Necessitareu "
+"unservidor SpamAssassin (spamd) executant-se en alguna màquina.\n"
+"\n"
+"També pot ser usat per marcar els missatges con a bons o dolents(Spam).\n"
+"\n"
+"Quan un missatge s'identifica com a spam es pot esborrar o es pot desar en "
+"una carpeta especial.\n"
+"\n"
+"Les opcions les podeu trobar a /Configuració/Preferències/Connectors/"
+"SpamAssassin"
 
-#: src/prefs_actions.c:345
-msgid "Delete the selected action from the list"
-msgstr "Esborrar l'acció seleccionada de la llista"
+#: src/plugins/spamassassin/spamassassin_gtk.c:91
+msgid "Localhost"
+msgstr "Màquina local"
 
-#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:338
-msgid "Clear all the input fields in the dialog"
-msgstr "Netejar tots els camps d'entrada dins el diàleg"
+#: src/plugins/spamassassin/spamassassin_gtk.c:92
+msgid "TCP"
+msgstr "TCP"
 
-#: src/prefs_actions.c:363
-msgid "Show information on configuring actions"
-msgstr "Mostrar informació a les accions de configuració"
+#: src/plugins/spamassassin/spamassassin_gtk.c:93
+msgid "Unix Socket"
+msgstr "Socket Unix"
 
-#: src/prefs_actions.c:394
-msgid "Move the selected action up"
-msgstr "Moure l'acció seleccionada amunt"
+#: src/plugins/spamassassin/spamassassin_gtk.c:269
+msgid "Enable SpamAssassin plugin"
+msgstr "Activar mòdul SpamAssassin"
 
-#: src/prefs_actions.c:402
-msgid "Move selected action down"
-msgstr "Moure l'acció seleccionada avall"
+#: src/plugins/spamassassin/spamassassin_gtk.c:273
+msgid "Transport"
+msgstr "Transport"
 
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
-#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:896
-#: src/prefs_template.c:472
-msgid "(New)"
-msgstr "(Nova)"
+#: src/plugins/spamassassin/spamassassin_gtk.c:281
+msgid "Type of transport"
+msgstr "Tipus de transport"
 
-#: src/prefs_actions.c:600
-msgid "Menu name is not set."
-msgstr "No s'ha establert el nom del men."
+#: src/plugins/spamassassin/spamassassin_gtk.c:302
+msgid "User"
+msgstr "Usuari"
 
-#: src/prefs_actions.c:605
-msgid "A leading '/' is not allowed in the menu name."
-msgstr "No es permet '/' a l'inici del nom del menú."
+#: src/plugins/spamassassin/spamassassin_gtk.c:315
+msgid "User to use with spamd server"
+msgstr "Usuari a usar amb el servidor spamd"
 
-#: src/prefs_actions.c:610
-msgid "Colon ':' is not allowed in the menu name."
-msgstr "No es permet ':' (dos punts) en el nom del menú."
+#: src/plugins/spamassassin/spamassassin_gtk.c:317
+msgid "spamd"
+msgstr "spamd"
 
-#: src/prefs_actions.c:616
-msgid "There is an action with this name already."
-msgstr "Ja existeix una acció amb aquest mateix nom."
+#: src/plugins/spamassassin/spamassassin_gtk.c:335
+msgid "Hostname or IP address of spamd server"
+msgstr "Nom o adreça IP del servidor spamd"
 
-#: src/prefs_actions.c:635
-msgid "Menu name is too long."
-msgstr "El nom del menú és masssa llarg."
+#: src/plugins/spamassassin/spamassassin_gtk.c:346
+msgid "Port of spamd server"
+msgstr "Port del servidor spamd"
 
-#: src/prefs_actions.c:644
-msgid "Command-line not set."
-msgstr "Línia de comandes no especificada."
+#: src/plugins/spamassassin/spamassassin_gtk.c:352
+msgid "Path of Unix socket"
+msgstr "Ruta al socket Unix"
 
-#: src/prefs_actions.c:649
-msgid "Menu name and command are too long."
-msgstr "El nom del menú i la comanda són massa llargs."
+#: src/plugins/spamassassin/spamassassin_gtk.c:387
+msgid ""
+"Maximum time allowed for checking. If the check takes longer it will be "
+"aborted."
+msgstr ""
+"Temps màxim permès per a la comprovació. Si la comprovació dura més aquesta "
+"serà cancel·lada."
 
-#: src/prefs_actions.c:655
+#: src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
 msgid ""
-"The command\n"
+"\n"
+"Claws Mail TNEF parser:\n"
+"\n"
 "%s\n"
-"has a syntax error."
 msgstr ""
-"La comanda\n"
+"\n"
+"Parser TNEF de Claws Mail:\n"
+"\n"
 "%s\n"
-"té errors sintàctics."
-
-#: src/prefs_actions.c:713
-msgid "Delete action"
-msgstr "Esborrar acció"
-
-#: src/prefs_actions.c:714
-msgid "Do you really want to delete this action?"
-msgstr "Realment vols esborrar aquesta acció?"
-
-#: src/prefs_actions.c:734
-msgid "Delete all actions"
-msgstr "Esborrar totes les accions"
-
-#: src/prefs_actions.c:735
-msgid "Do you really want to delete all the actions?"
-msgstr "Realment vols esborrar totes les accions?"
-
-#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
-msgid "Entry not saved"
-msgstr "Entrada no desada"
-
-#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
-msgid "The entry was not saved. Close anyway?"
-msgstr "L'entrada no s'ha desat. Tancar de totes maneres?"
 
-#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
-#: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
-#, fuzzy
-msgid "_Continue editing"
-msgstr "+_Continuar editant"
+#: src/plugins/tnef_parse/tnef_parse.c:122
+#: src/plugins/tnef_parse/tnef_parse.c:129
+msgid "Failed to write the part data."
+msgstr "Error al escriure les dades de part."
 
-#: src/prefs_actions.c:903
-msgid "Actions list not saved"
-msgstr "Llista d'accions no desades"
+#: src/plugins/tnef_parse/tnef_parse.c:174
+msgid "Failed to parse VCalendar data."
+msgstr "Error al parsejar les dades de VCalendar."
 
-#: src/prefs_actions.c:904
-msgid "The actions list has been modified. Close anyway?"
-msgstr "La llista d'accions ha estat modificada. Tancar de totes maneres?"
+#: src/plugins/tnef_parse/tnef_parse.c:213
+msgid "Failed to parse VTask data."
+msgstr "Error al parsejar les dades de VTask."
 
-#: src/prefs_actions.c:974
-msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
-msgstr "<span weight=\"bold\" underline=\"single\">Nom de menú:</span>"
+#: src/plugins/tnef_parse/tnef_parse.c:263
+msgid "Failed to parse VCard data."
+msgstr "Error al parsejar les dades de VCard."
 
-#: src/prefs_actions.c:975
-msgid "Use / in menu name to make submenus."
-msgstr "Useu / en el nom de menú per crear submens."
+#: src/plugins/tnef_parse/tnef_parse.c:399
+#: src/plugins/tnef_parse/tnef_parse.c:423
+msgid "TNEF Parser"
+msgstr "Parsejador TNEF"
 
-#: src/prefs_actions.c:977
-msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
-msgstr "<span weight=\"bold\" underline=\"single\">Línia de comandes:</span>"
+#: src/plugins/tnef_parse/tnef_parse.c:428
+msgid ""
+"This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
+"\n"
+"The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall "
+"Hand <yerase at yerot.com>"
+msgstr ""
+"Aquest mòdul de Claws Mail us permet llegir adjunts application/ms-tnef.\n"
+"\n"
+"El mòdul usa la llibreria Ytnef, la qual té copyright 2002-2007 per Randall "
+"Hand <yerase at yerot.com>"
 
-#: src/prefs_actions.c:978
-msgid "<span weight=\"bold\">Begin with:</span>"
-msgstr "<span weight=\"bold\">Començar amb:</span>"
+#: src/plugins/vcalendar/common-views.c:62
+msgid "_Edit this meeting..."
+msgstr "_Editar aquesta reunió..."
 
-#: src/prefs_actions.c:979
-msgid "to send message body or selection to command's standard input"
-msgstr "per enviar el missatge o la selecció a l'entrada standard de l'ordre"
+#: src/plugins/vcalendar/common-views.c:63
+msgid "_Cancel this meeting..."
+msgstr "_Cancel·lar aquesta reunió..."
 
-#: src/prefs_actions.c:980
-msgid "to send user provided text to command's standard input"
-msgstr "per enviar el text d'usuari a l'entrada estàndard de l'ordre"
+#: src/plugins/vcalendar/common-views.c:65
+msgid "_Create new meeting..."
+msgstr "_Crear una nova reunió..."
 
-#: src/prefs_actions.c:981
-msgid "to send user provided hidden text to command's standard input"
-msgstr "per enviar el text d'usuari ocult a l'entrada estàndard de l'ordre"
+#: src/plugins/vcalendar/common-views.c:67
+msgid "_Go to today"
+msgstr "_Anar a avui"
 
-#: src/prefs_actions.c:982
-msgid "<span weight=\"bold\">End with:</span>"
-msgstr "<span weight=\"bold\">Finalitzar amb:</span>"
+#: src/plugins/vcalendar/day-view.c:593 src/plugins/vcalendar/month-view.c:690
+msgid "Start"
+msgstr "Inici"
 
-#: src/prefs_actions.c:983
-msgid "to replace message body or selection with command's standard output"
-msgstr ""
-"per reemplaçar el missatge o selecció amb la sortida estàndard de l'ordre"
+#: src/plugins/vcalendar/day-view.c:606 src/plugins/vcalendar/month-view.c:703
+msgid "Show"
+msgstr "Mostrar"
 
-#: src/prefs_actions.c:984
-msgid "to insert command's standard output without replacing old text"
-msgstr "per insertar la sortida estàndard de l'ordre sense reemplaçar el text"
+#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:560
+#: src/prefs_matcher.c:336
+msgid "days"
+msgstr "dies"
 
-#: src/prefs_actions.c:985
-msgid "to run command asynchronously"
-msgstr "per executar l'ordre de manera asíncrona"
+#: src/plugins/vcalendar/month-view.c:109
+msgid "Monday"
+msgstr "Dilluns"
 
-#: src/prefs_actions.c:986
-msgid "<span weight=\"bold\">Use:</span>"
-msgstr "<span weight=\"bold\">Usar:</span>"
+#: src/plugins/vcalendar/month-view.c:110
+msgid "Tuesday"
+msgstr "dimarts"
 
-#: src/prefs_actions.c:987
-msgid "for the file of the selected message in RFC822/2822 format "
-msgstr "per a l'arxiu del missatge seleccionat en format RFC822/2822 "
+#: src/plugins/vcalendar/month-view.c:111
+msgid "Wednesday"
+msgstr "dimecres"
 
-#: src/prefs_actions.c:988
-msgid ""
-"for the list of the files of the selected messages in RFC822/2822 format"
-msgstr ""
-"per a la llista de noms dels missatges seleccionats en format RFC822/2822"
+#: src/plugins/vcalendar/month-view.c:112
+msgid "Thursday"
+msgstr "dijous"
 
-#: src/prefs_actions.c:989
-msgid "for the file of the selected decoded message MIME part"
-msgstr "per a l'arxiu de la part MIME seleccionada del missatge decodificat"
+#: src/plugins/vcalendar/month-view.c:113
+msgid "Friday"
+msgstr "divendres"
 
-#: src/prefs_actions.c:990
-msgid "for a user provided argument"
-msgstr "per a un paràmetre introduït per l'usuari"
+#: src/plugins/vcalendar/month-view.c:114
+msgid "Saturday"
+msgstr "dissabte"
 
-#: src/prefs_actions.c:991
-msgid "for a user provided hidden argument (e.g. password)"
-msgstr "per a un paràmetre introduït per l'usuari i ocult (p.ex. contrasenya)"
+#: src/plugins/vcalendar/month-view.c:115
+msgid "Sunday"
+msgstr "diumenge"
 
-#: src/prefs_actions.c:992
-msgid "for the text selection"
-msgstr "per la part seleccionada del text"
+#: src/plugins/vcalendar/month-view.c:118
+msgid "January"
+msgstr "gener"
 
-#: src/prefs_actions.c:993
-msgid "apply filtering actions between {} to selected messages"
-msgstr "aplicar accions de filtrat entre {} als missatges seleccionats"
+#: src/plugins/vcalendar/month-view.c:119
+msgid "February"
+msgstr "febrer"
 
-#: src/prefs_actions.c:994
-msgid "for a literal %"
-msgstr "per a literal %"
+#: src/plugins/vcalendar/month-view.c:120
+msgid "March"
+msgstr "març"
 
-#: src/prefs_actions.c:1004 src/prefs_themes.c:936
-msgid "Actions"
-msgstr "Accions"
+#: src/plugins/vcalendar/month-view.c:121
+msgid "April"
+msgstr "abril"
 
-#: src/prefs_actions.c:1005
-msgid ""
-"The Actions feature is a way for the user to launch external commands to "
-"process a complete message file or just one of its parts."
-msgstr ""
-"Les accions són una manera de que l'usuari executi comandes externes que "
-"processin un arxiu de missatge complert o alguna de les seves parts."
+#: src/plugins/vcalendar/month-view.c:122
+msgid "May"
+msgstr "maig"
 
-#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695
-#: src/prefs_template.c:1121
-msgid "D_uplicate"
-msgstr "D_uplicat"
+#: src/plugins/vcalendar/month-view.c:123
+msgid "June"
+msgstr "juny"
 
-#: src/prefs_actions.c:1212
-msgid "Current actions"
-msgstr "Accions actuals"
+#: src/plugins/vcalendar/month-view.c:124
+msgid "July"
+msgstr "juliol"
 
-#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
-#: src/prefs_filtering.c:1132
-msgid "Action string is not valid."
-msgstr "La cadena de l'acció no és vàlida."
+#: src/plugins/vcalendar/month-view.c:125
+msgid "August"
+msgstr "agost"
 
-#: src/prefs_common.c:220 src/prefs_quote.c:69
-msgid "Hello,\\n"
-msgstr "Hola,\\n"
+#: src/plugins/vcalendar/month-view.c:126
+msgid "September"
+msgstr "setembre"
 
-#: src/prefs_common.c:298
-msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
-msgstr "El %d\\n%f escrigué:\\n\\n%q\\n%X"
+#: src/plugins/vcalendar/month-view.c:127
+msgid "October"
+msgstr "octubre"
 
-#: src/prefs_common.c:304 src/prefs_quote.c:85
-msgid ""
-"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
-"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
-msgstr ""
-"\\n\\nInici del missatge reenviat:\\n\\n?d{Data: %d\\n}?f{Desde: %f\\n}?t{A: "
-"%t\\n}?c{Cc: %c\\n}?n{Grups de notícies: %n\\n}?s{Assumpte: %s\\n}\\n\\n%M"
+#: src/plugins/vcalendar/month-view.c:128
+msgid "November"
+msgstr "novembre"
 
-#: src/prefs_common.c:448
-msgid "%x(%a) %H:%M"
-msgstr "%x(%a) %H:%M"
+#: src/plugins/vcalendar/month-view.c:129
+msgid "December"
+msgstr "desembre"
 
-#: src/prefs_compose_writing.c:125
-msgid "Automatic account selection"
-msgstr "Selecció automàtica de compte"
+#: src/plugins/vcalendar/month-view.c:795
+msgid "Week number"
+msgstr "Número del mes"
 
-#: src/prefs_compose_writing.c:133
-msgid "when replying"
-msgstr "al respondre"
+#: src/plugins/vcalendar/month-view.c:886
+msgid "Previous month"
+msgstr "Mes anterior"
 
-#: src/prefs_compose_writing.c:135
-msgid "when forwarding"
-msgstr "al reenviar"
+#: src/plugins/vcalendar/month-view.c:906
+msgid "Next month"
+msgstr "Mes següent"
 
-#: src/prefs_compose_writing.c:137
-msgid "when re-editing"
-msgstr "al reeditar"
+#: src/plugins/vcalendar/plugin.c:43 src/plugins/vcalendar/plugin.c:64
+#: src/plugins/vcalendar/vcal_prefs.c:681
+msgid "vCalendar"
+msgstr "vCalendar"
 
-#: src/prefs_compose_writing.c:140
-msgid "Editing"
-msgstr "Editant"
+#: src/plugins/vcalendar/plugin.c:69
+msgid ""
+"This plugin enables vCalendar message handling like that produced by "
+"Evolution or Outlook.\n"
+"\n"
+"When loaded, it will create a vCalendar mailbox in the Folder List, which "
+"will be populated by meetings that you have accepted or created.\n"
+"Meeting requests that you receive will be presented in an appropriate form "
+"and you will be able to accept or decline them.\n"
+"To create a meeting right-click on the vCalendar or Meetings folder and "
+"choose \"New meeting...\".\n"
+"\n"
+"You will also be able to subscribe to remote webCal feeds,export your "
+"meetings and calendars, publish your free/busy information and retrieve that "
+"information from others."
+msgstr ""
+"Aquest mòdul activa vCalendar, el manegador de missatges com els produïts "
+"per l'Evolution o l'Outlook.\n"
+"\n"
+"Quan estigui carregat, creará una bústia vCalendar a la llista de carpetes, "
+"on es guardaran totes les reunions que hagueu acceptat o creat.\n"
+"Les peticions de reunions que hagueu rebut seran presentats en el format "
+"apropiat i podreu acceptar-les o refusar-les.\n"
+"Per crear una reunió, pulseu el botó dret a les carpetes vCalendar o "
+"Reunions i escolliu \"Nova reunió...\".\n"
+"\n"
+"També podreu subscriure-us a feeds remotes webCal, exportar les vostres "
+"reunions i calendaris, publicar la vostra informació de lliure/ocupat i "
+"recuperar la informació d'altres persones."
 
-#: src/prefs_compose_writing.c:144
-msgid "Automatically launch the external editor"
-msgstr "Arrencar l'editor extern automàticament"
+#: src/plugins/vcalendar/plugin.c:102
+msgid "Calendar"
+msgstr "Calendari"
 
-#: src/prefs_compose_writing.c:152
-msgid "Automatically save message to Drafts folder every"
-msgstr "Desar automàticament el missatge al directori Esborranys cada "
+#: src/plugins/vcalendar/vcalendar.c:100
+msgid "Create meeting from message..."
+msgstr "Crear reunió des del missatge..."
 
-#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:101
-msgid "characters"
-msgstr "caràcters"
+#: 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às a punt de crear %d reunions, una a una. Vols continuar?"
 
-#: src/prefs_compose_writing.c:173
-msgid "Even if message is to be encrypted"
-msgstr "Fins i tot si el missatge és per ser encriptat"
+#: src/plugins/vcalendar/vcalendar.c:139
+msgid "Creating meeting..."
+msgstr "Creant reunió..."
 
-#: src/prefs_compose_writing.c:180
-msgid "Undo level"
-msgstr "Nivells de desfer"
+#: src/plugins/vcalendar/vcalendar.c:158
+msgid "no subject"
+msgstr "Sense assumpte"
 
-#: src/prefs_compose_writing.c:198
-msgid "Warn when inserting a file larger than"
-msgstr "Avisar quan s'inserti un arxiu més gran de"
+#: src/plugins/vcalendar/vcalendar.c:393
+msgid "Accept"
+msgstr "Acceptar"
 
-#: src/prefs_compose_writing.c:210
-msgid "KB into message body "
-msgstr "KB dins el cos del missatge "
+#: src/plugins/vcalendar/vcalendar.c:394
+msgid "Tentatively accept"
+msgstr "Acceptar provisionalment"
 
-#: src/prefs_compose_writing.c:216
-msgid "Replying"
-msgstr "Responent"
+#: src/plugins/vcalendar/vcalendar.c:395
+msgid "Decline"
+msgstr "Refusar"
 
-#: src/prefs_compose_writing.c:219
-msgid "Reply will quote by default"
-msgstr "Respondre amb cometes per omissió"
+#: src/plugins/vcalendar/vcalendar.c:482
+msgid "You have a Todo item."
+msgstr "Teniu un item pendent."
 
-#: src/prefs_compose_writing.c:222
-msgid "Reply button invokes mailing list reply"
-msgstr "El botó Respondre invoca respondre a la llista de correu"
+#: src/plugins/vcalendar/vcalendar.c:483 src/plugins/vcalendar/vcalendar.c:490
+#: src/plugins/vcalendar/vcalendar.c:495 src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:512 src/plugins/vcalendar/vcalendar.c:750
+msgid "Details follow:"
+msgstr "Els detalls són els que segueixen:"
 
-#: src/prefs_compose_writing.c:224
-msgid "Forwarding"
-msgstr "Reenviant"
+#: src/plugins/vcalendar/vcalendar.c:489
+msgid "You have created a meeting."
+msgstr "Heu creat una reunió."
 
-#: src/prefs_compose_writing.c:227 src/prefs_filtering_action.c:192
-msgid "Forward as attachment"
-msgstr "Reenviar com a adjunt"
+#: src/plugins/vcalendar/vcalendar.c:494
+msgid "You have been invited to a meeting."
+msgstr "Heu estat convidat a una reunió."
 
-#: src/prefs_compose_writing.c:230
-msgid "Keep the original 'From' header when redirecting"
-msgstr "Mantenir la capçalera 'Desde' original al redirigir"
+#: src/plugins/vcalendar/vcalendar.c:502
+msgid "A meeting to which you had been invited has been cancelled."
+msgstr "Una reunió a la qual heu estat convidat ha estat cencel·lada."
 
-#: src/prefs_compose_writing.c:233
-msgid "When dropping files into the Compose window"
-msgstr "Quan deixeu caure arxiu dins la finestra de composició"
+#: src/plugins/vcalendar/vcalendar.c:511
+msgid "You have been forwarded an appointment."
+msgstr "Heu reenviat una cita."
 
-#: src/prefs_compose_writing.c:242
-msgid "Ask"
-msgstr "Preguntar"
+#: src/plugins/vcalendar/vcalendar.c:564
+#, c-format
+msgid "%s <span weight=\"bold\">(this event recurs)</span>"
+msgstr "%s <span weight=\"bold\">(aquest event es recurrent)</span>"
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:427
-msgid "Insert"
-msgstr "Insertar"
+#: src/plugins/vcalendar/vcalendar.c:570
+#, c-format
+msgid ""
+"%s <span weight=\"bold\">(this event is part of a recurring event)</span>"
+msgstr ""
+"%s <span weight=\"bold\">(aquest event forma part d'un event recurrent)</"
+"span>"
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:428
-msgid "Attach"
-msgstr "Adjuntar"
+#: src/plugins/vcalendar/vcalendar.c:749
+msgid "You have received an answer to an unknown meeting proposal."
+msgstr "Heu rebut una resposta a una proposta de reunió desconeguda."
 
-#: src/prefs_compose_writing.c:371
-msgid "Writing"
-msgstr "Escrivint"
+#: src/plugins/vcalendar/vcalendar.c:753
+#, c-format
+msgid ""
+"You have received an answer to a meeting proposal.\n"
+"%s has %s the invitation whose details follow:"
+msgstr ""
+"Heu rebut una resposta a una proposta de reunió.\n"
+"%s ha %s la invitació amb els següents detalls:"
 
-#: src/prefs_customheader.c:183
-msgid "Custom header configuration"
-msgstr "Configuració de capçalera d'usuari"
+#: src/plugins/vcalendar/vcalendar.c:832
+msgid "Error - could not get the calendar MIME part."
+msgstr "Error - No es pot obtenir la part MIME del calendari."
 
-#: src/prefs_customheader.c:506 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1594 src/prefs_matcher.c:1609
-msgid "Header name is not set."
-msgstr "No s'ha establert el nom de capçalera"
+#: src/plugins/vcalendar/vcalendar.c:839
+msgid "Error - no calendar part found."
+msgstr "Error - no s'ha trobar la part de calendari."
+
+#: src/plugins/vcalendar/vcalendar.c:853
+msgid "Error - Unknown calendar component type."
+msgstr "Error - Tipus de component de calendari desconegut."
 
-#: src/prefs_customheader.c:516
-msgid "This Header name is not allowed as a custom header."
-msgstr "Aquest nom de capçalera no està permès com a capçalera d'usuari."
+#: src/plugins/vcalendar/vcalendar.c:982
+msgid "Send a notification to the attendees"
+msgstr "Enviar notificació als convocats"
 
-#: src/prefs_customheader.c:563
-msgid "Choose a PNG file"
-msgstr "Escolliu un arxiu PNG"
+#: src/plugins/vcalendar/vcalendar.c:991
+msgid "Cancel meeting"
+msgstr "Cancel·lar reunió"
 
-#: src/prefs_customheader.c:565
-msgid "Choose an XBM file"
-msgstr "Escolliu un arxiu XBM"
+#: src/plugins/vcalendar/vcalendar.c:992
+msgid "Are you sure you want to cancel this meeting?"
+msgstr "Estàs segur que vols cancel·lar aquesta reunió?"
 
-#: src/prefs_customheader.c:567
-msgid "Choose a text file"
-msgstr "Escolliu un arxiu de texte"
+#: src/plugins/vcalendar/vcalendar.c:1087
+msgid "No account found"
+msgstr "No s'ha trobat cap compte"
 
-#: src/prefs_customheader.c:580
-msgid "This file isn't an image."
-msgstr "Aquest arxiu no és una imatge"
+#: src/plugins/vcalendar/vcalendar.c:1088
+msgid ""
+"You have no account matching any attendee.\n"
+"Do you want to reply anyway?"
+msgstr ""
+"No tens cap compte que coincideixi amb cap convocat.\n"
+"Vols contestar de totes maneres?"
 
-#: src/prefs_customheader.c:585
-msgid "The chosen image isn't the correct size (48x48)."
-msgstr "L'imatge escollida no es del tamany correcte (48x48)."
+#: src/plugins/vcalendar/vcalendar.c:1090
+msgid "+Reply anyway"
+msgstr "+Respondre igualment"
 
-#: src/prefs_customheader.c:591
-msgid "The image is too big; it must be maximum 725 bytes."
-msgstr "La imatge es massa gran; ha de ser d'un màxim de 725 bytes."
+#: src/plugins/vcalendar/vcalendar.c:1219
+msgid "Answer"
+msgstr "Respondre"
 
-#: src/prefs_customheader.c:596
-msgid "The image isn't in the correct format (PNG)."
-msgstr "La imatge no té el format correcte (PNG)."
+#: src/plugins/vcalendar/vcalendar.c:1220
+msgid "Edit meeting..."
+msgstr "Editar reunió..."
 
-#: src/prefs_customheader.c:605
-msgid "The image isn't in the correct format (XBM)."
-msgstr "La imatge no té el format correcte (XBM)."
+#: src/plugins/vcalendar/vcalendar.c:1221
+msgid "Cancel meeting..."
+msgstr "Cancel·lar reunió..."
 
-#: src/prefs_customheader.c:614
-msgid "Couldn't call `compface`. Make sure it's in your $PATH."
-msgstr "No s'ha pogut usar `compface`. Assegureu-vos que es al vostre $PATH."
+#: src/plugins/vcalendar/vcalendar.c:1222
+msgid "Launch website"
+msgstr "Obrir pàgina web"
 
-#: src/prefs_customheader.c:620
-#, c-format
-msgid "Compface error: %s"
-msgstr "Error de Compface: %s"
+#: src/plugins/vcalendar/vcalendar.c:1226
+msgid "You are already busy at this time."
+msgstr "Ja estàs ocupat a aquesta hora."
 
-#: src/prefs_customheader.c:673
-msgid "This file contains newlines."
-msgstr "Aquest arxiu conté caràcters de nova línia."
+#: src/plugins/vcalendar/vcalendar.c:1265
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+msgid "Event:"
+msgstr "Event:"
 
-#: src/prefs_customheader.c:703
-msgid "Delete header"
-msgstr "Esborrar capçalera"
+#: src/plugins/vcalendar/vcalendar.c:1266
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+msgid "Organizer:"
+msgstr "Organitzador:"
 
-#: src/prefs_customheader.c:704
-msgid "Do you really want to delete this header?"
-msgstr "Realment vols esborrar aquesta capçalera?"
+#: src/plugins/vcalendar/vcalendar.c:1267
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+msgid "Location:"
+msgstr "Localització:"
 
-#: src/prefs_customheader.c:877
-msgid "Current custom headers"
-msgstr "Capçaleres d'usuari actuals"
+#: src/plugins/vcalendar/vcalendar.c:1268
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+msgid "Summary:"
+msgstr "Sumari:"
 
-#: src/prefs_display_header.c:250
-msgid "Displayed header configuration"
-msgstr "Configuració de capçaleres mostrades"
+#: src/plugins/vcalendar/vcalendar.c:1269
+msgid "Starting:"
+msgstr "Inici:"
 
-#: src/prefs_display_header.c:274
-msgid "Header name"
-msgstr "Capçalera"
+#: src/plugins/vcalendar/vcalendar.c:1270
+msgid "Ending:"
+msgstr "Final:"
 
-#: src/prefs_display_header.c:317
-msgid "Displayed Headers"
-msgstr "Capçaleres mostrades"
+#: src/plugins/vcalendar/vcalendar.c:1272
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1723
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1733
+msgid "Attendees:"
+msgstr "Convocats:"
 
-#: src/prefs_display_header.c:379
-msgid "Hidden headers"
-msgstr "Capçaleres ocultes"
+#: src/plugins/vcalendar/vcalendar.c:1274
+msgid "Action:"
+msgstr "Acció:"
 
-#: src/prefs_display_header.c:405
-msgid "Show all unspecified headers"
-msgstr "Mostrar totes les capçaleres"
+#: src/plugins/vcalendar/vcal_folder.c:164
+msgid "_New meeting..."
+msgstr "_Nova reunió..."
 
-#: src/prefs_display_header.c:609
-msgid "This header is already in the list."
-msgstr "Aquesta capçalera ja existeix en la llista."
+#: src/plugins/vcalendar/vcal_folder.c:165
+msgid "_Export calendar..."
+msgstr "_Exportar calendari..."
 
-#: src/prefs_ext_prog.c:102
-#, c-format
-msgid "%s will be replaced with file name / URI"
-msgstr "%s es substituirà amb el nom d'arxiu / URI)"
+#: src/plugins/vcalendar/vcal_folder.c:166
+msgid "_Subscribe to webCal..."
+msgstr "_Subscriure's a webCal..."
 
-#: src/prefs_ext_prog.c:110
-msgid "For the text editor, %w will be replaced with GtkSocket ID"
-msgstr ""
+#: src/plugins/vcalendar/vcal_folder.c:168
+msgid "_Rename..."
+msgstr "_Renombrar..."
 
-#: src/prefs_ext_prog.c:129
-msgid "Use system defaults when possible"
-msgstr "Usar els valors per defecte del sistema quan sigui possible"
+#: src/plugins/vcalendar/vcal_folder.c:169
+msgid "U_pdate subscriptions"
+msgstr "Actualitzar subscri_pcions"
 
-#: src/prefs_ext_prog.c:150
-msgid "Web browser"
-msgstr "Navegador web"
+#: src/plugins/vcalendar/vcal_folder.c:170
+msgid "_List view"
+msgstr "Vista de _llista"
 
-#: src/prefs_ext_prog.c:178
-msgid "Text editor"
-msgstr "Editor de text"
+#: src/plugins/vcalendar/vcal_folder.c:171
+msgid "_Week view"
+msgstr "_Vista setmanal"
 
-#: src/prefs_ext_prog.c:210
-msgid "Command for 'Display as text'"
-msgstr "Comanda per 'Mostrar com a text'"
+#: src/plugins/vcalendar/vcal_folder.c:172
+msgid "_Month view"
+msgstr "Vista _mensual"
 
-#: src/prefs_ext_prog.c:223
-msgid ""
-"This option enables MIME parts to be displayed in the message view via a "
-"script when using the 'Display as text' contextual menu item"
-msgstr ""
-"Aquesta opció activa les parts MIME per ser mostrades a la vista del "
-"missatge via unscript quan useu la opció de menú contextual 'Mostrar com a "
-"text'"
+#: src/plugins/vcalendar/vcal_folder.c:1094
+msgid "Meetings"
+msgstr "Reunions"
 
-#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:354
-msgid "Message View"
-msgstr "Vista de missatge"
+#: src/plugins/vcalendar/vcal_folder.c:1478
+msgid "in the past"
+msgstr "en el passat"
 
-#: src/prefs_ext_prog.c:283
-msgid "External Programs"
-msgstr "Programes externs"
+#: src/plugins/vcalendar/vcal_folder.c:1481
+msgid "today"
+msgstr "avui"
 
-#: src/prefs_filtering_action.c:175
-msgid "Move"
-msgstr "Moure"
+#: src/plugins/vcalendar/vcal_folder.c:1484
+msgid "tomorrow"
+msgstr "demà"
 
-#: src/prefs_filtering_action.c:176
-msgid "Copy"
-msgstr "Copiar"
+#: src/plugins/vcalendar/vcal_folder.c:1487
+msgid "this week"
+msgstr "aquesta setmana"
 
-#: src/prefs_filtering_action.c:178
-msgid "Hide"
-msgstr "Ocultar"
+#: src/plugins/vcalendar/vcal_folder.c:1490
+msgid "later"
+msgstr "més tard"
 
-#: 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 "Marcadors de missatge"
+#: src/plugins/vcalendar/vcal_folder.c:1494
+#, c-format
+msgid ""
+"\n"
+"These are the events planned %s:\n"
+msgstr ""
+"\n"
+"Aquests són els events planejats %s:\n"
 
-# RML I think this is ambiguous:
-# RML on filtering is a verb ("Marcar") while in summary colunm it's really
-# RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:78 src/summaryview.c:2795
-msgid "Mark"
-msgstr "Marca"
+#: src/plugins/vcalendar/vcal_folder.c:1589
+#, c-format
+msgid "Timeout (%d seconds) connecting to %s\n"
+msgstr "Excedit el temps (%d segons) connectant a %s\n"
 
-#: src/prefs_filtering_action.c:183
-msgid "Mark as read"
-msgstr "Marcar com a llegit"
+#: src/plugins/vcalendar/vcal_folder.c:1607
+#, c-format
+msgid "Error %ld"
+msgstr "Error %ld"
 
-#: src/prefs_filtering_action.c:184
-msgid "Mark as unread"
-msgstr "Marcar com a no llegit"
+#: src/plugins/vcalendar/vcal_folder.c:1804
+#, c-format
+msgid ""
+"Could not retrieve the Webcal URL:\n"
+"%s:\n"
+"\n"
+"%s"
+msgstr ""
+"No s'ha pogut recuperar la URL Webcal:\n"
+"%s\n"
+"\n"
+"%s"
 
-#: src/prefs_filtering_action.c:185
-msgid "Mark as spam"
-msgstr "Marcar com a correu brossa"
+#: src/plugins/vcalendar/vcal_folder.c:1808
+#, c-format
+msgid ""
+"Could not retrieve the Webcal URL:\n"
+"%s:\n"
+"\n"
+"%s\n"
+msgstr ""
+"No s'ha pogut recuperar la URL Webcal:\n"
+"%s\n"
+"\n"
+"%s\n"
 
-#: src/prefs_filtering_action.c:186
-msgid "Mark as ham"
-msgstr "Marcar com a bò"
+#: src/plugins/vcalendar/vcal_folder.c:1819
+#, c-format
+msgid ""
+"This URL does not look like a WebCal URL:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Aquesta URL no sembla una URL de WebCal:\n"
+"%s\n"
+"%s"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
-#: src/toolbar.c:205 src/toolbar.c:438 src/toolbar.c:2088
-msgid "Execute"
-msgstr "Executar"
+#: src/plugins/vcalendar/vcal_folder.c:1822
+#, c-format
+msgid ""
+"This URL does not look like a WebCal URL:\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"Aquesta URL no sembla una URL de WebCal:\n"
+"%s\n"
+"%s\n"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:440
-msgid "Color label"
-msgstr "Etiqueta de color"
+#: src/plugins/vcalendar/vcal_folder.c:1851
+#: src/plugins/vcalendar/vcal_folder.c:1854
+#, c-format
+msgid "Could not create directory %s"
+msgstr "No s'ha pogut crear el directori %s"
 
-#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
-#: src/prefs_filtering_action.c:193
-msgid "Resend"
-msgstr "Re-enviar"
+#: src/plugins/vcalendar/vcal_folder.c:1892
+msgid "Claws Mail needs network access in order to update the Webcal feed."
+msgstr "Claws Mail necessita accés a xarxa per actualitzar el feed de Webcal."
 
-#: src/prefs_filtering_action.c:193
-msgid "Redirect"
-msgstr "Redirigir"
+#: src/plugins/vcalendar/vcal_folder.c:1903
+#, c-format
+msgid "Fetching calendar for %s..."
+msgstr "Actualitzant el calendari per %s..."
 
-#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87
-#: src/summaryview.c:446
-msgid "Score"
-msgstr "Punts"
+#: src/plugins/vcalendar/vcal_folder.c:1904
+msgid "new subscription"
+msgstr "Nova subscripció"
 
-#: src/prefs_filtering_action.c:194
-msgid "Change score"
-msgstr "Canviar punts"
+#: src/plugins/vcalendar/vcal_folder.c:1915
+msgid "Claws Mail needs network access in order to update the subscription."
+msgstr "Claws Mail necessita accés a xarxa per actualitzar la subscripció."
 
-#: src/prefs_filtering_action.c:195
-msgid "Set score"
-msgstr "Establir punts"
+#: src/plugins/vcalendar/vcal_folder.c:1927
+msgid "Subscribe to WebCal"
+msgstr "Subscriure's a WebCal"
 
-#: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
-#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:89 src/summaryview.c:448
-msgid "Tags"
-msgstr "Etiquetes"
+#: src/plugins/vcalendar/vcal_folder.c:1927
+msgid "Enter the WebCal URL:"
+msgstr "Entreu la URL de WebCal:"
 
-#: src/prefs_filtering_action.c:196
-msgid "Apply tag"
-msgstr "Aplicar etiqueta"
+#: src/plugins/vcalendar/vcal_folder.c:1939
+msgid "Could not parse the URL."
+msgstr "No s'ha pogut processar la URL."
 
-#: src/prefs_filtering_action.c:197
-msgid "Unset tag"
-msgstr "Esborrar etiqueta"
+#: src/plugins/vcalendar/vcal_folder.c:1967
+msgid "Do you really want to unsubscribe?"
+msgstr "Realment vols desubscriure't?"
 
-#: src/prefs_filtering_action.c:198
-msgid "Clear tags"
-msgstr "Netejar etiquetes"
+#: src/plugins/vcalendar/vcal_manager.c:109
+msgid "accepted"
+msgstr "acceptat"
 
-#: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
-msgid "Threads"
-msgstr "Fils"
+#: src/plugins/vcalendar/vcal_manager.c:110
+msgid "tentatively accepted"
+msgstr "acceptada provisionalment"
 
-#: src/prefs_filtering_action.c:202
-msgid "Stop filter"
-msgstr "Parar filtre"
+#: src/plugins/vcalendar/vcal_manager.c:111
+msgid "declined"
+msgstr "refusada"
 
-#: src/prefs_filtering_action.c:410
-msgid "Action configuration"
-msgstr "Configurar accions"
+#: src/plugins/vcalendar/vcal_manager.c:112
+msgid "did not answer"
+msgstr "no va respondre"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1886
-#: src/prefs_matcher.c:586
-msgid "Rule"
-msgstr "Regla"
+#: src/plugins/vcalendar/vcal_manager.c:142
+msgid "individual"
+msgstr "individual"
 
-#: src/prefs_filtering_action.c:440 src/prefs_filtering.c:433
-msgid "Action"
-msgstr "Acció"
+#: src/plugins/vcalendar/vcal_manager.c:143
+msgid "group"
+msgstr "grup"
 
-# FIXME
-#: src/prefs_filtering_action.c:935
-msgid "Command-line not set"
-msgstr "Línia de comandes no establerta"
+#: src/plugins/vcalendar/vcal_manager.c:144
+msgid "resource"
+msgstr "recurs"
 
-# FIXME
-#: src/prefs_filtering_action.c:936
-msgid "Destination is not set."
-msgstr "Destinació no establerta."
+#: src/plugins/vcalendar/vcal_manager.c:145
+msgid "room"
+msgstr "lloc"
 
-# FIXME
-#: src/prefs_filtering_action.c:947
-msgid "Recipient is not set."
-msgstr "Destinatari no establert."
+#: src/plugins/vcalendar/vcal_manager.c:556
+msgid "Past"
+msgstr "Pasat"
 
-# FIXME
-#: src/prefs_filtering_action.c:965
-msgid "Score is not set"
-msgstr "Puntuació no establerta"
+#: src/plugins/vcalendar/vcal_manager.c:559
+msgid "Today"
+msgstr "Avui"
 
-#: src/prefs_filtering_action.c:973
-msgid "Header is not set."
-msgstr "No s'ha establert la capçalera"
+#: src/plugins/vcalendar/vcal_manager.c:562
+msgid "Tomorrow"
+msgstr "Demà"
 
-#: src/prefs_filtering_action.c:980
-msgid "Target addressbook/folder is not set."
-msgstr "No s'ha establert l'agenda de destí."
+#: src/plugins/vcalendar/vcal_manager.c:565
+msgid "This week"
+msgstr "Aquesta setmana"
 
-#: src/prefs_filtering_action.c:994
-msgid "Tag name is empty."
-msgstr "El nom d'etiqueta es buit."
+#: src/plugins/vcalendar/vcal_manager.c:568
+msgid "Later"
+msgstr "Més tard"
 
-#: src/prefs_filtering_action.c:1216
-msgid "No action was defined."
-msgstr "No s'ha definit cap acció."
+#: src/plugins/vcalendar/vcal_manager.c:1242
+msgid "Accepted: "
+msgstr "Acceptada: "
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160
-#: src/quote_fmt.c:79
-msgid "literal %"
-msgstr "literal %"
+#: src/plugins/vcalendar/vcal_manager.c:1244
+msgid "Declined: "
+msgstr "Refusada: "
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2169
-msgid "filename (should not be modified)"
-msgstr "Nom d'arxiu (no ha d'ésser modificat)"
+#: src/plugins/vcalendar/vcal_manager.c:1246
+msgid "Tentatively Accepted: "
+msgstr "Acceptada provisionalment:"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170
-#: src/quote_fmt.c:87
-msgid "new line"
-msgstr "línia nova"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:307
+msgid "Individual"
+msgstr "Individu"
 
-#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2171
-msgid "escape character for quotes"
-msgstr "caràcter d'escapament per entrecomillat"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+msgid "Resource"
+msgstr "Recurs"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
-msgid "quote character"
-msgstr "caràcter d'entrecomillat"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+msgid "Room"
+msgstr "Lloc"
 
-#: src/prefs_filtering_action.c:1275
-msgid "Filtering Action: 'Execute'"
-msgstr "Accion de filtratge: 'Executar'"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
+msgid "Add..."
+msgstr "Afegir..."
 
-#: src/prefs_filtering_action.c:1276
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:779
 msgid ""
-"'Execute' allows you to send a message or message element to an external "
-"program or script.\n"
-"The following symbols can be used:"
+"The following person(s) are busy at the time of your planned meeting:\n"
+"- "
 msgstr ""
-"'Executar' us permet enviar un missatge o un element del missatge a un "
-"programa extern o a un script.\n"
-"Els següents símbols poden ser usats:"
+"Les següents persones estan ocupades a l'hora planejada de la reunió:\n"
+"- "
 
-#: src/prefs_filtering_action.c:1422
-msgid "Recipient"
-msgstr "Destinatari"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:869
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:955
+msgid "You"
+msgstr "Vostè"
 
-#: src/prefs_filtering_action.c:1426
-msgid "Book/Folder"
-msgstr "Llibre/Carpeta"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:781
+msgid "You are busy at the time of your planned meeting"
+msgstr "Vostè està ocupat a l'hora planejada de la reunió"
 
-#: src/prefs_filtering_action.c:1430
-msgid "Destination"
-msgstr "Destinació"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:783
+#, c-format
+msgid "%s is busy at the time of your planned meeting"
+msgstr "%s està ocupat a l'hora planejada de la reunió"
 
-#: src/prefs_filtering_action.c:1434
-msgid "Color"
-msgstr "Colorar"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
+#, c-format
+msgid "%d hour sooner"
+msgstr "%d hora més d'hora"
 
-#: src/prefs_filtering_action.c:1520
-msgid "Current action list"
-msgstr "Llista actual d'accions "
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
+#, c-format
+msgid "%d hours sooner"
+msgstr "%d hores més d'hora"
 
-#: src/prefs_filtering.c:197 src/prefs_filtering.c:359
-msgid "Filtering/Processing configuration"
-msgstr "Configuració de filtrat/procesament"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
+#, c-format
+msgid "%d hours and %d minutes sooner"
+msgstr "%d hores i %d minutes mes d'hora"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
-#: src/prefs_filtering.c:981
-msgctxt "Filtering Account Menu"
-msgid "All"
-msgstr "Filtrant qualsevol"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:791
+#, c-format
+msgid "%d minutes sooner"
+msgstr "%d minuts més d'hora"
 
-#: src/prefs_filtering.c:411
-msgid "Condition"
-msgstr "Condició"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:796
+#, c-format
+msgid "%d hour later"
+msgstr "%d hora més tard"
 
-#: src/prefs_filtering.c:424
-msgid " D_efine... "
-msgstr "D_efineix... "
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:798
+#, c-format
+msgid "%d hours later"
+msgstr "%d hores més tard"
 
-#: src/prefs_filtering.c:446
-msgid " De_fine... "
-msgstr "De_fineix... "
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:800
+#, c-format
+msgid "%d hours and %d minutes later"
+msgstr "%d hores i %d minuts més tard"
 
-#: src/prefs_filtering.c:475
-msgid "Append the new rule above to the list"
-msgstr "Afegir la nova regla a sobre la llista"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:802
+#, c-format
+msgid "%d minutes later"
+msgstr "%d minuts més tard"
 
-#: src/prefs_filtering.c:484
-msgid "Replace the selected rule in list with the rule above"
-msgstr "Substituïr la regla seleccionada a la llista amb la regla de sota"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:808
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Everyone would be available %s or %s."
+msgstr ""
+"\n"
+"\n"
+"Tothom estarà disponible %s o %s."
 
-#: src/prefs_filtering.c:493
-msgid "Delete the selected rule from the list"
-msgstr "Esborrar la regla seleccionada de la llista"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:810
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Everyone would be available %s."
+msgstr ""
+"\n"
+"\n"
+"Tothom estarà disponible %s."
 
-#: src/prefs_filtering.c:532
-msgid "Move the selected rule to the top"
-msgstr "Moure la regla seleccionada a l'inici"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:812
+msgid ""
+"\n"
+"\n"
+"It isn't possible to have this meeting with everyone in the previous or next "
+"6 hours."
+msgstr ""
+"\n"
+"\n"
+"No és possible tenir aquesta reunió amb tothom entre les 6 hores prèvies o "
+"posteriors."
 
-#: src/prefs_filtering.c:535
-msgid "Page u_p"
-msgstr "_Pàgina amunt"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:817
+#, c-format
+msgid "would be available %s or %s"
+msgstr "estaria disponible %s o %s"
 
-#: src/prefs_filtering.c:543
-msgid "Move the selected rule one page up"
-msgstr "Moure la regla seleccionada una pàgina amunt"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:819
+#, c-format
+msgid "would be available %s"
+msgstr "estaria disponible %s"
 
-#: src/prefs_filtering.c:552
-msgid "Move the selected rule up"
-msgstr "Moure la regla seleccionada amunt"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:821
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:882
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:952
+msgid "not available"
+msgstr "no està disponible"
 
-#: src/prefs_filtering.c:560
-msgid "Move the selected rule down"
-msgstr "Moure la regla seleccionada avall"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:824
+#, c-format
+msgid ", but would be available %s or %s."
+msgstr ", però estaria disponible %s o %s."
 
-#: src/prefs_filtering.c:563
-msgid "Page dow_n"
-msgstr "Pàgina a_vall"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:826
+#, c-format
+msgid ", but would be available %s."
+msgstr ", però estaria disponible %s."
 
-#: src/prefs_filtering.c:571
-msgid "Move the selected rule one page down"
-msgstr "Moure la regla seleccionada una pàgina avall"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:828
+msgid ", and isn't available in the previous or next 6 hours."
+msgstr ", i no està disponiible entre les sis hores prèvies o posteriors."
 
-#: src/prefs_filtering.c:580
-msgid "Move the selected rule to the bottom"
-msgstr "Moure la regla seleccionada al final"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:885
+msgid "available"
+msgstr "disponible"
 
-#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
-msgid "Condition string is not valid."
-msgstr "La cadena de condició no és vàlida."
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:887
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1136
+msgid "Free/busy retrieval failed"
+msgstr "Ha fallat la recuperació de lliure/ocupat"
 
-#: src/prefs_filtering.c:1111
-msgid "Condition string is empty."
-msgstr "La cadena de condició es buida."
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:969
+msgid "Not everyone is available"
+msgstr "No tothom està disponible"
 
-#: src/prefs_filtering.c:1117
-msgid "Action string is empty."
-msgstr "La cadena de l'acció es buida."
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:970
+msgid "Send anyway"
+msgstr "Enviar de totes maneres"
 
-#: src/prefs_filtering.c:1205
-msgid "Delete rule"
-msgstr "Esborrar regla"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:981
+msgid "Not everyone is available. See tooltips for more info..."
+msgstr "No tothom està disponible. Mireu les notes per més informació..."
 
-#: src/prefs_filtering.c:1206
-msgid "Do you really want to delete this rule?"
-msgstr "Vols esborrar realment aquesta regla?"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
+#, c-format
+msgid "Fetching planning for %s..."
+msgstr "Actualitzant la planificació per %s ..."
 
-#: src/prefs_filtering.c:1224
-msgid "Delete all rules"
-msgstr "Esborrar totes les regles"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1145
+msgid "Available"
+msgstr "Disponible"
 
-#: src/prefs_filtering.c:1225
-msgid "Do you really want to delete all the rules?"
-msgstr "Vols esborrar realment totes les regles?"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1158
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1165
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+msgid "Everyone is available."
+msgstr "Tothom està disponible."
 
-#: src/prefs_filtering.c:1475
-msgid "Filtering rules not saved"
-msgstr "Regles de filtrat no desades"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1174
+msgid ""
+"Everyone seems available, but some free/busy information failed to be "
+"retrieved."
+msgstr ""
+"Tothom sembla disponible, però alguna informació de lliure/ocupat no s'ha "
+"pogut recuperar."
 
-#: src/prefs_filtering.c:1476
-msgid "The list of filtering rules have been modified. Close anyway?"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1353
+msgid ""
+"Could not send the meeting invitation.\n"
+"Check the recipients."
 msgstr ""
-"La llista de regles de filtrat han estat modificades. Tancar de totes "
-"maneres?"
+"No s'ha pogut enviar la invitació a la reunió.\n"
+"Reviseu els destinataris."
 
-#: src/prefs_filtering.c:1698
-msgid "Move one page up"
-msgstr "Moure una pàgina amunt"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1474
+msgid "Save & Send"
+msgstr "Desar i Enviar"
 
-#: src/prefs_filtering.c:1699
-msgid "Move one page down"
-msgstr "Moure una pàgina avall"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1475
+msgid "Check availability"
+msgstr "Comprovar disponibilitat"
 
-#: src/prefs_filtering.c:1854
-msgid "Enable"
-msgstr "Activa"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
+msgid "<b>Starts at:</b> "
+msgstr "<b>Comença a les:</b>"
 
-#: src/prefs_folder_column.c:212
-msgid "Folder list columns configuration"
-msgstr "Configuració de la llista de columnes de la carpeta"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1628
+msgid "<b> on:</b>"
+msgstr "<b> a:</b>"
 
-#: src/prefs_folder_column.c:229
-msgid ""
-"Select columns to be displayed in the folder list. You can modify\n"
-"the order by using the Up / Down buttons or by dragging the items."
-msgstr ""
-"Seleccioneu les columnes a mostrar a la llista de carpetes. Podeu modificar\n"
-"l'ordre usant els botons Amunt / Avall o arrossegant els elements."
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+msgid "<b>Ends at:</b> "
+msgstr "<b>Finalitza a:</b>"
 
-#: src/prefs_folder_column.c:258 src/prefs_summary_column.c:272
-msgid "Hidden columns"
-msgstr "Columnes ocultes"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+msgid "New meeting"
+msgstr "Nova reunió"
 
-#: src/prefs_folder_column.c:290 src/prefs_summaries.c:409
-#: src/prefs_summaries.c:587 src/prefs_summary_column.c:304
-msgid "Displayed columns"
-msgstr "Columnes mostrades"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1665
+#, c-format
+msgid "%s - Edit meeting"
+msgstr "%s - Editar reunió"
 
-#: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
-msgid " Use default "
-msgstr " Usar configuració inicial "
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1744
+msgid "Time:"
+msgstr "Hora:"
 
-#: src/prefs_folder_item.c:262 src/prefs_folder_item.c:864
-#: src/prefs_folder_item.c:1390
-#, fuzzy
-msgid ""
-"These preferences will not be saved as this folder is a top-level folder. "
-"However, you can set them for the whole mailbox tree by using \"Apply to "
-"subfolders\"."
-msgstr ""
-"<i>Aquestes preferències no seran desades perque aquesta carpeta es de "
-"nivell màxim. De totes maneres podeu assignar-les a tot l'arbre de la bústia "
-"usant \"Aplicar a subcarpetes\".</i>"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1877
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d hores"
+
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1880
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minuts"
+
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1891
+#, c-format
+msgid "Upcoming event: %s"
+msgstr "Event inminent: %s"
 
-#: src/prefs_folder_item.c:274 src/prefs_folder_item.c:876
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#, c-format
 msgid ""
-"Apply to\n"
-"subfolders"
+"You have a meeting or event soon.\n"
+"It starts at %s and ends %s later.\n"
+"Location: %s\n"
+"More information:\n"
+"\n"
+"%s"
 msgstr ""
-"Aplicar a\n"
-"subcarpetes"
+"Teniu una reunió o event en breu.\n"
+"Comença a les %s i finalitza %s després.\n"
+"Localització: %s\n"
+"Més informació:\n"
+"\n"
+"%s"
 
-#: src/prefs_folder_item.c:299
-msgid "Normal"
-msgstr "Normal"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1909
+#, c-format
+msgid "Remind me in %d minute"
+msgid_plural "Remind me in %d minutes"
+msgstr[0] "Recorda-m'ho en %d minut"
+msgstr[1] "Recorda-m'ho en %d minuts"
 
-#: src/prefs_folder_item.c:301
-msgid "Outbox"
-msgstr "Carpeta de sortida"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2034
+msgid "Empty calendar"
+msgstr "Calendari buit"
 
-#: src/prefs_folder_item.c:317
-msgid "Folder type"
-msgstr "Tipus de carpeta"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2035
+msgid "There is nothing to export."
+msgstr "No hi ha res a exportar."
 
-#: src/prefs_folder_item.c:329
-msgid "Simplify Subject RegExp"
-msgstr "Exp.reg. per simplificar assumpte"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2075
+msgid "Could not export the calendar."
+msgstr "No es pot exportar el calendari."
 
-#: src/prefs_folder_item.c:355
-msgid "Test string:"
-msgstr "Cadena de proves:"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2092
+msgid "Export calendar to ICS"
+msgstr "Exportar calendari a ICS"
 
-#: src/prefs_folder_item.c:372
-msgid "Result:"
-msgstr "Resultat:"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2115
+#, c-format
+msgid "Couldn't export calendar to '%s'\n"
+msgstr "No es pot exportar el calendari a '%s'\n"
 
-#: src/prefs_folder_item.c:387
-msgid "Folder chmod"
-msgstr "Permisos de carpeta"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2231
+msgid "Could not export the freebusy info."
+msgstr "No es pot exportar la informació de lliure/ocupat."
 
-#: src/prefs_folder_item.c:413
-msgid "Folder color"
-msgstr "Color de carpeta"
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#, c-format
+msgid "Couldn't export free/busy to '%s'\n"
+msgstr "No es pot exportar la informació de lliure/ocupat a '%s'\n"
 
-#: src/prefs_folder_item.c:426 src/prefs_folder_item.c:1659
-msgid "Pick color for folder"
-msgstr "Escolliu color per a la carpeta"
+#: src/plugins/vcalendar/vcal_prefs.c:266
+msgid "Reminders"
+msgstr "Recordatoris"
 
-#: src/prefs_folder_item.c:444
-msgid "Run Processing rules at start-up"
-msgstr "Executar Processar regles a l'inici"
+#: src/plugins/vcalendar/vcal_prefs.c:275
+msgid "Alert me"
+msgstr "Avisa'm"
 
-#: src/prefs_folder_item.c:459
-msgid "Run Processing rules when opening"
-msgstr "Executar Processar regles a l'obrir"
+#: src/plugins/vcalendar/vcal_prefs.c:287
+msgid "minutes before an event"
+msgstr "minuts abans d'un event"
 
-#: src/prefs_folder_item.c:473
-msgid "Scan for new mail"
-msgstr "Examinar si hi ha correu nou"
+#: src/plugins/vcalendar/vcal_prefs.c:299
+msgid "Calendar export"
+msgstr "Exportació del calendari"
 
-#: src/prefs_folder_item.c:475
-msgid ""
-"Turn this option on if mail is delivered directly to this folder by server "
-"side filtering on IMAP or by an external application"
-msgstr ""
-"Activeu aquesta opció si el missatge és enviat directament a aquesta carpeta "
-"amb filtratge del servidor IMAP o per una aplicació externa"
+#: src/plugins/vcalendar/vcal_prefs.c:310
+msgid "Automatically export calendar to"
+msgstr "Exportar automàticament el calendari a"
 
-#: src/prefs_folder_item.c:495
-msgid "Select the HTML part of multipart messages"
-msgstr "Seleccionar la part HTML en missatges multipart"
+#: src/plugins/vcalendar/vcal_prefs.c:319
+#: src/plugins/vcalendar/vcal_prefs.c:425
+msgid "You can export to a local file or URL"
+msgstr "Podeu exportar a un fitxer local o URL"
 
-#: src/prefs_folder_item.c:512
-msgid ""
-"\"Default\" will follow global preference (found in /Preferences/Message "
-"View/Text Options)"
-msgstr ""
-"\"Default\" fara servir les preferències globals (que es troba a / "
-"Preferències/Veure Missatge/Opcions de Text)"
+#: src/plugins/vcalendar/vcal_prefs.c:321
+msgid "Specify a local file or URL (http://server/path/file.ics)"
+msgstr "Especifiqueu un fitxer local o URL(http://servidor/ruta/fitxer.ics)"
 
-#: src/prefs_folder_item.c:522
-msgid "Synchronise for offline use"
-msgstr "Sincronitzar per usar sense connexió"
+#: src/plugins/vcalendar/vcal_prefs.c:351
+msgid "Include webcal subscriptions in export"
+msgstr "Incloure subscripcions webcal a l'exportació"
 
-#: src/prefs_folder_item.c:543
-msgid "Fetch message bodies from the last"
-msgstr "Recuperar cos de missatges des de l'últim"
+#: src/plugins/vcalendar/vcal_prefs.c:361
+msgid "Command to run after calendar export"
+msgstr "Comanda a executar després de l'exportació del calendari"
 
-#: src/prefs_folder_item.c:550
-msgid "0: all bodies"
-msgstr "0: tots els cossos"
+#: src/plugins/vcalendar/vcal_prefs.c:390
+msgid "Register Claws' calendar in XFCE's Orage clock"
+msgstr "Calendari de Register Claws al rellotge Orage de XFCE"
 
-#: src/prefs_folder_item.c:558
-msgid "Remove older messages bodies"
-msgstr "Esborrar cos de missatges més antics"
+#: src/plugins/vcalendar/vcal_prefs.c:392
+msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
+msgstr ""
+"Permet a Orage (versió superior a la 4.4) veure el calendari de Claws Mail"
 
-#: src/prefs_folder_item.c:575
-msgid "Discard folder cache"
-msgstr "Descartar memòria cau de carpeta"
+#: src/plugins/vcalendar/vcal_prefs.c:404
+msgid "Free/Busy information"
+msgstr "Informació de Lliure/Ocupat"
 
-#: src/prefs_folder_item.c:885
-msgid "Request Return Receipt"
-msgstr "Sollicitar justificant de recepció"
+#: src/plugins/vcalendar/vcal_prefs.c:416
+msgid "Automatically export free/busy status to"
+msgstr "Exportar automàticament l'estat de lliure/ocupat a"
 
-#: src/prefs_folder_item.c:900
-msgid "Save copy of outgoing messages to this folder instead of Sent"
-msgstr "Desar els missatges sortints en aquesta carpeta enlloc de a Enviat"
+#: src/plugins/vcalendar/vcal_prefs.c:427
+msgid "Specify a local file or URL (http://server/path/file.ifb)"
+msgstr "Especificar un fitxer local o URL (http://servidor/ruta/fitxer.ifb)"
 
-#: src/prefs_folder_item.c:913 src/prefs_folder_item.c:936
-#: src/prefs_folder_item.c:960 src/prefs_folder_item.c:983
-#: src/prefs_folder_item.c:1006
-msgid "Default "
-msgstr "Per omissió "
+#: src/plugins/vcalendar/vcal_prefs.c:457
+msgid "Command to run after free/busy status export"
+msgstr "Comanda a executar després de l'exportació de l'estat de lliure/ocupat"
 
-#: src/prefs_folder_item.c:937
-msgid " for replies"
-msgstr " per respostes"
+#: src/plugins/vcalendar/vcal_prefs.c:484
+msgid "Get free/busy status of others from"
+msgstr "Obtenir l'estat de lliure/ocupat d'altres desde"
 
-#: src/prefs_folder_item.c:1029
-msgid "Default account"
-msgstr "Compte per omissió"
+#: src/plugins/vcalendar/vcal_prefs.c:492
+#, c-format
+msgid ""
+"Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
+"left part of the email address, %d for the domain"
+msgstr ""
+"Especificar un fitxer local o URL (http://servidor/ruta/fitxer.ifb). Useu %u "
+"de la part esquerra de l'adreça de correu, %d per el domini"
 
-#: src/prefs_folder_item.c:1672
-msgid "Discard cache"
-msgstr "Desactivar memòria cau"
+#: src/plugins/vcalendar/vcal_prefs.c:506
+msgid "SSL options"
+msgstr "Opcions de SSL"
 
-#: src/prefs_folder_item.c:1673
-msgid "Do you really want to discard the local cached data for this folder?"
-msgstr ""
-"Realment vols descartar l'informació local desada per a aquesta carpeta?"
+#: src/pop.c:152
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "No s'ha trobat en la salutació la marca de temps APOP necessària\n"
 
-#: src/prefs_folder_item.c:1803
-msgid "General"
-msgstr "General"
+#: src/pop.c:159
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Error de sintaxis a la marca de temps de la salutació\n"
 
-#: src/prefs_folder_item.c:1882
-#, c-format
-msgid "Properties for folder %s"
-msgstr "Propietats de la carpeta %s"
+#: src/pop.c:166
+msgid "Timestamp syntax error in greeting (not ASCII)\n"
+msgstr "Error de sintaxis a la marca de temps a la salutació (no ascii)\n"
 
-#: src/prefs_fonts.c:79
-msgid "Folder and Message Lists"
-msgstr "Carpeta i llistes de missatges"
+#: src/pop.c:190 src/pop.c:217
+msgid "POP3 protocol error\n"
+msgstr "Error del protocol POP3\n"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2035
-msgid "Message"
-msgstr "Missatge"
+#: src/pop.c:263
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "resposta UIDL invàlida: %s\n"
 
-#: src/prefs_fonts.c:126
-msgid "Derive small and bold fonts from Folder and Message Lists font"
-msgstr ""
-"Derivar les tipografies petita i negreta de la llista de Carpetes i Missatges"
+#: src/pop.c:841
+#, c-format
+msgid "POP3: Deleting expired message %d [%s]\n"
+msgstr "POP3: Esborrant missatge caducat %d [%s]\n"
 
-#: src/prefs_fonts.c:136
-msgid "Small"
-msgstr "Petita"
+#: src/pop.c:857
+#, c-format
+msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
+msgstr "POP3: Saltant-se missatge %d [%s](%d bytes)\n"
 
-#: src/prefs_fonts.c:158
-msgid "Bold"
-msgstr "Negreta"
+#: src/pop.c:889
+msgid "mailbox is locked\n"
+msgstr "la bústia està bloquejada\n"
 
-#: src/prefs_fonts.c:180
-msgid "Use different font for printing"
-msgstr "Usar font diferent per imprimir"
+#: src/pop.c:892
+msgid "Session timeout\n"
+msgstr "Excedit el temps límit de la sessió\n"
 
-#: src/prefs_fonts.c:190
-msgid "Message Printing"
-msgstr "Missatge d'impressió"
+#: src/pop.c:911
+msgid "command not supported\n"
+msgstr "ordre no soportada\n"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:731
-#: src/prefs_themes.c:365
-msgid "Display"
-msgstr "Veure"
+#: src/pop.c:916
+msgid "error occurred on POP3 session\n"
+msgstr "hi ha hagut un error a la sessió POP3\n"
 
-#: src/prefs_fonts.c:269
-msgid "Fonts"
-msgstr "Tipografies"
+#: src/pop.c:1111
+msgid "TOP command unsupported\n"
+msgstr "ordre TOP no soportada\n"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
-msgid "Preferences"
-msgstr "Preferències"
+#: src/prefs_account.c:335 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1506
+msgid "POP3"
+msgstr "POP3"
 
-#: src/prefs_image_viewer.c:69
-msgid "Automatically display attached images"
-msgstr "Mostrar les imatges adjuntes automàticament"
+#: src/prefs_account.c:338 src/prefs_account.c:1563 src/prefs_account.c:2449
+msgid "IMAP4"
+msgstr "IMAP4"
 
-#: src/prefs_image_viewer.c:75
-msgid "Resize attached images by default"
-msgstr "Redimensionar les imatges adjuntes per omissión"
+#: src/prefs_account.c:339
+msgid "News (NNTP)"
+msgstr "Notícies (NNTP)"
 
-#: src/prefs_image_viewer.c:78
-msgid "Clicking image toggles scaling"
-msgstr "Activa/Desactiva l'escalat clicant la imatge"
+#: src/prefs_account.c:340 src/wizard.c:1508
+msgid "Local mbox file"
+msgstr "Arxiu mbox local"
 
-#: src/prefs_image_viewer.c:83
-msgid "Display images inline"
-msgstr "Mostra les imatges inserides"
+#: src/prefs_account.c:341
+msgid "None (SMTP only)"
+msgstr "Cap (només SMTP)"
 
-#: src/prefs_image_viewer.c:89
-msgid "Print images"
-msgstr "Imprimir imatges"
+#: src/prefs_account.c:1034
+msgid "Name of account"
+msgstr "Nom del compte"
 
-#: src/prefs_image_viewer.c:139
-msgid "Image Viewer"
-msgstr "Visor d'imatges"
+#: src/prefs_account.c:1043
+msgid "Set as default"
+msgstr "Marcar com a primària"
 
-#: src/prefs_logging.c:147 src/prefs_logging.c:254
-msgid "Restrict the log window to"
-msgstr "Restringir la finestra de traça a"
+#: src/prefs_account.c:1051
+msgid "Personal information"
+msgstr "Informació personal"
 
-#: src/prefs_logging.c:159 src/prefs_logging.c:266
-msgid "0 to stop logging in the log window"
-msgstr "0 per deixar de registrar a la finestra de traça"
+#: src/prefs_account.c:1060
+msgid "Full name"
+msgstr "Nom complet"
 
-#: src/prefs_logging.c:161 src/prefs_logging.c:268
-msgid "lines"
-msgstr "línies"
+#: src/prefs_account.c:1066
+msgid "Mail address"
+msgstr "Adreça de correu"
 
-#: src/prefs_logging.c:171
-msgid "Filtering/processing log"
-msgstr "Filtrat/processar traça de depuració"
+#: src/prefs_account.c:1129 src/wizard.c:1475
+msgid "Auto-configure"
+msgstr "Configurar automàticament"
 
-#: src/prefs_logging.c:174
-msgid "Enable logging of filtering/processing rules"
-msgstr "Activar traça de les regles de filtratge/processar regles"
+#: src/prefs_account.c:1131 src/wizard.c:1477
+msgid "Cancel"
+msgstr "Cancel·lar"
 
-#: src/prefs_logging.c:180
+#: src/prefs_account.c:1147
 msgid ""
-"If checked, turns on logging of filtering and processing rules.\n"
-"The log is accessible from 'Tools/Filtering log'.\n"
-"Caution: enabling this option will slow down the filtering/processing, this "
-"might be critical when applying many rules upon thousands of messages."
+"<span weight=\"bold\">Warning: this version of Claws Mail\n"
+"has been built without IMAP and News support.</span>"
 msgstr ""
-"Si està marcat, activa la traça de les regles de processament i filtratge\n"
-"El registre de la traça es accessible desde 'Eines/Finestra de traça'.\n"
-"Compte: activar aquesta opció alentirà el filtratge/processament, això pot "
-"ser critic quan s'apliquin moltes regles sobre miles de missatges."
-
-#: src/prefs_logging.c:187
-msgid "Log filtering/processing when..."
-msgstr "Traçat de les regles de filtratge/processar quan.."
+"<span weight=\"bold\">Avís: aquesta versió de Claws Mail\n"
+"ha estat compilat sense suport IMAP ni suport per grups de Notícies.</span>"
 
-#: src/prefs_logging.c:191
-msgid "filtering at incorporation"
-msgstr "filtrant al incorporar"
+#: src/prefs_account.c:1176
+msgid "This server requires authentication"
+msgstr "Aquest servidor requereix autentificació"
 
-#: src/prefs_logging.c:193
-msgid "pre-processing folders"
-msgstr "pre-processant carpetes"
+#: src/prefs_account.c:1183
+msgid "Authenticate on connect"
+msgstr "Autentificació al connectar"
 
-#: src/prefs_logging.c:198
-msgid "manually filtering"
-msgstr "filtrant manualment"
+#: src/prefs_account.c:1237
+msgid "News server"
+msgstr "Servidor de news"
 
-#: src/prefs_logging.c:200
-msgid "post-processing folders"
-msgstr "post-processant carpetes"
+#: src/prefs_account.c:1243
+msgid "Server for receiving"
+msgstr "Servidor de recepció"
 
-#: src/prefs_logging.c:207
-msgid "processing folders"
-msgstr "Processant carpetes"
+#: src/prefs_account.c:1249
+msgid "Local mailbox"
+msgstr "Bústia local"
 
-#: src/prefs_logging.c:222
-msgid "Log level"
-msgstr "Nivell de traça"
+#: src/prefs_account.c:1256
+msgid "SMTP server (send)"
+msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_logging.c:231
-msgid "Low"
-msgstr "Baix"
+#: src/prefs_account.c:1264
+msgid "Use mail command rather than SMTP server"
+msgstr "Useu commanda per correu enlloc de servidor SMTP"
 
-#: src/prefs_logging.c:232
-msgid "Medium"
-msgstr "Mig"
+#: src/prefs_account.c:1273
+msgid "command to send mails"
+msgstr "ordre per enviar els correus"
 
-#: src/prefs_logging.c:233
-msgid "High"
-msgstr "Alt"
+#: src/prefs_account.c:1338
+#, c-format
+msgid "Account%d"
+msgstr "Compte%d"
 
-#: src/prefs_logging.c:238
-msgid ""
-"Select the level of detail of the logging.\n"
-"Choose Low to see when rules are applied, which conditions match or don't "
-"match and what actions are performed.\n"
-"Choose Medium to see more details about the message that is being processed, "
-"and why rules are skipped.\n"
-"Choose High to explicitly show the reason why all rules are processed or "
-"skipped, and why all conditions are matched or not matched.\n"
-"Caution: the higher the level, the greater the impact on performance."
-msgstr ""
-"Seleccioneu el nivell de detall mostrat de la traça.\n"
-"Escolliu nívell Baix per veure quines regles s'han aplicat, quines "
-"condiciones casen o no i quines accions s'han dut a terme.\n"
-"Escolliu nivell Mig per veure més detalls sobre el missatge que s'està "
-"processat i perque les regles s'han refusat.\n"
-"Escolliu nivell Alt per mostrar explícitament la raó per la qual totes les "
-"regles s'han refusat i quines condicions casen o no.\n"
-"Compte: quan més alt és el nivell, més afectarà al rendiment."
+#: src/prefs_account.c:1424
+msgid "Local"
+msgstr "Local"
 
-#: src/prefs_logging.c:280
-msgid "Disk log"
-msgstr "Traça de disc"
+#: src/prefs_account.c:1430 src/prefs_account.c:1519
+msgid "Default Inbox"
+msgstr "Bústia d'entrada per defecte"
 
-#: src/prefs_logging.c:282
-msgid "Write the following information to disk..."
-msgstr "Escriure la següent informació al disc..."
+#: src/prefs_account.c:1437 src/prefs_account.c:1444 src/prefs_account.c:1526
+#: src/prefs_account.c:1533
+msgid "Unfiltered messages will be stored in this folder"
+msgstr "Els missatges sense filtrar es guardaran en aquesta carpeta"
 
-#: src/prefs_logging.c:290
-msgid "Warning messages"
-msgstr "Missatges d'avís"
+#: src/prefs_account.c:1452
+msgid "Use secure authentication (APOP)"
+msgstr "Usar autentificació segura (APOP)"
 
-#: src/prefs_logging.c:291
-msgid "Network protocol messages"
-msgstr "Missatges del protocol de xarxa"
+#: src/prefs_account.c:1455
+msgid "Remove messages on server when received"
+msgstr "Esborrar missatges del servidor quan s'hagin rebut"
 
-#: src/prefs_logging.c:295
-msgid "Error messages"
-msgstr "Missatges d'error"
+#: src/prefs_account.c:1466
+msgid "Remove after"
+msgstr "Esborrar després de"
 
-#: src/prefs_logging.c:296
-msgid "Status messages for filtering/processing log"
-msgstr "Missatges d'estat de la traça del filtratge/processament"
+#: src/prefs_account.c:1473 src/prefs_account.c:1483
+msgid "0 days and 0 hours : remove immediately"
+msgstr "0 dies i 0 hores : esborrar immediatament"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
-msgid "Other"
-msgstr "Altres"
+#: src/prefs_account.c:1496
+msgid "Receive size limit"
+msgstr "Límit de tamany al rebre"
 
-#: src/prefs_logging.c:428
-msgid "Logging"
-msgstr "Traçar"
+#: src/prefs_account.c:1499
+msgid ""
+"Messages over this limit will be partially retrieved. When selecting them "
+"you will be able to download them fully or delete them."
+msgstr ""
+"Els missatges que sobrepassin aquest límit seran parcialment recuperats. "
+"Quan els seleccioneu podreu descarregar-los completament o esborrar-los"
 
-#: src/prefs_matcher.c:331
-msgid "more than"
-msgstr "major que"
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
+msgid "NNTP"
+msgstr "NNTP"
 
-#: src/prefs_matcher.c:332
-msgid "less than"
-msgstr "Menor que"
+#: src/prefs_account.c:1546
+msgid "Maximum number of articles to download"
+msgstr "Nmero màxim d'articles a descarregar"
 
-#: src/prefs_matcher.c:338
-msgid "weeks"
-msgstr "setmanes"
+#: src/prefs_account.c:1556
+msgid "unlimited if 0 is specified"
+msgstr "sense límit si s'especifica 0"
 
-#: src/prefs_matcher.c:342
-msgid "higher than"
-msgstr "més alt que"
+#: src/prefs_account.c:1592
+msgid "IMAP server directory"
+msgstr "Directori del servidor IMAP"
 
-#: src/prefs_matcher.c:343
-msgid "lower than"
-msgstr "més baix que"
+#: src/prefs_account.c:1596
+msgid "(usually empty)"
+msgstr "(normalment buït)"
 
-#: src/prefs_matcher.c:344 src/prefs_matcher.c:350
-msgid "exactly"
-msgstr "exactament"
+#: src/prefs_account.c:1610
+msgid "Show subscribed folders only"
+msgstr "Mostrar només les carpetes subscrites"
 
-#: src/prefs_matcher.c:348
-msgid "greater than"
-msgstr "Puntuació major que"
+#: src/prefs_account.c:1617
+msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
+msgstr "Mode d'ample de banda eficient (evita recuperar etiquetes remotes)"
 
-#: src/prefs_matcher.c:349
-msgid "smaller than"
-msgstr "més petit que"
+#: src/prefs_account.c:1619
+msgid "This mode uses less bandwidth, but can be slower with some servers."
+msgstr ""
+"Aquest mode usa menys ample de banda, però pot ser més lent amb alguns "
+"servidors..."
 
-#: src/prefs_matcher.c:354
-msgid "bytes"
-msgstr "bytes"
+#: src/prefs_account.c:1626
+msgid "Filter messages on receiving"
+msgstr "Filtrar missatges al rebre"
 
-#: src/prefs_matcher.c:355
-msgid "kilobytes"
-msgstr "kilobytes"
+#: src/prefs_account.c:1633
+msgid "Allow filtering using plugins on receiving"
+msgstr "Permetre filtrar usant mòduls al rebre"
 
-#: src/prefs_matcher.c:356
-msgid "megabytes"
-msgstr "megabytes"
+#: src/prefs_account.c:1637
+msgid "'Get Mail' checks for new messages on this account"
+msgstr "'Rebre' comprova si hi ha nous missatges en aquest compte"
 
-#: src/prefs_matcher.c:360
-msgid "contains"
-msgstr "conté"
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
+#: src/prefs_matcher.c:623 src/prefs_matcher.c:1974 src/prefs_matcher.c:1996
+msgid "Header"
+msgstr "Capçalera"
 
-#: src/prefs_matcher.c:361
-msgid "doesn't contain"
-msgstr "no conté"
+#: src/prefs_account.c:1720
+msgid "Generate Message-ID"
+msgstr "Generar Message-ID"
 
-#: src/prefs_matcher.c:385
-msgid "headers part"
-msgstr "secció capçaleres"
+#: src/prefs_account.c:1723
+msgid "Send account mail address in Message-ID"
+msgstr "Enviar adreça de correu dins el Message-ID"
 
-#: src/prefs_matcher.c:386
-msgid "headers values"
-msgstr "valors de les capçaleres"
+#: src/prefs_account.c:1726
+msgid "Add user agent header"
+msgstr "Afegir capçalera Agent d'Usuari"
 
-#: src/prefs_matcher.c:387
-msgid "body part"
-msgstr "secció cos"
+#: src/prefs_account.c:1733
+msgid "Add user-defined header"
+msgstr "Afegir capçaleres d'usuari"
 
-#: src/prefs_matcher.c:388
-msgid "whole message"
-msgstr "missatge complet"
+#: src/prefs_account.c:1748
+msgid "SMTP Authentication (SMTP AUTH)"
+msgstr "Autentificació SMTP (SMTP AUTH)"
 
-# RML I think this is ambiguous:
-# RML on filtering is a verb ("Marcar") while in summary colunm it's really
-# RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
-#: src/prefs_matcher.c:394 src/summaryview.c:6332
-msgid "Marked"
-msgstr "Marcat"
+#: src/prefs_account.c:1833
+msgid ""
+"If you leave these entries empty, the same user ID and password as receiving "
+"will be used."
+msgstr ""
+"Si deixeu aquests camps buits, s'usarà el mateix ID d'usuari i contrasenya "
+"usats per a la recepció."
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6330
-msgid "Deleted"
-msgstr "Esborrat"
+#: src/prefs_account.c:1844
+msgid "Authenticate with POP3 before sending"
+msgstr "Autentificació amb POP3 abans d'enviar"
 
-#: src/prefs_matcher.c:396
-msgid "Replied"
-msgstr "Contestat"
+#: src/prefs_account.c:1859
+msgid "POP authentication timeout: "
+msgstr "Temps límit per autentificació POP: "
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6324
-msgid "Forwarded"
-msgstr "Reenviat"
+#: src/prefs_account.c:1867
+msgid "minutes"
+msgstr "minuts"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6314 src/toolbar.c:416
-#: src/toolbar.c:934 src/toolbar.c:1978
-msgid "Spam"
-msgstr "Correu brossa"
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
+msgid "Signature"
+msgstr "Signatura"
 
-#: src/prefs_matcher.c:400
-msgid "Has attachment"
-msgstr "Té adjunts"
+#: src/prefs_account.c:1940
+msgid "Automatically insert signature"
+msgstr "Insertar signatura automàticament"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6350
-msgid "Signed"
-msgstr "Signat"
+#: src/prefs_account.c:1945
+msgid "Signature separator"
+msgstr "Separador de signatura"
 
-#: src/prefs_matcher.c:405
-msgid "set"
-msgstr "establert"
+#: src/prefs_account.c:1970
+msgid "Command output"
+msgstr "Sortida de l'ordre"
 
-#: src/prefs_matcher.c:406
-msgid "not set"
-msgstr "no establert."
+#: src/prefs_account.c:2003
+msgid "Automatically set the following addresses"
+msgstr "Establir les següents adreces automàticament"
 
-#: src/prefs_matcher.c:410
-msgid "yes"
-msgstr "si"
+#: src/prefs_account.c:2055
+msgid "Spell check dictionaries"
+msgstr "Diccionaris de correcció ortogràfica"
 
-#: src/prefs_matcher.c:411
-msgid "no"
-msgstr "no"
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1092
+#: src/prefs_spelling.c:163
+msgid "Default dictionary"
+msgstr "Diccionari per omissió"
 
-#: src/prefs_matcher.c:415
-msgid "Any tags"
-msgstr "Qualsevol etiqueta"
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1126
+#: src/prefs_spelling.c:176
+msgid "Default alternate dictionary"
+msgstr "Diccionari alternatiu per omissió"
 
-#: src/prefs_matcher.c:416
-msgid "Specific tag"
-msgstr "Etiqueta específica"
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1442
+#: src/prefs_folder_item.c:1833 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
+msgid "Compose"
+msgstr "Composar"
 
-#: src/prefs_matcher.c:420
-msgid "ignored"
-msgstr "ignorat"
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1470 src/prefs_quote.c:134
+#: src/toolbar.c:409
+msgid "Reply"
+msgstr "Respondre"
 
-#: src/prefs_matcher.c:421
-msgid "not ignored"
-msgstr "no ignorat"
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
+#: src/prefs_folder_item.c:1498 src/prefs_quote.c:149 src/toolbar.c:413
+msgid "Forward"
+msgstr "Reenviar"
 
-#: src/prefs_matcher.c:422
-msgid "watched"
-msgstr "vist"
+#: src/prefs_account.c:2241
+msgid "Default privacy system"
+msgstr "Sistema de privacitat per omissió"
 
-#: src/prefs_matcher.c:423
-msgid "not watched"
-msgstr "no vist"
+#: src/prefs_account.c:2270
+msgid "Always sign messages"
+msgstr "Sempre missatges signats"
 
-#: src/prefs_matcher.c:427
-msgid "found"
-msgstr "trobat"
+#: src/prefs_account.c:2272
+msgid "Always encrypt messages"
+msgstr "Sempre missatges encriptats"
 
-#: src/prefs_matcher.c:428
-msgid "not found"
-msgstr "no trobat"
+#: src/prefs_account.c:2274
+msgid "Always sign messages when replying to a signed message"
+msgstr "Encriptar missatges sempre que se'n contesti un d'escriptat"
 
-#: src/prefs_matcher.c:432
-msgid "0 (Passed)"
-msgstr "0 (Revisat)"
+#: src/prefs_account.c:2277
+msgid "Always encrypt messages when replying to an encrypted message"
+msgstr "Encriptar missatges sempre que se'n contesti un escriptat"
 
-#: src/prefs_matcher.c:433
-msgid "non-0 (Failed)"
-msgstr "no-0 (fallit)"
+#: src/prefs_account.c:2280
+msgid "Encrypt sent messages with your own key in addition to recipient's"
+msgstr ""
+"Encriptar els missatges enviats amb la vostra pròpia clau a més de la del "
+"destinatari"
 
-#: src/prefs_matcher.c:569
-msgid "Condition configuration"
-msgstr "Configuració de condició"
+#: src/prefs_account.c:2282
+msgid "Save sent encrypted messages as clear text"
+msgstr "Desar en clar els missatges enviats encriptats"
 
-#: src/prefs_matcher.c:613
-msgid "Match criteria:"
-msgstr "Criteri de selecció"
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
+msgid "Don't use SSL"
+msgstr "No usar SSL"
 
-#: src/prefs_matcher.c:622
-msgid "All messages"
-msgstr "Tots els missatges"
+#: src/prefs_account.c:2441
+msgid "Use SSL for POP3 connection"
+msgstr "Usar SSL per a la connexió POP3"
 
-#: src/prefs_matcher.c:624
-msgid "Age"
-msgstr "Edat"
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
+msgid "Use STARTTLS command to start SSL session"
+msgstr "Usar l'ordre STARTTLS per obrir la sessió SSL"
 
-#: src/prefs_matcher.c:625
-msgid "Phrase"
-msgstr "Frase"
+#: src/prefs_account.c:2456
+msgid "Use SSL for IMAP4 connection"
+msgstr "Usar SSL per a la connexió IMAP4"
 
-#: src/prefs_matcher.c:626
-msgid "Flags"
-msgstr "Etiquetes"
+#: src/prefs_account.c:2476
+msgid "Use SSL for NNTP connection"
+msgstr "Usar SSL per a la connexió NNTP"
 
-#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:410
-msgid "Color labels"
-msgstr "Etiquetes de color"
+#: src/prefs_account.c:2480
+msgid "Send (SMTP)"
+msgstr "Enviar (SMTP)"
 
-#: src/prefs_matcher.c:628
-msgid "Thread"
-msgstr "Fil"
+#: src/prefs_account.c:2484
+msgid "Don't use SSL (but, if necessary, use STARTTLS)"
+msgstr "No usar SSL (però usar STARTTLS si és necessari)"
 
-#: src/prefs_matcher.c:631
-msgid "Partially downloaded"
-msgstr "Parcialment descarregat"
+#: src/prefs_account.c:2487
+msgid "Use SSL for SMTP connection"
+msgstr "Usar SSL per a la connexió SMTP"
 
-#: src/prefs_matcher.c:634
-msgid "External program test"
-msgstr "Prova de programes externs"
+#: src/prefs_account.c:2495
+msgid "Client certificates"
+msgstr "Certificats del client"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1615 src/prefs_matcher.c:1630
-#: src/prefs_matcher.c:2516
-msgctxt "Filtering Matcher Menu"
-msgid "All"
-msgstr "Tots"
+#: src/prefs_account.c:2503
+msgid "Certificate for receiving"
+msgstr "Servidor per recepció"
 
-#: src/prefs_matcher.c:743
-msgid "Use regexp"
-msgstr "Usar exp.reg."
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
+msgid "Client certificate file as a PKCS12 or PEM file"
+msgstr "Certificat de client com a arxiu PKCS12 o PEM"
 
-#: src/prefs_matcher.c:819
-msgid "Message must match"
-msgstr "El missatge ha de concordar"
+#: src/prefs_account.c:2525
+msgid "Certificate for sending"
+msgstr "Certificat per enviar"
 
-#: src/prefs_matcher.c:823
-msgid "at least one"
-msgstr "almenys un"
+#: src/prefs_account.c:2558
+msgid "Automatically accept unknown valid SSL certificates"
+msgstr "Accepta automàticament els certificats SSL vàlids desconeguts"
 
-#: src/prefs_matcher.c:824
-msgid "all"
-msgstr "tots"
+#: src/prefs_account.c:2561
+msgid "Use non-blocking SSL"
+msgstr "Usar SSL no-bloquejant"
 
-#: src/prefs_matcher.c:827
-msgid "of above rules"
-msgstr "de les regles anteriors"
+#: src/prefs_account.c:2573
+msgid "Turn this off if you have SSL connection problems"
+msgstr "Desactiveu això si teniu problemes de connexió amb SSL"
 
-#: src/prefs_matcher.c:1533 src/prefs_matcher.c:1599
-msgid "Search pattern is not set."
-msgstr "Patró de cerca no establert"
+#: src/prefs_account.c:2691
+msgid "SMTP port"
+msgstr "Port SMTP"
 
-#: src/prefs_matcher.c:1542
-msgid "Test command is not set."
-msgstr "Comanda de validació no establerta."
+#: src/prefs_account.c:2698
+msgid "POP3 port"
+msgstr "Port POP3"
 
-#: src/prefs_matcher.c:1616
-msgid "all addresses in all headers"
-msgstr "Totes les adreces a totes les capçaleres"
+#: src/prefs_account.c:2705
+msgid "IMAP4 port"
+msgstr "Port IMAP4"
 
-#: src/prefs_matcher.c:1619
-msgid "any address in any header"
-msgstr "Qualsevol adreça a qualsevol capçalera"
+#: src/prefs_account.c:2712
+msgid "NNTP port"
+msgstr "Port NNTP"
 
-#: src/prefs_matcher.c:1621
-#, c-format
-msgid "the address(es) in header '%s'"
-msgstr "la/les adreça/ces a la capçalera/es '%s'"
+#: src/prefs_account.c:2718
+msgid "Domain name"
+msgstr "Nom del domini"
 
-#: src/prefs_matcher.c:1622
-#, c-format
+#: src/prefs_account.c:2721
 msgid ""
-"Book/folder path is not set.\n"
-"\n"
-"If you want to match %s against the whole address book, you have to select "
-"'%s' from the book/folder drop-down list."
+"The domain name will be used in the generated Message-ID, and when "
+"connecting to SMTP servers."
 msgstr ""
-"La ruta del llibre/carpeta no ha estat definida.\n"
-"\n"
-"Si vols que l'adreça %s coincideixi amb tot el llibre d'adreces, hauràs de "
-"seleccionar '%s' desde la llista desplegable de llibre/carpeta."
-
-#: src/prefs_matcher.c:1841
-msgid "Headers part"
-msgstr "Secció capçaleres"
-
-#: src/prefs_matcher.c:1845
-msgid "Headers values"
-msgstr "Valors de les capçaleres"
+"El nom del domini serà usat al Message-ID generat i al connectar a servidors "
+"SMTP."
 
-#: src/prefs_matcher.c:1849
-msgid "Body part"
-msgstr "Secció cos"
+#: src/prefs_account.c:2735
+msgid "Use command to communicate with server"
+msgstr "Usar comanda per a comunicar-se amb el servidor"
 
-#: src/prefs_matcher.c:1853
-msgid "Whole message"
-msgstr "Missatge complet"
+#: src/prefs_account.c:2743
+msgid "Move deleted mails to trash and expunge immediately"
+msgstr "Moure correus esborrats a la paperera i purgar immediatament"
 
-#: src/prefs_matcher.c:1966 src/prefs_matcher.c:2008
-msgid "in"
-msgstr "dins"
+#: src/prefs_account.c:2745
+msgid ""
+"Moves deleted mails to trash instead of using the \\Deleted flag without "
+"expunging."
+msgstr ""
+"Moure correus esborrats a la paperera enlloc d'usar el \\Marca d'esborrat "
+"sense expurgar."
 
-#: src/prefs_matcher.c:1968
-msgid "content is"
-msgstr "contingut és"
+#: src/prefs_account.c:2749
+msgid "Mark cross-posted messages as read and color:"
+msgstr "Marcar els misstages creuats com a llegits i de color:"
 
-#: src/prefs_matcher.c:1977
-msgid "Age is"
-msgstr "L'edat és"
+#: src/prefs_account.c:2805
+msgid "Put sent messages in"
+msgstr "Posar missatges enviats a"
 
-#: src/prefs_matcher.c:1982
-msgid "Flag"
-msgstr "Marcador"
+#: src/prefs_account.c:2807
+msgid "Put queued messages in"
+msgstr "Posar missatges encuats a"
 
-#: src/prefs_matcher.c:1983 src/prefs_matcher.c:1998
-msgid "is"
-msgstr "és"
+#: src/prefs_account.c:2809
+msgid "Put draft messages in"
+msgstr "Posar borradors de missatges a"
 
-#: src/prefs_matcher.c:1988
-msgid "Name:"
-msgstr "Nom: "
+#: src/prefs_account.c:2811
+msgid "Put deleted messages in"
+msgstr "Posar missatges esborrats a"
 
-#: src/prefs_matcher.c:1997
-msgid "Label"
-msgstr "Etiqueta"
+#: src/prefs_account.c:2871
+msgid "Account name is not entered."
+msgstr "No s'ha especificat el nom del compte."
 
-#: src/prefs_matcher.c:2003
-msgid "Value:"
-msgstr "Valor:"
+#: src/prefs_account.c:2875
+msgid "Mail address is not entered."
+msgstr "No s'ha especificat l'adreça de correu."
 
-#: src/prefs_matcher.c:2018
-msgid "Score is"
-msgstr "Puntuació és"
+#: src/prefs_account.c:2882
+msgid "SMTP server is not entered."
+msgstr "No s'ha especificat el servidor SMTP."
 
-#: src/prefs_matcher.c:2019
-msgid "points"
-msgstr "punts"
+#: src/prefs_account.c:2887
+msgid "User ID is not entered."
+msgstr "No s'ha especificat l'usuari."
 
-#: src/prefs_matcher.c:2029
-msgid "Size is"
-msgstr "El tamany és"
+#: src/prefs_account.c:2892
+msgid "POP3 server is not entered."
+msgstr "No s'ha especificat el servidor POP3."
 
-#: src/prefs_matcher.c:2034
-msgid "Scope:"
-msgstr "Marcador:"
+#: src/prefs_account.c:2912
+msgid "The default Inbox folder doesn't exist."
+msgstr "La bústia d'entrada per omissió no existeix."
 
-#: src/prefs_matcher.c:2036
-msgid "tags"
-msgstr "etiquetes"
+#: src/prefs_account.c:2918
+msgid "IMAP4 server is not entered."
+msgstr "No s'ha especificat el servidor IMAP4."
 
-#: src/prefs_matcher.c:2041
-msgid "type is"
-msgstr "tipus és"
+#: src/prefs_account.c:2923
+msgid "NNTP server is not entered."
+msgstr "No s'ha especificat el servidor NNTP."
 
-#: src/prefs_matcher.c:2045
-msgid "Program returns"
-msgstr "El programa retorna"
+#: src/prefs_account.c:2929
+msgid "local mailbox filename is not entered."
+msgstr "no s'ha especificat el nom de l'arxiu de la bústia local."
 
-#: src/prefs_matcher.c:2115
-msgid ""
-"The entry was not saved.\n"
-"Close anyway?"
-msgstr ""
-"L'entrada no ha sigut desada.\n"
-"Tancar igualment?"
+#: src/prefs_account.c:2935
+msgid "mail command is not entered."
+msgstr "no s'ha especificat la comanda de correu."
 
-#: src/prefs_matcher.c:2181
-msgid "Match Type: 'Test'"
-msgstr "Tipus de coincidència: 'Provar'"
+#: src/prefs_account.c:3252
+msgid "Receive"
+msgstr "Rebre"
 
-#: src/prefs_matcher.c:2182
-msgid ""
-"'Test' allows you to test a message or message element using an external "
-"program or script. The program will return either 0 or 1.\n"
-"\n"
-"The following symbols can be used:"
-msgstr ""
-"'Provar' us permet provar un missatge o element del missatge usant un "
-"programa o script extern. El programa haurà de retornar 0 o 1.\n"
-"\n"
-"Podeu usar els següents símbols:"
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1849 src/prefs_quote.c:238
+msgid "Templates"
+msgstr "Plantilles"
 
-#: src/prefs_matcher.c:2281
-msgid "Current condition rules"
-msgstr "Regles de condició actuals"
+#: src/prefs_account.c:3324
+msgid "Privacy"
+msgstr "Privacitat"
 
-#: src/prefs_message.c:120
-msgid "Headers"
-msgstr "Capçaleres"
+#: src/prefs_account.c:3435
+msgid "Advanced"
+msgstr "Avançades"
 
-#: src/prefs_message.c:123
-msgid "Display header pane above message view"
-msgstr "Mostrar panell de capçaleres sobre el missatge"
+#: src/prefs_account.c:3726
+msgid "Preferences for new account"
+msgstr "Preferències per a un nou compte"
 
-#: src/prefs_message.c:127
-msgid "Display (X-)Face in message view"
-msgstr "Mostrar (X-)Face en la vista del missatge"
+#: src/prefs_account.c:3728
+#, c-format
+msgid "%s - Account preferences"
+msgstr "%s - Preferències del compte"
 
-#: src/prefs_message.c:130
-msgid "Display Face in message view"
-msgstr "Mostrar Face en la vista del missatge"
+#: src/prefs_account.c:3850 src/wizard.c:1374
+msgid "Failed (wrong address)"
+msgstr "Ha fallat (adreça incorrecte)"
 
-#: src/prefs_message.c:144
-msgid "Display headers in message view"
-msgstr "Mostra les capçaleres a la vista del missatge"
+#: src/prefs_account.c:3933
+msgid "Select signature file"
+msgstr "Seleccionar arxiu de signatura"
 
-#: src/prefs_message.c:156
-msgid "HTML messages"
-msgstr "Missatges HTML"
+#: src/prefs_account.c:3951 src/prefs_account.c:3968 src/wizard.c:1057
+msgid "Select certificate file"
+msgstr "Seleccionar arxiu de certificat"
 
-#: src/prefs_message.c:159
-msgid "Render HTML messages as text"
-msgstr "Renderitzar missatges HTML com si fos text"
+#: src/prefs_account.c:4064
+msgid "Protocol:"
+msgstr "Protocol:"
 
-#: src/prefs_message.c:162
-msgid "Render HTML-only messages with plugin if possible"
-msgstr "Mostrar els missatges HTML amb un mòdul si és possible"
+#: src/prefs_account.c:4204
+#, c-format
+msgid "%s (plugin not loaded)"
+msgstr "%s (mòdul no carregat)"
 
-#: src/prefs_message.c:165
-msgid "Select the HTML part of multipart/alternative messages"
-msgstr "Seleccionar la part HTML en missatges multipart/alternative"
+#: src/prefs_actions.c:223
+msgid "Actions configuration"
+msgstr "Configuració d'accions"
 
-#: src/prefs_message.c:175
-msgid "Line space"
-msgstr "Interlineat"
+#: src/prefs_actions.c:250
+msgid "Menu name"
+msgstr "Nom de menú"
 
-#: src/prefs_message.c:195
-msgid "Scroll"
-msgstr "Desplaçament"
+#: src/prefs_actions.c:283
+msgid "Shell command"
+msgstr "Comanda de shell"
 
-#: src/prefs_message.c:197
-msgid "Half page"
-msgstr "Mitja pàgina"
+#: src/prefs_actions.c:293
+msgid "Filter action"
+msgstr "Acció de filtrat"
 
-#: src/prefs_message.c:203
-msgid "Smooth scroll"
-msgstr "Desplaçament suau"
+#: src/prefs_actions.c:299
+msgid "Edit filter action"
+msgstr "Editar acció de filtrat"
 
-#: src/prefs_message.c:209
-msgid "Step"
-msgstr "Pas"
+#: src/prefs_actions.c:327
+msgid "Append the new action above to the list"
+msgstr "Afegir la nova acció a sobre de la llista"
 
-#: src/prefs_message.c:230
-msgid "Show attachment descriptions (rather than names)"
-msgstr "Mostrar descripcions dels adjunts (enlloc de noms)"
+#: src/prefs_actions.c:335
+msgid "Replace the selected action in list with the action above"
+msgstr "Substituïr l'acció seleccionada a la llista amb la acció de dalt"
 
-#: src/prefs_message.c:233
-msgid "Quotation"
-msgstr "Símbol"
+#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:781 src/prefs_template.c:320
+#: src/prefs_toolbar.c:1056
+msgid "Re_move"
+msgstr "Es_borrar"
 
-#: src/prefs_message.c:242
-msgid "Collapse quoted text on double click"
-msgstr "Amaga el text entre cometes amb doble click"
+#: src/prefs_actions.c:345
+msgid "Delete the selected action from the list"
+msgstr "Esborrar l'acció seleccionada de la llista"
 
-#: src/prefs_message.c:249
-msgid "Treat these characters as quotation marks: "
-msgstr "Tractar aquests caràcters com a símbols de marcat: "
+#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:338
+msgid "Clear all the input fields in the dialog"
+msgstr "Netejar tots els camps d'entrada dins el diàleg"
 
-#: src/prefs_message.c:355
-msgid "Text Options"
-msgstr "Opcions de Text"
+#: src/prefs_actions.c:363
+msgid "Show information on configuring actions"
+msgstr "Mostrar informació a les accions de configuració"
 
-#: src/prefs_msg_colors.c:147
-msgid "Message view"
-msgstr "Vista de missatges"
+#: src/prefs_actions.c:394
+msgid "Move the selected action up"
+msgstr "Moure l'acció seleccionada amunt"
 
-#: src/prefs_msg_colors.c:154
-msgid "Enable coloration of message text"
-msgstr "Permetre colorejat en el text del missatge"
+#: src/prefs_actions.c:402
+msgid "Move selected action down"
+msgstr "Moure l'acció seleccionada avall"
 
-#: src/prefs_msg_colors.c:162
-msgid "Quote"
-msgstr "Marcat"
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
+#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:900
+#: src/prefs_template.c:472
+msgid "(New)"
+msgstr "(Nova)"
 
-#: src/prefs_msg_colors.c:174
-msgid "Cycle quote colors"
-msgstr "Reusar colors d'entrecomillat"
+#: src/prefs_actions.c:600
+msgid "Menu name is not set."
+msgstr "No s'ha establert el nom del men."
 
-#: src/prefs_msg_colors.c:178
-msgid "If there are more than 3 quote levels, the colors will be reused"
-msgstr ""
-"Si hi ha més de 3 nívells de entrecomillat, els colors serna re-utilitzats"
+#: src/prefs_actions.c:605
+msgid "A leading '/' is not allowed in the menu name."
+msgstr "No es permet '/' a l'inici del nom del menú."
 
-#: src/prefs_msg_colors.c:184
-msgid "1st Level"
-msgstr "1er nivell"
+#: src/prefs_actions.c:610
+msgid "Colon ':' is not allowed in the menu name."
+msgstr "No es permet ':' (dos punts) en el nom del menú."
 
-#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216
-#: src/prefs_msg_colors.c:242
-msgid "Text"
-msgstr "Text"
+#: src/prefs_actions.c:616
+msgid "There is an action with this name already."
+msgstr "Ja existeix una acció amb aquest mateix nom."
 
-#: src/prefs_msg_colors.c:204
-msgctxt "Tooltip"
-msgid "Pick color for 1st level text"
-msgstr "Escollir color per al text de primer nivell"
+#: src/prefs_actions.c:635
+msgid "Menu name is too long."
+msgstr "El nom del menú és masssa llarg."
 
-#: src/prefs_msg_colors.c:210
-msgid "2nd Level"
-msgstr "2on nivell"
+#: src/prefs_actions.c:644
+msgid "Command-line not set."
+msgstr "Línia de comandes no especificada."
 
-#: src/prefs_msg_colors.c:230
-msgctxt "Tooltip"
-msgid "Pick color for 2nd level text"
-msgstr "Escollir color per al text de 2on nivell"
+#: src/prefs_actions.c:649
+msgid "Menu name and command are too long."
+msgstr "El nom del menú i la comanda són massa llargs."
 
-#: src/prefs_msg_colors.c:236
-msgid "3rd Level"
-msgstr "3r nivell"
+#: src/prefs_actions.c:655
+#, c-format
+msgid ""
+"The command\n"
+"%s\n"
+"has a syntax error."
+msgstr ""
+"La comanda\n"
+"%s\n"
+"té errors sintàctics."
 
-#: src/prefs_msg_colors.c:256
-msgctxt "Tooltip"
-msgid "Pick color for 3rd level text"
-msgstr "Escollir color per al text de 3r nivell"
+#: src/prefs_actions.c:713
+msgid "Delete action"
+msgstr "Esborrar acció"
 
-#: src/prefs_msg_colors.c:263
-msgid "Enable coloration of text background"
-msgstr "Permetre colors en el fons del missatge"
+#: src/prefs_actions.c:714
+msgid "Do you really want to delete this action?"
+msgstr "Realment vols esborrar aquesta acció?"
 
-#: src/prefs_msg_colors.c:279
-msgctxt "Tooltip"
-msgid "Pick color for 1st level text background"
-msgstr "Escollir color per al fons del text de 1er nivell"
+#: src/prefs_actions.c:734
+msgid "Delete all actions"
+msgstr "Esborrar totes les accions"
 
-#: src/prefs_msg_colors.c:300
-msgctxt "Tooltip"
-msgid "Pick color for 2nd level text background"
-msgstr "Escollir color per al fons del text de 2n nivell"
+#: src/prefs_actions.c:735
+msgid "Do you really want to delete all the actions?"
+msgstr "Realment vols esborrar totes les accions?"
 
-#: src/prefs_msg_colors.c:321
-msgctxt "Tooltip"
-msgid "Pick color for 3rd level text background"
-msgstr "Escollir color per al fons del text de 3r nivell"
+#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2125
+#: src/prefs_template.c:572 src/prefs_template.c:597
+msgid "Entry not saved"
+msgstr "Entrada no desada"
 
-#: src/prefs_msg_colors.c:341
-msgctxt "Tooltip"
-msgid "Pick color for links"
-msgstr "Escollir color per als enllaços"
+#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
+msgid "The entry was not saved. Close anyway?"
+msgstr "L'entrada no s'ha desat. Tancar de totes maneres?"
 
-#: src/prefs_msg_colors.c:343
-msgid "URI link"
-msgstr "URI d'enllaç"
+#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
+#: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2127
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
+msgid "+_Continue editing"
+msgstr "+_Continuar editant"
 
-#: src/prefs_msg_colors.c:360
-msgctxt "Tooltip"
-msgid "Pick color for signatures"
-msgstr "Escollir color per a les signatures"
+#: src/prefs_actions.c:903
+msgid "Actions list not saved"
+msgstr "Llista d'accions no desades"
 
-#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:357
-msgid "Folder list"
-msgstr "Llista de carpetes"
+#: src/prefs_actions.c:904
+msgid "The actions list has been modified. Close anyway?"
+msgstr "La llista d'accions ha estat modificada. Tancar de totes maneres?"
 
-#: src/prefs_msg_colors.c:380
-msgid ""
-"Pick color for Target folder. Target folder is used when the option 'Execute "
-"immediately when moving or deleting messages' is turned off"
-msgstr ""
-"Esculliu color per la carpeta de destinació. La carpeta de destinació "
-"s'usarà quan la opció 'Executeu immediatament quan mogueu o esborreu "
-"missatges' estigui desactivada"
+#: src/prefs_actions.c:974
+msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
+msgstr "<span weight=\"bold\" underline=\"single\">Nom de menú:</span>"
 
-#: src/prefs_msg_colors.c:384
-msgid "Target folder"
-msgstr "Carpeta destinació"
+#: src/prefs_actions.c:975
+msgid "Use / in menu name to make submenus."
+msgstr "Useu / en el nom de menú per crear submens."
 
-#: src/prefs_msg_colors.c:399
-msgid "Pick color for folders containing new messages"
-msgstr "Escolliu color per a les carpetes que continguin nous missatges"
+#: src/prefs_actions.c:977
+msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
+msgstr "<span weight=\"bold\" underline=\"single\">Línia de comandes:</span>"
 
-#: src/prefs_msg_colors.c:401
-msgid "Folder containing new messages"
-msgstr "Carpetes que contenen nous missatges"
+#: src/prefs_actions.c:978
+msgid "<span weight=\"bold\">Begin with:</span>"
+msgstr "<span weight=\"bold\">Començar amb:</span>"
 
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:428 src/prefs_msg_colors.c:459
-#, c-format
-msgctxt "Tooltip"
-msgid "Pick color for 'color %d'"
-msgstr "Seleccioneu color per 'color %d'"
+#: src/prefs_actions.c:979
+msgid "to send message body or selection to command's standard input"
+msgstr "per enviar el missatge o la selecció a l'entrada standard de l'ordre"
 
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:432 src/prefs_msg_colors.c:463
-#, c-format
-msgid "Set label for 'color %d'"
-msgstr "Escollir etiqueta per a 'color %d'"
+#: src/prefs_actions.c:980
+msgid "to send user provided text to command's standard input"
+msgstr "per enviar el text d'usuari a l'entrada estàndard de l'ordre"
 
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:592
-#, c-format
-msgctxt "Dialog title"
-msgid "Pick color for 'color %d'"
-msgstr "Escolliu color per 'color %d'"
+#: src/prefs_actions.c:981
+msgid "to send user provided hidden text to command's standard input"
+msgstr "per enviar el text d'usuari ocult a l'entrada estàndard de l'ordre"
 
-#: src/prefs_msg_colors.c:600
-msgctxt "Dialog title"
-msgid "Pick color for 1st level text"
-msgstr "Escollir color per al text de 1er nivell"
+#: src/prefs_actions.c:982
+msgid "<span weight=\"bold\">End with:</span>"
+msgstr "<span weight=\"bold\">Finalitzar amb:</span>"
 
-#: src/prefs_msg_colors.c:603
-msgctxt "Dialog title"
-msgid "Pick color for 2nd level text"
-msgstr "Escollir color per al text de 2on nivell"
+#: src/prefs_actions.c:983
+msgid "to replace message body or selection with command's standard output"
+msgstr ""
+"per reemplaçar el missatge o selecció amb la sortida estàndard de l'ordre"
 
-#: src/prefs_msg_colors.c:606
-msgctxt "Dialog title"
-msgid "Pick color for 3rd level text"
-msgstr "Escollir color per al text de 3r nivell"
+#: src/prefs_actions.c:984
+msgid "to insert command's standard output without replacing old text"
+msgstr "per insertar la sortida estàndard de l'ordre sense reemplaçar el text"
 
-#: src/prefs_msg_colors.c:609
-msgctxt "Dialog title"
-msgid "Pick color for 1st level text background"
-msgstr "Escollir color per al fons del text de 1r nivell"
+#: src/prefs_actions.c:985
+msgid "to run command asynchronously"
+msgstr "per executar l'ordre de manera asíncrona"
 
-#: src/prefs_msg_colors.c:612
-msgctxt "Dialog title"
-msgid "Pick color for 2nd level text background"
-msgstr "Escollir color per al fons del test de 2n nivell"
+#: src/prefs_actions.c:986
+msgid "<span weight=\"bold\">Use:</span>"
+msgstr "<span weight=\"bold\">Usar:</span>"
 
-#: src/prefs_msg_colors.c:615
-msgctxt "Dialog title"
-msgid "Pick color for 3rd level text background"
-msgstr "Escollir color per al fons del text de 3r nivell"
+#: src/prefs_actions.c:987
+msgid "for the file of the selected message in RFC822/2822 format "
+msgstr "per a l'arxiu del missatge seleccionat en format RFC822/2822 "
 
-#: src/prefs_msg_colors.c:618
-msgctxt "Dialog title"
-msgid "Pick color for links"
-msgstr "Escolliu color per els enllaços"
+#: src/prefs_actions.c:988
+msgid ""
+"for the list of the files of the selected messages in RFC822/2822 format"
+msgstr ""
+"per a la llista de noms dels missatges seleccionats en format RFC822/2822"
 
-#: src/prefs_msg_colors.c:621
-msgctxt "Dialog title"
-msgid "Pick color for target folder"
-msgstr "Escollir color per a la carpeta destinació"
+#: src/prefs_actions.c:989
+msgid "for the file of the selected decoded message MIME part"
+msgstr "per a l'arxiu de la part MIME seleccionada del missatge decodificat"
 
-#: src/prefs_msg_colors.c:624
-msgctxt "Dialog title"
-msgid "Pick color for signatures"
-msgstr "Escollir color per a les firmes"
+#: src/prefs_actions.c:990
+msgid "for a user provided argument"
+msgstr "per a un paràmetre introduït per l'usuari"
 
-#: src/prefs_msg_colors.c:627
-msgctxt "Dialog title"
-msgid "Pick color for folder"
-msgstr "Escolliu color per 'color %d'"
+#: src/prefs_actions.c:991
+msgid "for a user provided hidden argument (e.g. password)"
+msgstr "per a un paràmetre introduït per l'usuari i ocult (p.ex. contrasenya)"
 
-#: src/prefs_msg_colors.c:840
-msgid "Colors"
-msgstr "Colors"
+#: src/prefs_actions.c:992
+msgid "for the text selection"
+msgstr "per la part seleccionada del text"
 
-#: src/prefs_other.c:107
-msgid "Choose preset keyboard shortcuts"
-msgstr "Escollir configuració de les dreceres de teclat"
+#: src/prefs_actions.c:993
+msgid "apply filtering actions between {} to selected messages"
+msgstr "aplicar accions de filtrat entre {} als missatges seleccionats"
 
-#: src/prefs_other.c:121
-msgid "Select preset:"
-msgstr "Seleccionar combinació:"
+#: src/prefs_actions.c:994
+msgid "for a literal %"
+msgstr "per a literal %"
+
+#: src/prefs_actions.c:1004 src/prefs_themes.c:936
+msgid "Actions"
+msgstr "Accions"
 
-#: src/prefs_other.c:136
+#: src/prefs_actions.c:1005
 msgid ""
-"You can also modify each menu shortcut by pressing\n"
-"any key(s) when focusing the mouse pointer on the item."
+"The Actions feature is a way for the user to launch external commands to "
+"process a complete message file or just one of its parts."
 msgstr ""
-"Podeu modificar també cada drecera de menú presionant\n"
-"alguna(es) tecla(es) al situar el punter sobre l'element."
-
-#: src/prefs_other.c:496
-msgid "Add address to destination when double-clicked"
-msgstr "Afegir adreça a la destinació amb doble click"
-
-#: src/prefs_other.c:499
-msgid "On exit"
-msgstr "Al sortir"
+"Les accions són una manera de que l'usuari executi comandes externes que "
+"processin un arxiu de missatge complert o alguna de les seves parts."
 
-#: src/prefs_other.c:502
-msgid "Confirm on exit"
-msgstr "Confirmar al sortir"
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695
+#: src/prefs_template.c:1121
+msgid "D_uplicate"
+msgstr "D_uplicat"
 
-#: src/prefs_other.c:509
-msgid "Empty trash on exit"
-msgstr "Buidar la paperera al sortir"
+#: src/prefs_actions.c:1212
+msgid "Current actions"
+msgstr "Accions actuals"
 
-#: src/prefs_other.c:512
-msgid "Warn if there are queued messages"
-msgstr "Avisar si existeixen missatges en cua"
+#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
+#: src/prefs_filtering.c:1132
+msgid "Action string is not valid."
+msgstr "La cadena de l'acció no és vàlida."
 
-#: src/prefs_other.c:514
-msgid "Keyboard shortcuts"
-msgstr "Dreceres de teclat"
+#: src/prefs_common.c:220 src/prefs_quote.c:69
+msgid "Hello,\\n"
+msgstr "Hola,\\n"
 
-#: src/prefs_other.c:517
-msgid "Enable customisable keyboard shortcuts"
-msgstr "Habilitar les dreceres de teclat configurables"
+#: src/prefs_common.c:296
+msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
+msgstr "El %d\\n%f escrigué:\\n\\n%q\\n%X"
 
-#: src/prefs_other.c:520
+#: src/prefs_common.c:302 src/prefs_quote.c:85
 msgid ""
-"If checked, you can change the keyboard shortcuts of most of the menu items "
-"by focusing on the menu item and pressing a key combination.\n"
-"Uncheck this option if you want to lock all existing keyboard shortcuts."
+"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
+"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
-"Si el marqueu, podreu canviar les dreceres de teclat de la majoria dels "
-"items del menú marcant l'ítem de menú i prement una combinació de tecles.\n"
-"Desmarca aquesta opció si vols bloquejar totes les dreceres de teclat "
-"existents."
+"\\n\\nInici del missatge reenviat:\\n\\n?d{Data: %d\\n}?f{Desde: %f\\n}?t{A: "
+"%t\\n}?c{Cc: %c\\n}?n{Grups de notícies: %n\\n}?s{Assumpte: %s\\n}\\n\\n%M"
+
+#: src/prefs_common.c:442
+msgid "%x(%a) %H:%M"
+msgstr "%x(%a) %H:%M"
+
+#: src/prefs_compose_writing.c:125
+msgid "Automatic account selection"
+msgstr "Selecció automàtica de compte"
 
-#: src/prefs_other.c:527
-msgid " Choose preset keyboard shortcuts... "
-msgstr "Seleccionar configuració de dreceres de teclat"
+#: src/prefs_compose_writing.c:133
+msgid "when replying"
+msgstr "al respondre"
 
-#: src/prefs_other.c:537
-msgid "Metadata handling"
-msgstr "Recollida de metadades"
+#: src/prefs_compose_writing.c:135
+msgid "when forwarding"
+msgstr "al reenviar"
 
-#: src/prefs_other.c:538
-msgid ""
-"Safer mode asks the OS to write metadata to disk directly;\n"
-"it avoids data loss after crashes but can take some time."
-msgstr ""
-"El mode més segur consulta al SO per escriure metadades al disc "
-"directament;\n"
-"Aquest mode evita la perdua de dades per finalitzacions errònies però pot "
-"portar temps addicional."
+#: src/prefs_compose_writing.c:137
+msgid "when re-editing"
+msgstr "al reeditar"
 
-#: src/prefs_other.c:542
-msgid "Safer"
-msgstr "Més segur"
+#: src/prefs_compose_writing.c:140
+msgid "Editing"
+msgstr "Editant"
 
-#: src/prefs_other.c:544
-msgid "Faster"
-msgstr "Més ràpid"
+#: src/prefs_compose_writing.c:144
+msgid "Automatically launch the external editor"
+msgstr "Arrencar l'editor extern automàticament"
 
-#: src/prefs_other.c:562
-msgid "Socket I/O timeout"
-msgstr "Temps límit E/S socket"
+#: src/prefs_compose_writing.c:152
+msgid "Automatically save message to Drafts folder every"
+msgstr "Desar automàticament el missatge al directori Esborranys cada "
 
-#: src/prefs_other.c:584
-msgid "Ask before emptying trash"
-msgstr "Preguntar abans de buidar la paperera"
+#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:101
+msgid "characters"
+msgstr "caràcters"
 
-#: src/prefs_other.c:586
-msgid "Ask about account specific filtering rules when filtering manually"
-msgstr ""
-"Preguntar sobre una regla de filtrat específica d'un compte quan filtreu "
-"manualment"
+#: src/prefs_compose_writing.c:173
+msgid "Even if message is to be encrypted"
+msgstr "Fins i tot si el missatge és per ser encriptat"
 
-#: src/prefs_other.c:591
-msgid "Use secure file deletion if possible"
-msgstr "Usar eliminació d'arxius segurs si és possible"
+#: src/prefs_compose_writing.c:180
+msgid "Undo level"
+msgstr "Nivells de desfer"
 
-#: src/prefs_other.c:595
-msgid ""
-"Use secure file deletion if possible\n"
-"(the 'shred' program is not available)"
-msgstr ""
-"Usar eliminació d'arxius segurs si és possible\n"
-"(el programa 'shred' no està disponible)"
+#: src/prefs_compose_writing.c:198
+msgid "Warn when inserting a file larger than"
+msgstr "Avisar quan s'inserti un arxiu més gran de"
 
-#: src/prefs_other.c:600
-msgid ""
-"Use the 'shred' program to overwrite files with random data before deleting "
-"them. This slows down deletion. Be sure to read shred's man page for caveats."
-msgstr ""
-"Useu el programa 'shred' per sobreescriure arxius amb dades aleatòries abans "
-"d'esborrar-los. Això alenteix el proces. Assegureu-vos de llegir les "
-"implicacions a la pàgina del manual del shred."
+#: src/prefs_compose_writing.c:210
+msgid "KB into message body "
+msgstr "KB dins el cos del missatge "
 
-#: src/prefs_other.c:604
-msgid "Synchronise offline folders as soon as possible"
-msgstr "Sincronitzar sense línia les carpetes el més aviat possible"
+#: src/prefs_compose_writing.c:216
+msgid "Replying"
+msgstr "Responent"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Introduiu contrasenya"
+#: src/prefs_compose_writing.c:219
+msgid "Reply will quote by default"
+msgstr "Respondre amb cometes per omissió"
 
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Useu gpg-agent per treballar amb passwords"
+#: src/prefs_compose_writing.c:222
+msgid "Reply button invokes mailing list reply"
+msgstr "El botó Respondre invoca respondre a la llista de correu"
 
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
+#: src/prefs_compose_writing.c:224
+msgid "Forwarding"
+msgstr "Reenviant"
 
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Introduiu contrasenya"
+#: src/prefs_compose_writing.c:227 src/prefs_filtering_action.c:192
+msgid "Forward as attachment"
+msgstr "Reenviar com a adjunt"
 
-#: src/prefs_other.c:778
-msgid "Miscellaneous"
-msgstr "Miscel·lània"
+#: src/prefs_compose_writing.c:230
+msgid "Keep the original 'From' header when redirecting"
+msgstr "Mantenir la capçalera 'Desde' original al redirigir"
 
-#: src/prefs_quote.c:77
-msgid "On %d\\n%f wrote:\\n\\n%q"
-msgstr "EL %d\\n%f escrigué:\\n\\n%q"
+#: src/prefs_compose_writing.c:233
+msgid "When dropping files into the Compose window"
+msgstr "Quan deixeu caure arxiu dins la finestra de composició"
 
-#: src/prefs_receive.c:123
-msgid "External incorporation program"
-msgstr "Incorporació external de programa"
+#: src/prefs_compose_writing.c:242
+msgid "Ask"
+msgstr "Preguntar"
 
-#: src/prefs_receive.c:126
-msgid "Use external program for receiving mail"
-msgstr "Usar un programa extern per rebre correu"
+#: src/prefs_compose_writing.c:243 src/toolbar.c:427
+msgid "Insert"
+msgstr "Insertar"
 
-#: src/prefs_receive.c:142
-msgid "Automatic checking"
-msgstr "Verificació automàtica"
+#: src/prefs_compose_writing.c:244 src/toolbar.c:428
+msgid "Attach"
+msgstr "Adjuntar"
 
-#: src/prefs_receive.c:149
-msgid "Check for new mail every"
-msgstr "Verificar l'existència de nou correu cada"
+#: src/prefs_compose_writing.c:371
+msgid "Writing"
+msgstr "Escrivint"
 
-#: src/prefs_receive.c:167
-msgid "Check for new mail on start-up"
-msgstr "Comprovar l'existència de nou correu a l'inici"
+#: src/prefs_customheader.c:183
+msgid "Custom header configuration"
+msgstr "Configuració de capçalera d'usuari"
 
-#: src/prefs_receive.c:170
-msgid "Dialogs"
-msgstr "Diàlegs"
+#: src/prefs_customheader.c:506 src/prefs_display_header.c:599
+#: src/prefs_matcher.c:1595 src/prefs_matcher.c:1610
+msgid "Header name is not set."
+msgstr "No s'ha establert el nom de capçalera"
 
-#: src/prefs_receive.c:172
-msgid "Show receive dialog"
-msgstr "Mostrar diàleg de recepció"
+#: src/prefs_customheader.c:516
+msgid "This Header name is not allowed as a custom header."
+msgstr "Aquest nom de capçalera no està permès com a capçalera d'usuari."
 
-#: src/prefs_receive.c:182
-msgid "Only on manual receiving"
-msgstr "Només al rebre manualment"
+#: src/prefs_customheader.c:563
+msgid "Choose a PNG file"
+msgstr "Escolliu un arxiu PNG"
 
-#: src/prefs_receive.c:193
-msgid "Close receive dialog when finished"
-msgstr "Tancar el diàleg de recepció al finalitzar"
+#: src/prefs_customheader.c:565
+msgid "Choose an XBM file"
+msgstr "Escolliu un arxiu XBM"
 
-#: src/prefs_receive.c:196
-msgid "Don't popup error dialog on receive error"
-msgstr "No mostrar diàleg d'error en l'error de recepció"
+#: src/prefs_customheader.c:567
+msgid "Choose a text file"
+msgstr "Escolliu un arxiu de texte"
 
-#: src/prefs_receive.c:199
-msgid "After receiving new mail"
-msgstr "Després de rebre nou correu"
+#: src/prefs_customheader.c:580
+msgid "This file isn't an image."
+msgstr "Aquest arxiu no és una imatge"
 
-#: src/prefs_receive.c:201
-msgid "Go to Inbox"
-msgstr "Anar a la safata d'entrada"
+#: src/prefs_customheader.c:585
+msgid "The chosen image isn't the correct size (48x48)."
+msgstr "L'imatge escollida no es del tamany correcte (48x48)."
 
-#: src/prefs_receive.c:203
-msgid "Update all local folders"
-msgstr "Actualitzar totes les carpetes locals"
+#: src/prefs_customheader.c:591
+msgid "The image is too big; it must be maximum 725 bytes."
+msgstr "La imatge es massa gran; ha de ser d'un màxim de 725 bytes."
 
-#: src/prefs_receive.c:205
-msgid "Run command"
-msgstr "Executa comanda"
+#: src/prefs_customheader.c:596
+msgid "The image isn't in the correct format (PNG)."
+msgstr "La imatge no té el format correcte (PNG)."
 
-#: src/prefs_receive.c:210
-msgid "after automatic check"
-msgstr "després de la comprovació automàtica"
+#: src/prefs_customheader.c:605
+msgid "The image isn't in the correct format (XBM)."
+msgstr "La imatge no té el format correcte (XBM)."
 
-#: src/prefs_receive.c:212
-msgid "after manual check"
-msgstr "després de la comprovació manual"
+#: src/prefs_customheader.c:614
+msgid "Couldn't call `compface`. Make sure it's in your $PATH."
+msgstr "No s'ha pogut usar `compface`. Assegureu-vos que es al vostre $PATH."
 
-#: src/prefs_receive.c:220
+#: src/prefs_customheader.c:620
 #, c-format
-msgid ""
-"Command to execute:\n"
-"(use %d as number of new mails)"
-msgstr ""
-"Orden a ejecutar:\n"
-"(usar %d com a n de missatges nous)"
+msgid "Compface error: %s"
+msgstr "Error de Compface: %s"
 
-#: src/prefs_receive.c:343 src/prefs_send.c:358
-msgid "Mail Handling"
-msgstr "Recollida de correu"
+#: src/prefs_customheader.c:673
+msgid "This file contains newlines."
+msgstr "Aquest arxiu conté caràcters de nova línia."
 
-#: src/prefs_receive.c:344
-msgid "Receiving"
-msgstr "Rebent"
+#: src/prefs_customheader.c:703
+msgid "Delete header"
+msgstr "Esborrar capçalera"
 
-#: src/prefs_send.c:161
-#, fuzzy
-msgid "Save sent messages"
-msgstr "Missatge pare"
+#: src/prefs_customheader.c:704
+msgid "Do you really want to delete this header?"
+msgstr "Realment vols esborrar aquesta capçalera?"
 
-#: src/prefs_send.c:164
-msgid "Confirm before sending queued messages"
-msgstr "Confirmar abans d'enviar els missatges encuats."
+#: src/prefs_customheader.c:877
+msgid "Current custom headers"
+msgstr "Capçaleres d'usuari actuals"
 
-#: src/prefs_send.c:167
-msgid "Never send Return Receipts"
-msgstr "Mai enviar justificants de recepció"
+#: src/prefs_display_header.c:250
+msgid "Displayed header configuration"
+msgstr "Configuració de capçaleres mostrades"
 
-#: src/prefs_send.c:170
-msgid "Show send dialog"
-msgstr "Mostrar diàleg d'enviament"
+#: src/prefs_display_header.c:274
+msgid "Header name"
+msgstr "Capçalera"
 
-#: src/prefs_send.c:172
-msgid "Warn when Subject is empty"
-msgstr "Avisa quan l'assumpte es buit"
+#: src/prefs_display_header.c:317
+msgid "Displayed Headers"
+msgstr "Capçaleres mostrades"
 
-#: src/prefs_send.c:180
-msgid "Outgoing encoding"
-msgstr "Conjunt de codis per enviar"
+#: src/prefs_display_header.c:379
+msgid "Hidden headers"
+msgstr "Capçaleres ocultes"
 
-#: src/prefs_send.c:205
-msgid ""
-"If 'Automatic' is selected, the optimal encoding for the current locale will "
-"be used"
-msgstr ""
-"Si seleccioneu 'Automàtic' s'usarà la codificació última para a la "
-"localització actual."
+#: src/prefs_display_header.c:405
+msgid "Show all unspecified headers"
+msgstr "Mostrar totes les capçaleres"
 
-#: src/prefs_send.c:220
-msgid "Automatic (Recommended)"
-msgstr "Automàtic (Recomanat)"
+#: src/prefs_display_header.c:609
+msgid "This header is already in the list."
+msgstr "Aquesta capçalera ja existeix en la llista."
 
-#: src/prefs_send.c:222
-msgid "7bit ASCII (US-ASCII)"
-msgstr "ASCII de 7 bits (US-ASC_II)"
+#: src/prefs_ext_prog.c:102
+#, c-format
+msgid "%s will be replaced with file name / URI"
+msgstr "%s es substituirà amb el nom d'arxiu / URI)"
 
-#: src/prefs_send.c:223
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
+#: src/prefs_ext_prog.c:120
+msgid "Use system defaults when possible"
+msgstr "Usar els valors per defecte del sistema quan sigui possible"
 
-#: src/prefs_send.c:225
-msgid "Western European (ISO-8859-1)"
-msgstr "Europeu Occidental (ISO-8859-1)"
+#: src/prefs_ext_prog.c:141
+msgid "Web browser"
+msgstr "Navegador web"
 
-#: src/prefs_send.c:226
-msgid "Western European (ISO-8859-15)"
-msgstr "Europeu Occidental (ISO-8859-15)"
+#: src/prefs_ext_prog.c:169
+msgid "Text editor"
+msgstr "Editor de text"
 
-#: src/prefs_send.c:228
-msgid "Central European (ISO-8859-2)"
-msgstr "Centreeuropeu (ISO-8859-2)"
+#: src/prefs_ext_prog.c:197
+msgid "Command for 'Display as text'"
+msgstr "Comanda per 'Mostrar com a text'"
 
-#: src/prefs_send.c:230
-msgid "Baltic (ISO-8859-13)"
-msgstr "Bàltic (ISO-8859-13)"
+#: src/prefs_ext_prog.c:210
+msgid ""
+"This option enables MIME parts to be displayed in the message view via a "
+"script when using the 'Display as text' contextual menu item"
+msgstr ""
+"Aquesta opció activa les parts MIME per ser mostrades a la vista del "
+"missatge via unscript quan useu la opció de menú contextual 'Mostrar com a "
+"text'"
 
-#: src/prefs_send.c:231
-msgid "Baltic (ISO-8859-4)"
-msgstr "Bàltic (ISO-8859-4)"
+#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
+#: src/prefs_message.c:354
+msgid "Message View"
+msgstr "Vista de missatge"
 
-#: src/prefs_send.c:233
-msgid "Greek (ISO-8859-7)"
-msgstr "Grec (ISO-8859-7)"
+#: src/prefs_ext_prog.c:270
+msgid "External Programs"
+msgstr "Programes externs"
 
-#: src/prefs_send.c:235
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Hebreu (ISO-8859-8)"
+#: src/prefs_filtering_action.c:175
+msgid "Move"
+msgstr "Moure"
 
-#: src/prefs_send.c:236
-msgid "Hebrew (Windows-1255)"
-msgstr "Hebreu (Windows-1255)"
+#: src/prefs_filtering_action.c:176
+msgid "Copy"
+msgstr "Copiar"
 
-#: src/prefs_send.c:238
-msgid "Arabic (ISO-8859-6)"
-msgstr "Aràbic (ISO-8859-6)"
+#: src/prefs_filtering_action.c:178
+msgid "Hide"
+msgstr "Ocultar"
 
-#: src/prefs_send.c:239
-msgid "Arabic (Windows-1256)"
-msgstr "Aràbic (Windows-1256)"
+#: 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 "Marcadors de missatge"
 
-#: src/prefs_send.c:241
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turc (ISO-8859-9)"
+# RML I think this is ambiguous:
+# RML on filtering is a verb ("Marcar") while in summary colunm it's really
+# RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
+#: src/prefs_filtering_action.c:179 src/prefs_summary_column.c:78
+#: src/summaryview.c:2791
+msgid "Mark"
+msgstr "Marca"
 
-#: src/prefs_send.c:243
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Ciríl·lic (ISO-8859-5)"
+#: src/prefs_filtering_action.c:183
+msgid "Mark as read"
+msgstr "Marcar com a llegit"
 
-#: src/prefs_send.c:244
-msgid "Cyrillic (KOI8-R)"
-msgstr "Ciríl·lic (KOI8-R)"
+#: src/prefs_filtering_action.c:184
+msgid "Mark as unread"
+msgstr "Marcar com a no llegit"
 
-#: src/prefs_send.c:245
-msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Cyrillic (X-MAC-CYRILLIC)"
+#: src/prefs_filtering_action.c:185
+msgid "Mark as spam"
+msgstr "Marcar com a correu brossa"
 
-#: src/prefs_send.c:246
-msgid "Cyrillic (KOI8-U)"
-msgstr "Ciríl·lic (KOI8-U)"
+#: src/prefs_filtering_action.c:186
+msgid "Mark as ham"
+msgstr "Marcar com a bò"
 
-#: src/prefs_send.c:247
-msgid "Cyrillic (Windows-1251)"
-msgstr "Ciríl·lic (Windows-1251)"
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
+#: src/toolbar.c:205 src/toolbar.c:438 src/toolbar.c:2088
+msgid "Execute"
+msgstr "Executar"
 
-#: src/prefs_send.c:249
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonès (ISO-2022-JP)"
+#: src/prefs_filtering_action.c:189
+msgid "Color label"
+msgstr "Etiqueta de color"
 
-#: src/prefs_send.c:251
-msgid "Japanese (EUC-JP)"
-msgstr "Japonès (EUC-JP)"
+#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
+#: src/prefs_filtering_action.c:193
+msgid "Resend"
+msgstr "Re-enviar"
 
-#: src/prefs_send.c:252
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonès (Shift_JIS)"
+#: src/prefs_filtering_action.c:193
+msgid "Redirect"
+msgstr "Redirigir"
 
-#: src/prefs_send.c:255
-msgid "Simplified Chinese (GB18030)"
-msgstr "Chinès simplificat (GB18030)"
+#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
+#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
+#: src/prefs_summary_column.c:87 src/summaryview.c:447
+msgid "Score"
+msgstr "Punts"
 
-#: src/prefs_send.c:256
-msgid "Simplified Chinese (GB2312)"
-msgstr "Chinès simplificado (GB2312)"
+#: src/prefs_filtering_action.c:194
+msgid "Change score"
+msgstr "Canviar punts"
 
-#: src/prefs_send.c:257
-msgid "Simplified Chinese (GBK)"
-msgstr "Chinès simplificat (GBK)"
+#: src/prefs_filtering_action.c:195
+msgid "Set score"
+msgstr "Establir punts"
 
-#: src/prefs_send.c:258
-msgid "Traditional Chinese (Big5)"
-msgstr "Chinès tradicional (Big5)"
+#: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
+#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
+#: src/prefs_summary_column.c:89 src/summaryview.c:449
+msgid "Tags"
+msgstr "Etiquetes"
 
-#: src/prefs_send.c:260
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Chinès tradicional (EUC-TW)"
+#: src/prefs_filtering_action.c:196
+msgid "Apply tag"
+msgstr "Aplicar etiqueta"
 
-#: src/prefs_send.c:261
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Chinès (ISO-2022-CN)"
+#: src/prefs_filtering_action.c:197
+msgid "Unset tag"
+msgstr "Esborrar etiqueta"
 
-#: src/prefs_send.c:264
-msgid "Korean (EUC-KR)"
-msgstr "Coreà(EUC-KR)"
+#: src/prefs_filtering_action.c:198
+msgid "Clear tags"
+msgstr "Netejar etiquetes"
 
-#: src/prefs_send.c:266
-msgid "Thai (TIS-620)"
-msgstr "Tailandès (TIS-620)"
+#: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
+msgid "Threads"
+msgstr "Fils"
 
-#: src/prefs_send.c:267
-msgid "Thai (Windows-874)"
-msgstr "Tailandès (Windows-874)"
+#: src/prefs_filtering_action.c:202
+msgid "Stop filter"
+msgstr "Parar filtre"
 
-#: src/prefs_send.c:271
-msgid "Transfer encoding"
-msgstr "Codificació d'enviament"
+#: src/prefs_filtering_action.c:410
+msgid "Action configuration"
+msgstr "Configurar accions"
 
-#: src/prefs_send.c:282
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters"
-msgstr ""
-"Especificar la codificació d'enviament (Content-Transfer-Encoding) usada "
-"quan el cos del missatge conté caràcters no-ASCII"
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1886
+#: src/prefs_matcher.c:586
+msgid "Rule"
+msgstr "Regla"
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
-msgid "Sending"
-msgstr "Enviant"
+#: src/prefs_filtering_action.c:440 src/prefs_filtering.c:433
+msgid "Action"
+msgstr "Acció"
 
-#: src/prefs_spelling.c:81
-msgid "Pick color for misspelled word"
-msgstr "Escolli color de les paraules incorrectes"
+# FIXME
+#: src/prefs_filtering_action.c:935
+msgid "Command-line not set"
+msgstr "Línia de comandes no establerta"
 
-#: src/prefs_spelling.c:129
-msgid "Enable spell checker"
-msgstr "Habilitar el corrector ortogràfic"
+# FIXME
+#: src/prefs_filtering_action.c:936
+msgid "Destination is not set."
+msgstr "Destinació no establerta."
 
-#: src/prefs_spelling.c:134
-msgid "Enable alternate dictionary"
-msgstr "Habilitar diccionari alternatiu"
+# FIXME
+#: src/prefs_filtering_action.c:947
+msgid "Recipient is not set."
+msgstr "Destinatari no establert."
 
-#: src/prefs_spelling.c:139
-msgid "Faster switching with last used dictionary"
-msgstr "Canvi més ràpid amb l'últim diccionari usat"
+# FIXME
+#: src/prefs_filtering_action.c:965
+msgid "Score is not set"
+msgstr "Puntuació no establerta"
 
-#: src/prefs_spelling.c:141
-msgid "Automatic spell checking"
-msgstr "Verificació ortogràfica automàtica"
+#: src/prefs_filtering_action.c:973
+msgid "Header is not set."
+msgstr "No s'ha establert la capçalera"
 
-#: src/prefs_spelling.c:149
-msgid "Re-check message when changing dictionary"
-msgstr "Re-comprovar el missatge quan canvieu de diccionari"
+#: src/prefs_filtering_action.c:980
+msgid "Target addressbook/folder is not set."
+msgstr "No s'ha establert l'agenda de destí."
 
-#: src/prefs_spelling.c:153
-msgid "Dictionary"
-msgstr "Diccionari"
+#: src/prefs_filtering_action.c:994
+msgid "Tag name is empty."
+msgstr "El nom d'etiqueta es buit."
 
-#: src/prefs_spelling.c:190
-msgid "Check with both dictionaries"
-msgstr "Comprova amb ambdos diccionaris"
+#: src/prefs_filtering_action.c:1216
+msgid "No action was defined."
+msgstr "No s'ha definit cap acció."
 
-#: src/prefs_spelling.c:197
-msgid "Get more dictionaries..."
-msgstr "Obtenir més diccionaris"
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2169
+#: src/quote_fmt.c:79
+msgid "literal %"
+msgstr "literal %"
 
-#: src/prefs_spelling.c:207
-msgid "Misspelled word color"
-msgstr "Color de les faltes ortogràfiques"
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2178
+msgid "filename (should not be modified)"
+msgstr "Nom d'arxiu (no ha d'ésser modificat)"
 
-#: src/prefs_spelling.c:220
-msgid "Pick color for misspelled word. Use black to underline"
-msgstr ""
-"Escolliu color de les paraules incorrectes. Useu el color negre per "
-"subrattlar"
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2179
+#: src/quote_fmt.c:87
+msgid "new line"
+msgstr "línia nova"
 
-#: src/prefs_spelling.c:337
-msgid "Spell Checking"
-msgstr "Corregint ortogràficament"
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2180
+msgid "escape character for quotes"
+msgstr "caràcter d'escapament per entrecomillat"
 
-#: src/prefs_summaries.c:153
-msgid "the abbreviated weekday name"
-msgstr "el dia de la setmana abreviat"
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2181
+msgid "quote character"
+msgstr "caràcter d'entrecomillat"
 
-#: src/prefs_summaries.c:154
-msgid "the full weekday name"
-msgstr "el dia de la setmana complert"
+#: src/prefs_filtering_action.c:1275
+msgid "Filtering Action: 'Execute'"
+msgstr "Accion de filtratge: 'Executar'"
 
-#: src/prefs_summaries.c:155
-msgid "the abbreviated month name"
-msgstr "el nom del mes abreviat"
+#: src/prefs_filtering_action.c:1276
+msgid ""
+"'Execute' allows you to send a message or message element to an external "
+"program or script.\n"
+"The following symbols can be used:"
+msgstr ""
+"'Executar' us permet enviar un missatge o un element del missatge a un "
+"programa extern o a un script.\n"
+"Els següents símbols poden ser usats:"
 
-#: src/prefs_summaries.c:156
-msgid "the full month name"
-msgstr "el nom del mes complert"
+#: src/prefs_filtering_action.c:1422
+msgid "Recipient"
+msgstr "Destinatari"
 
-#: src/prefs_summaries.c:157
-msgid "the preferred date and time for the current locale"
-msgstr "la data i hora preferida per a la localizació actual"
+#: src/prefs_filtering_action.c:1426
+msgid "Book/Folder"
+msgstr "Llibre/Carpeta"
 
-#: src/prefs_summaries.c:158
-msgid "the century number (year/100)"
-msgstr "el número de segle (any/100)"
+#: src/prefs_filtering_action.c:1430
+msgid "Destination"
+msgstr "Destinació"
 
-#: src/prefs_summaries.c:159
-msgid "the day of the month as a decimal number"
-msgstr "el dia del mes com a número decimal"
+#: src/prefs_filtering_action.c:1434
+msgid "Color"
+msgstr "Colorar"
 
-#: src/prefs_summaries.c:160
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "la hora com a número usant el rellotge de 24 hores"
+#: src/prefs_filtering_action.c:1520
+msgid "Current action list"
+msgstr "Llista actual d'accions "
 
-#: src/prefs_summaries.c:161
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "la hora com a número usant el rellotge de 12 hores"
+#: src/prefs_filtering.c:197 src/prefs_filtering.c:359
+msgid "Filtering/Processing configuration"
+msgstr "Configuració de filtrat/procesament"
 
-#: src/prefs_summaries.c:162
-msgid "the day of the year as a decimal number"
-msgstr "el dia de l'any com a número decimal"
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
+msgctxt "Filtering Account Menu"
+msgid "All"
+msgstr "Filtrant qualsevol"
 
-#: src/prefs_summaries.c:163
-msgid "the month as a decimal number"
-msgstr "el mes com a número decimal"
+#: src/prefs_filtering.c:411
+msgid "Condition"
+msgstr "Condició"
 
-#: src/prefs_summaries.c:164
-msgid "the minute as a decimal number"
-msgstr "el minut com a número decimal"
+#: src/prefs_filtering.c:424
+msgid " D_efine... "
+msgstr "D_efineix... "
 
-#: src/prefs_summaries.c:165
-msgid "either AM or PM"
-msgstr "AM o PM"
+#: src/prefs_filtering.c:446
+msgid " De_fine... "
+msgstr "De_fineix... "
 
-#: src/prefs_summaries.c:166
-msgid "the second as a decimal number"
-msgstr "el segon com a número decimal"
+#: src/prefs_filtering.c:475
+msgid "Append the new rule above to the list"
+msgstr "Afegir la nova regla a sobre la llista"
 
-#: src/prefs_summaries.c:167
-msgid "the day of the week as a decimal number"
-msgstr "el dia de la setmana com a número decimal"
+#: src/prefs_filtering.c:484
+msgid "Replace the selected rule in list with the rule above"
+msgstr "Substituïr la regla seleccionada a la llista amb la regla de sota"
 
-#: src/prefs_summaries.c:168
-msgid "the preferred date for the current locale"
-msgstr "la data preferida per a la localizació actual"
+#: src/prefs_filtering.c:493
+msgid "Delete the selected rule from the list"
+msgstr "Esborrar la regla seleccionada de la llista"
 
-#: src/prefs_summaries.c:169
-msgid "the last two digits of a year"
-msgstr "els dos últims dígits de l'any"
+#: src/prefs_filtering.c:532
+msgid "Move the selected rule to the top"
+msgstr "Moure la regla seleccionada a l'inici"
 
-#: src/prefs_summaries.c:170
-msgid "the year as a decimal number"
-msgstr "l'any com a número decimal"
+#: src/prefs_filtering.c:535
+msgid "Page u_p"
+msgstr "_Pàgina amunt"
 
-#: src/prefs_summaries.c:171
-msgid "the time zone or name or abbreviation"
-msgstr "zona horària o nom o abreviatura"
+#: src/prefs_filtering.c:543
+msgid "Move the selected rule one page up"
+msgstr "Moure la regla seleccionada una pàgina amunt"
 
-#: src/prefs_summaries.c:192 src/prefs_summaries.c:240
-#: src/prefs_summaries.c:561
-msgid "Date format"
-msgstr "Format de data"
+#: src/prefs_filtering.c:552
+msgid "Move the selected rule up"
+msgstr "Moure la regla seleccionada amunt"
 
-#: src/prefs_summaries.c:216
-msgid "Specifier"
-msgstr "Especificador"
+#: src/prefs_filtering.c:560
+msgid "Move the selected rule down"
+msgstr "Moure la regla seleccionada avall"
 
-#: src/prefs_summaries.c:258
-msgid "Example"
-msgstr "Exemple"
+#: src/prefs_filtering.c:563
+msgid "Page dow_n"
+msgstr "Pàgina a_vall"
 
-#: src/prefs_summaries.c:363
-#, fuzzy
-msgid "Display message count next to folder name"
-msgstr "Veure el número de satges al costat del nom de la carpeta"
+#: src/prefs_filtering.c:571
+msgid "Move the selected rule one page down"
+msgstr "Moure la regla seleccionada una pàgina avall"
 
-#: src/prefs_summaries.c:373
-msgid "Unread messages"
-msgstr "Missatge sense llegir"
+#: src/prefs_filtering.c:580
+msgid "Move the selected rule to the bottom"
+msgstr "Moure la regla seleccionada al final"
 
-#: src/prefs_summaries.c:374
-msgid "Unread and Total messages"
-msgstr "Missatge totals i sense llegir"
+#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
+msgid "Condition string is not valid."
+msgstr "La cadena de condició no és vàlida."
 
-#: src/prefs_summaries.c:384
-msgid "Open last opened folder at start-up"
-msgstr "Obrir la última carpeta oberta a l'inici"
+#: src/prefs_filtering.c:1111
+msgid "Condition string is empty."
+msgstr "La cadena de condició es buida."
 
-#: src/prefs_summaries.c:387
-msgid "Abbreviate newsgroup names longer than"
-msgstr "Abreviar noms de grup amb més de"
+#: src/prefs_filtering.c:1117
+msgid "Action string is empty."
+msgstr "La cadena de l'acció es buida."
 
-#: src/prefs_summaries.c:401
-msgid "letters"
-msgstr "lletres"
+#: src/prefs_filtering.c:1205
+msgid "Delete rule"
+msgstr "Esborrar regla"
 
-#: src/prefs_summaries.c:419
-msgid "Message list"
-msgstr "Llista de missatges"
+#: src/prefs_filtering.c:1206
+msgid "Do you really want to delete this rule?"
+msgstr "Vols esborrar realment aquesta regla?"
 
-#: src/prefs_summaries.c:425
-#, fuzzy
-msgid "Sort new folders by"
-msgstr "_Comprovar per noves carpetes"
+#: src/prefs_filtering.c:1224
+msgid "Delete all rules"
+msgstr "Esborrar totes les regles"
 
-#: src/prefs_summaries.c:433 src/prefs_summary_column.c:86
-msgid "Number"
-msgstr "Nmero"
+#: src/prefs_filtering.c:1225
+msgid "Do you really want to delete all the rules?"
+msgstr "Vols esborrar realment totes les regles?"
 
-#: src/prefs_summaries.c:436
-#, fuzzy
-msgid "Thread date"
-msgstr "Per data del Fil"
+#: src/prefs_filtering.c:1475
+msgid "Filtering rules not saved"
+msgstr "Regles de filtrat no desades"
 
-#: src/prefs_summaries.c:447
-#, fuzzy
-msgid "Don't sort"
-msgstr "N_o ordenar"
+#: src/prefs_filtering.c:1476
+msgid "The list of filtering rules have been modified. Close anyway?"
+msgstr ""
+"La llista de regles de filtrat han estat modificades. Tancar de totes "
+"maneres?"
 
-#: src/prefs_summaries.c:464
-msgid "Set default selection when entering a folder"
-msgstr "Definir selecció per defecte quan entri a la carpeta"
+#: src/prefs_filtering.c:1698
+msgid "Move one page up"
+msgstr "Moure una pàgina amunt"
+
+#: src/prefs_filtering.c:1699
+msgid "Move one page down"
+msgstr "Moure una pàgina avall"
 
-#: src/prefs_summaries.c:477
-msgid "Show \"no unread (or new) message\" dialog"
-msgstr "Mostrar opció \"missatges no llegit (o nou)\""
+#: src/prefs_filtering.c:1854
+msgid "Enable"
+msgstr "Activa"
 
-#: src/prefs_summaries.c:487
-msgid "Assume 'Yes'"
-msgstr "Assumir 'Si'"
+#: src/prefs_folder_column.c:212
+msgid "Folder list columns configuration"
+msgstr "Configuració de la llista de columnes de la carpeta"
 
-#: src/prefs_summaries.c:488
-msgid "Assume 'No'"
-msgstr "Assumir 'No'"
+#: src/prefs_folder_column.c:229
+msgid ""
+"Select columns to be displayed in the folder list. You can modify\n"
+"the order by using the Up / Down buttons or by dragging the items."
+msgstr ""
+"Seleccioneu les columnes a mostrar a la llista de carpetes. Podeu modificar\n"
+"l'ordre usant els botons Amunt / Avall o arrossegant els elements."
 
-#: src/prefs_summaries.c:496
-msgid "Open message when selected"
-msgstr "Obrir sempre els missatges quan es seleccionin"
+#: src/prefs_folder_column.c:258 src/prefs_summary_column.c:272
+msgid "Hidden columns"
+msgstr "Columnes ocultes"
 
-#: src/prefs_summaries.c:506
-msgid "When message view is visible"
-msgstr "Quan la vista de missatges sigui visible"
+#: src/prefs_folder_column.c:290 src/prefs_summaries.c:406
+#: src/prefs_summaries.c:545 src/prefs_summary_column.c:304
+msgid "Displayed columns"
+msgstr "Columnes mostrades"
 
-#: src/prefs_summaries.c:512
-msgid "Thread using subject in addition to standard headers"
-msgstr "Jerarquitzar usant l'assumpte a més a més de les capçaleres estàndar"
+#: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
+msgid " Use default "
+msgstr " Usar configuració inicial "
 
-#: src/prefs_summaries.c:516
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Executar immediatament moviments o esborrats de missatges"
+#: src/prefs_folder_item.c:268 src/prefs_folder_item.c:876
+#: src/prefs_folder_item.c:1402
+msgid ""
+"<i>These preferences will not be saved as this folder is a top-level folder. "
+"However, you can set them for the whole mailbox tree by using \"Apply to "
+"subfolders\".</i>"
+msgstr ""
+"<i>Aquestes preferències no seran desades perque aquesta carpeta es de "
+"nivell màxim. De totes maneres podeu assignar-les a tot l'arbre de la bústia "
+"usant \"Aplicar a subcarpetes\".</i>"
 
-#: src/prefs_summaries.c:518
+#: src/prefs_folder_item.c:280 src/prefs_folder_item.c:888
 msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/"
-"Execute'"
+"Apply to\n"
+"subfolders"
 msgstr ""
-"Posposa el moviment, copiat i esborrat de missatges fins que escolliu 'Eines/"
-"Executar'"
+"Aplicar a\n"
+"subcarpetes"
 
-#: src/prefs_summaries.c:521
-msgid "Mark message as read"
-msgstr "Marcar el misstage com a llegit"
+#: src/prefs_folder_item.c:305
+msgid "Normal"
+msgstr "Normal"
 
-#: src/prefs_summaries.c:524
-msgid "when selected, after"
-msgstr "al seleccionar-lo, després de"
+#: src/prefs_folder_item.c:307
+msgid "Outbox"
+msgstr "Carpeta de sortida"
 
-#: src/prefs_summaries.c:544
-msgid "only when opened in a new window, or replied to"
-msgstr ""
-"només al obrir-lo en una finestra nova, o al respondre'len una finestra "
-"nova, o contestat a"
+#: src/prefs_folder_item.c:323
+msgid "Folder type"
+msgstr "Tipus de carpeta"
 
-#: src/prefs_summaries.c:551
-msgid "Display sender using address book"
-msgstr "Mostrar remitent usant l'agenda"
+#: src/prefs_folder_item.c:336
+msgid "Simplify Subject RegExp"
+msgstr "Exp.reg. per simplificar assumpte"
 
-#: src/prefs_summaries.c:555
-msgid "Show tooltips"
-msgstr "Mostrar ajudes d'eines"
+#: src/prefs_folder_item.c:362
+msgid "Test string:"
+msgstr "Cadena de proves:"
 
-#: src/prefs_summaries.c:581
-msgid "Date format help"
-msgstr "Ajuda del format de data"
+#: src/prefs_folder_item.c:379
+msgid "Result:"
+msgstr "Resultat:"
 
-#: src/prefs_summaries.c:599
-msgid "Confirm before marking all messages in a folder as read"
-msgstr ""
-"Confirmeu abans de marcar tots els missatges de la carpeta com a llegits"
+#: src/prefs_folder_item.c:394
+msgid "Folder chmod"
+msgstr "Permisos de carpeta"
 
-#: src/prefs_summaries.c:602
-msgid "Translate header names"
-msgstr "Traduïu Capçaleres"
+#: src/prefs_folder_item.c:420
+msgid "Folder color"
+msgstr "Color de carpeta"
 
-#: src/prefs_summaries.c:604
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"Les capçaleres standart mostrades (com 'From:', 'Subject:') seran traduïdes "
-"al vostre idioma."
+#: src/prefs_folder_item.c:433 src/prefs_folder_item.c:1671
+msgid "Pick color for folder"
+msgstr "Escolliu color per a la carpeta"
 
-#: src/prefs_summaries.c:732
-msgid "Summaries"
-msgstr "Sumaris"
+#: src/prefs_folder_item.c:451
+msgid "Run Processing rules at start-up"
+msgstr "Executar Processar regles a l'inici"
 
-#: src/prefs_summary_column.c:226
-msgid "Message list columns configuration"
-msgstr "Configuració de la llista de columnes del missatge"
+#: src/prefs_folder_item.c:466
+msgid "Run Processing rules when opening"
+msgstr "Executar Processar regles a l'obrir"
 
-#: src/prefs_summary_column.c:243
+#: src/prefs_folder_item.c:480
+msgid "Scan for new mail"
+msgstr "Examinar si hi ha correu nou"
+
+#: src/prefs_folder_item.c:482
 msgid ""
-"Select columns to be displayed in the message list. You can modify\n"
-"the order by using the Up / Down buttons or by dragging the items."
+"Turn this option on if mail is delivered directly to this folder by server "
+"side filtering on IMAP or by an external application"
 msgstr ""
-"Seleccioneu les columnes a mostrar a la llista de missatges. Podeu "
-"modificar\n"
-"l'ordre usant els botons Amunt / Avall, o arrossegant els elements."
+"Activeu aquesta opció si el missatge és enviat directament a aquesta carpeta "
+"amb filtratge del servidor IMAP o per una aplicació externa"
 
-#: src/prefs_summary_open.c:109
-msgid "first marked email"
-msgstr "primer missatge marcat"
+#: src/prefs_folder_item.c:502
+msgid "Select the HTML part of multipart messages"
+msgstr "Seleccionar la part HTML en missatges multipart"
 
-#: src/prefs_summary_open.c:110
-msgid "first new email"
-msgstr "primer missatge nou"
+#: src/prefs_folder_item.c:519
+msgid ""
+"\"Default\" will follow global preference (found in /Preferences/Message "
+"View/Text Options)"
+msgstr ""
+"\"Default\" fara servir les preferències globals (que es troba a / "
+"Preferències/Veure Missatge/Opcions de Text)"
 
-#: src/prefs_summary_open.c:111
-msgid "first unread email"
-msgstr "primer missatge no llegit"
+#: src/prefs_folder_item.c:529
+msgid "Synchronise for offline use"
+msgstr "Sincronitzar per usar sense connexió"
 
-#: src/prefs_summary_open.c:112
-msgid "last opened email"
-msgstr "últim missatge llegit"
+#: src/prefs_folder_item.c:550
+msgid "Fetch message bodies from the last"
+msgstr "Recuperar cos de missatges des de l'últim"
 
-#: src/prefs_summary_open.c:113
-msgid "last email in the list"
-msgstr "últim missatge de la llista"
+#: src/prefs_folder_item.c:557
+msgid "0: all bodies"
+msgstr "0: tots els cossos"
 
-#: src/prefs_summary_open.c:115
-msgid "first email in the list"
-msgstr "primer missatge de la llista"
+#: src/prefs_folder_item.c:565
+msgid "Remove older messages bodies"
+msgstr "Esborrar cos de missatges més antics"
 
-#: src/prefs_summary_open.c:184
-msgid " Selection when entering a folder"
-msgstr "Selecció per quan entri a la carpeta"
+#: src/prefs_folder_item.c:582
+msgid "Discard folder cache"
+msgstr "Descartar memòria cau de carpeta"
 
-#: src/prefs_summary_open.c:230
-msgid "Possible selections"
-msgstr "Seleccions possibles"
+#: src/prefs_folder_item.c:897
+msgid "Request Return Receipt"
+msgstr "Sollicitar justificant de recepció"
 
-#: src/prefs_summary_open.c:266
-msgid "Selection on folder opening"
-msgstr "Selecció a l'obir la carpeta"
+#: src/prefs_folder_item.c:912
+msgid "Save copy of outgoing messages to this folder instead of Sent"
+msgstr "Desar els missatges sortints en aquesta carpeta enlloc de a Enviat"
 
-#: src/prefs_template.c:80
-msgid "This name is used as the Menu item"
-msgstr "Aquest nom és usat com a element de Menú"
+#: src/prefs_folder_item.c:925 src/prefs_folder_item.c:948
+#: src/prefs_folder_item.c:972 src/prefs_folder_item.c:995
+#: src/prefs_folder_item.c:1018
+msgid "Default "
+msgstr "Per omissió "
 
-#: src/prefs_template.c:82
-msgid ""
-"Override composing account's From header. This doesn't change the composing "
-"account."
-msgstr ""
-"Sobreescriure la capçalera Des de del compte de composició. Això no canvia "
-"el compte de composició."
+#: src/prefs_folder_item.c:949
+msgid " for replies"
+msgstr " per respostes"
 
-#: src/prefs_template.c:309
-msgid "Append the new template above to the list"
-msgstr "Afegir la nova plantilla a sobre de la llista"
+#: src/prefs_folder_item.c:1041
+msgid "Default account"
+msgstr "Compte per omissió"
 
-#: src/prefs_template.c:318
-msgid "Replace the selected template in list with the template above"
+#: src/prefs_folder_item.c:1684
+msgid "Discard cache"
+msgstr "Desactivar memòria cau"
+
+#: src/prefs_folder_item.c:1685
+msgid "Do you really want to discard the local cached data for this folder?"
 msgstr ""
-"Susbtituïr la plantilla seleccionada a la llista per la plantilla de sobre"
+"Realment vols descartar l'informació local desada per a aquesta carpeta?"
 
-#: src/prefs_template.c:328
-msgid "Delete the selected template from the list"
-msgstr "Esborrar la plantilla seleccionada de la llista"
+#: src/prefs_folder_item.c:1687
+msgid "+Discard"
+msgstr "+Descartar"
 
-#: src/prefs_template.c:346
-msgid "Show information on configuring templates"
-msgstr "Mostrar informació al configurar plantilles"
+#: src/prefs_folder_item.c:1816
+msgid "General"
+msgstr "General"
 
-#: src/prefs_template.c:370
-msgid "Move the selected template to the top"
-msgstr "Moure la plantilla seleccionada a l'inici"
+#: src/prefs_folder_item.c:1895
+#, c-format
+msgid "Properties for folder %s"
+msgstr "Propietats de la carpeta %s"
 
-#: src/prefs_template.c:380
-msgid "Move the selected template up"
-msgstr "Moure la plantilla seleccionada amunt"
+#: src/prefs_fonts.c:79
+msgid "Folder and Message Lists"
+msgstr "Carpeta i llistes de missatges"
 
-#: src/prefs_template.c:388
-msgid "Move the selected template down"
-msgstr "Moure la plantilla seleccionada avall"
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2046
+msgid "Message"
+msgstr "Missatge"
 
-#: src/prefs_template.c:398
-msgid "Move the selected template to the bottom"
-msgstr "Moure la plantilla seleccionada al final"
+#: src/prefs_fonts.c:126
+msgid "Derive small and bold fonts from Folder and Message Lists font"
+msgstr ""
+"Derivar les tipografies petita i negreta de la llista de Carpetes i Missatges"
 
-#: src/prefs_template.c:414
-msgid "Template configuration"
-msgstr "Configuració de plantilla"
+#: src/prefs_fonts.c:136
+msgid "Small"
+msgstr "Petita"
 
-#: src/prefs_template.c:602
-msgid "Templates list not saved"
-msgstr "Llista de plantilles sense desar"
+#: src/prefs_fonts.c:158
+msgid "Bold"
+msgstr "Negreta"
 
-#: src/prefs_template.c:603
-msgid "The templates list has been modified. Close anyway?"
-msgstr "La llista de plantilles ha estat modificada. Tancar de totes maneres?"
+#: src/prefs_fonts.c:180
+msgid "Use different font for printing"
+msgstr "Usar font diferent per imprimir"
 
-#: src/prefs_template.c:768
-msgid "The template's name is not set."
-msgstr "No s'ha establert el nom de la plantilla."
+#: src/prefs_fonts.c:190
+msgid "Message Printing"
+msgstr "Missatge d'impressió"
+
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:678
+#: src/prefs_themes.c:365
+msgid "Display"
+msgstr "Veure"
 
-#: src/prefs_template.c:811
-msgid "The \"From\" field of the template contains an invalid email address."
-msgstr "El camp \"Des de\" de la plantilla conté una adreça de correu errònia."
+#: src/prefs_fonts.c:269
+msgid "Fonts"
+msgstr "Tipografies"
 
-#: src/prefs_template.c:817
-msgid "The \"To\" field of the template contains an invalid email address."
-msgstr "El camp \"A\" de la plantilla conté una adreça de correu errònia."
+#: src/prefs_gtk.c:939 src/toolbar.c:213 src/toolbar.c:423
+msgid "Preferences"
+msgstr "Preferències"
 
-#: src/prefs_template.c:823
-msgid "The \"Cc\" field of the template contains an invalid email address."
-msgstr "El camp \"Cc\" de la plantilla conté una adreça de correu errònia."
+#: src/prefs_image_viewer.c:69
+msgid "Automatically display attached images"
+msgstr "Mostrar les imatges adjuntes automàticament"
 
-#: src/prefs_template.c:829
-msgid "The \"Bcc\" field of the template contains an invalid email address."
-msgstr "El camp \"Bcc\" de la plantilla conté una adreça de correu errònia."
+#: src/prefs_image_viewer.c:75
+msgid "Resize attached images by default"
+msgstr "Redimensionar les imatges adjuntes per omissión"
 
-#: src/prefs_template.c:835
-msgid ""
-"The \"Reply-To\" field of the template contains an invalid email address."
-msgstr ""
-"El camp \"Respondre a\" de la plantilla conté una adreça de correu errònia."
+#: src/prefs_image_viewer.c:78
+msgid "Clicking image toggles scaling"
+msgstr "Activa/Desactiva l'escalat clicant la imatge"
 
-#: src/prefs_template.c:841
-msgid "The \"Subject\" field of the template is invalid."
-msgstr "El camp \"Assumpte\" de la plantilla no és vàlid."
+#: src/prefs_image_viewer.c:83
+msgid "Display images inline"
+msgstr "Mostra les imatges inserides"
 
-#: src/prefs_template.c:912
-msgid "Delete template"
-msgstr "Esborrar plantilla"
+#: src/prefs_image_viewer.c:89
+msgid "Print images"
+msgstr "Imprimir imatges"
 
-#: src/prefs_template.c:913
-msgid "Do you really want to delete this template?"
-msgstr "Realment vols esborrar aquesta plantilla?"
+#: src/prefs_image_viewer.c:139
+msgid "Image Viewer"
+msgstr "Visor d'imatges"
 
-#: src/prefs_template.c:925
-msgid "Delete all templates"
-msgstr "Esborrar totes les plantilles"
+#: src/prefs_logging.c:147 src/prefs_logging.c:254
+msgid "Restrict the log window to"
+msgstr "Restringir la finestra de traça a"
 
-#: src/prefs_template.c:926
-msgid "Do you really want to delete all the templates?"
-msgstr "Realment vols esborrar totes les plantilles?"
+#: src/prefs_logging.c:159 src/prefs_logging.c:266
+msgid "0 to stop logging in the log window"
+msgstr "0 per deixar de registrar a la finestra de traça"
 
-#: src/prefs_template.c:1241
-msgid "Current templates"
-msgstr "Plantilles actuals"
+#: src/prefs_logging.c:161 src/prefs_logging.c:268
+msgid "lines"
+msgstr "línies"
 
-#: src/prefs_template.c:1269
-msgid "Template"
-msgstr "Plantilla"
+#: src/prefs_logging.c:171
+msgid "Filtering/processing log"
+msgstr "Filtrat/processar traça de depuració"
 
-#: src/prefs_themes.c:344 src/prefs_themes.c:705
-msgid "Default internal theme"
-msgstr "Tema intern per omissió"
+#: src/prefs_logging.c:174
+msgid "Enable logging of filtering/processing rules"
+msgstr "Activar traça de les regles de filtratge/processar regles"
 
-#: src/prefs_themes.c:366
-msgid "Themes"
-msgstr "Temes"
+#: src/prefs_logging.c:180
+msgid ""
+"If checked, turns on logging of filtering and processing rules.\n"
+"The log is accessible from 'Tools/Filtering log'.\n"
+"Caution: enabling this option will slow down the filtering/processing, this "
+"might be critical when applying many rules upon thousands of messages."
+msgstr ""
+"Si està marcat, activa la traça de les regles de processament i filtratge\n"
+"El registre de la traça es accessible desde 'Eines/Finestra de traça'.\n"
+"Compte: activar aquesta opció alentirà el filtratge/processament, això pot "
+"ser critic quan s'apliquin moltes regles sobre miles de missatges."
 
-#: src/prefs_themes.c:436
-msgid "Only root can remove system themes"
-msgstr "Només l'usuari root pot eliminar temes globals"
+#: src/prefs_logging.c:187
+msgid "Log filtering/processing when..."
+msgstr "Traçat de les regles de filtratge/processar quan.."
 
-#: src/prefs_themes.c:439
-#, c-format
-msgid "Remove system theme '%s'"
-msgstr "Esborrar tema global '%s'"
+#: src/prefs_logging.c:191
+msgid "filtering at incorporation"
+msgstr "filtrant al incorporar"
 
-#: src/prefs_themes.c:442
-#, c-format
-msgid "Remove theme '%s'"
-msgstr "Esborrar tema '%s'"
+#: src/prefs_logging.c:193
+msgid "pre-processing folders"
+msgstr "pre-processant carpetes"
 
-#: src/prefs_themes.c:448
-msgid "Are you sure you want to remove this theme?"
-msgstr "Estàs segur de que Vols esborrar aquest tema?"
+#: src/prefs_logging.c:198
+msgid "manually filtering"
+msgstr "filtrant manualment"
 
-#: src/prefs_themes.c:458
-#, c-format
-msgid ""
-"File %s failed\n"
-"while removing theme."
-msgstr ""
-"Error en l'arxiu %s\n"
-"al esborrar el tema."
+#: src/prefs_logging.c:200
+msgid "post-processing folders"
+msgstr "post-processant carpetes"
 
-#: src/prefs_themes.c:462
-msgid "Removing theme directory failed."
-msgstr "Ha fallat al esborrar el directori del tema."
+#: src/prefs_logging.c:207
+msgid "processing folders"
+msgstr "Processant carpetes"
 
-#: src/prefs_themes.c:465
-msgid "Theme removed successfully"
-msgstr "Tema eliminat amb èxit"
+#: src/prefs_logging.c:222
+msgid "Log level"
+msgstr "Nivell de traça"
 
-#: src/prefs_themes.c:485
-msgid "Select theme folder"
-msgstr "Seleccionar carpeta del tema"
+#: src/prefs_logging.c:231
+msgid "Low"
+msgstr "Baix"
 
-#: src/prefs_themes.c:500
-#, c-format
-msgid "Install theme '%s'"
-msgstr "Installar tema '%s'"
+#: src/prefs_logging.c:232
+msgid "Medium"
+msgstr "Mig"
 
-#: src/prefs_themes.c:503
+#: src/prefs_logging.c:233
+msgid "High"
+msgstr "Alt"
+
+#: src/prefs_logging.c:238
 msgid ""
-"This folder doesn't seem to be a theme folder.\n"
-"Install anyway?"
+"Select the level of detail of the logging.\n"
+"Choose Low to see when rules are applied, which conditions match or don't "
+"match and what actions are performed.\n"
+"Choose Medium to see more details about the message that is being processed, "
+"and why rules are skipped.\n"
+"Choose High to explicitly show the reason why all rules are processed or "
+"skipped, and why all conditions are matched or not matched.\n"
+"Caution: the higher the level, the greater the impact on performance."
 msgstr ""
-"Aquesta carpeta no sembla una carpeta d'un tema.\n"
-"Installar de totes maneres?"
+"Seleccioneu el nivell de detall mostrat de la traça.\n"
+"Escolliu nívell Baix per veure quines regles s'han aplicat, quines "
+"condiciones casen o no i quines accions s'han dut a terme.\n"
+"Escolliu nivell Mig per veure més detalls sobre el missatge que s'està "
+"processat i perque les regles s'han refusat.\n"
+"Escolliu nivell Alt per mostrar explícitament la raó per la qual totes les "
+"regles s'han refusat i quines condicions casen o no.\n"
+"Compte: quan més alt és el nivell, més afectarà al rendiment."
 
-#: src/prefs_themes.c:510
-msgid "Do you want to install theme for all users?"
-msgstr "Vols installar el tema per tots els usuaris?"
+#: src/prefs_logging.c:280
+msgid "Disk log"
+msgstr "Traça de disc"
 
-#: src/prefs_themes.c:530
-msgid "Theme exists"
-msgstr "El tema ja existeix"
+#: src/prefs_logging.c:282
+msgid "Write the following information to disk..."
+msgstr "Escriure la següent informació al disc..."
 
-#: src/prefs_themes.c:531
-msgid ""
-"A theme with the same name is\n"
-"already installed in this location.\n"
-"\n"
-"Do you want to replace it?"
-msgstr ""
-"Ja hi ha un tema amb el mateix nom\n"
-"instal·lat en aquesta ubicació.\n"
-"\n"
-"Vols sobreescriure'l?"
+#: src/prefs_logging.c:290
+msgid "Warning messages"
+msgstr "Missatges d'avís"
 
-#: src/prefs_themes.c:537
-#, c-format
-msgid "Couldn't delete the old theme in %s."
-msgstr "No s'ha pogut esborrar el tema antic a %s."
+#: src/prefs_logging.c:291
+msgid "Network protocol messages"
+msgstr "Missatges del protocol de xarxa"
 
-#: src/prefs_themes.c:545
-#, c-format
-msgid "Couldn't create destination directory %s."
-msgstr "No s'ha pogut crear el directori de destinació %s."
+#: src/prefs_logging.c:295
+msgid "Error messages"
+msgstr "Missatges d'error"
 
-#: src/prefs_themes.c:558
-msgid "Theme installed successfully."
-msgstr "Tema instal·lat amb èxit."
+#: src/prefs_logging.c:296
+msgid "Status messages for filtering/processing log"
+msgstr "Missatges d'estat de la traça del filtratge/processament"
 
-#: src/prefs_themes.c:565
-msgid "Failed installing theme"
-msgstr "Error al installar el tema"
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:689
+msgid "Other"
+msgstr "Altres"
 
-#: src/prefs_themes.c:568
-#, c-format
-msgid ""
-"File %s failed\n"
-"while installing theme."
-msgstr ""
-"Error a l'arxiu %s\n"
-"al installar el tema."
+#: src/prefs_logging.c:428
+msgid "Logging"
+msgstr "Traçar"
 
-#: src/prefs_themes.c:667
-#, c-format
-msgid "%d themes available (%d user, %d system, 1 internal)"
-msgstr "Disponibles %d temes (%d d'usuari, %d globals, 1 intern)"
+#: src/prefs_matcher.c:330
+msgid "more than"
+msgstr "major que"
+
+#: src/prefs_matcher.c:331
+msgid "less than"
+msgstr "Menor que"
+
+#: src/prefs_matcher.c:337
+msgid "weeks"
+msgstr "setmanes"
 
-#: src/prefs_themes.c:708
-#, c-format
-msgid "Internal theme has %d icons"
-msgstr "El tema intern té %d icones"
+#: src/prefs_matcher.c:341
+msgid "higher than"
+msgstr "més alt que"
 
-#: src/prefs_themes.c:714
-msgid "No info file available for this theme"
-msgstr "No hi ha arxiu d'informació per a aquest tema"
+#: src/prefs_matcher.c:342
+msgid "lower than"
+msgstr "més baix que"
 
-#: src/prefs_themes.c:732
-msgid "Error: couldn't get theme status"
-msgstr "Error: no es pot obtenir l'estat del tema"
+#: src/prefs_matcher.c:343 src/prefs_matcher.c:349
+msgid "exactly"
+msgstr "exactament"
 
-#: src/prefs_themes.c:756
-#, c-format
-msgid "%d files (%d icons), size: %s"
-msgstr "%d arxius (%d icones), tamany: %s"
+#: src/prefs_matcher.c:347
+msgid "greater than"
+msgstr "Puntuació major que"
 
-#: src/prefs_themes.c:804
-msgid "Selector"
-msgstr "Selector"
+#: src/prefs_matcher.c:348
+msgid "smaller than"
+msgstr "més petit que"
 
-#: src/prefs_themes.c:815
-msgid "Install new..."
-msgstr "Installar nou..."
+#: src/prefs_matcher.c:353
+msgid "bytes"
+msgstr "bytes"
 
-#: src/prefs_themes.c:820
-msgid "Get more..."
-msgstr "Més temes..."
+#: src/prefs_matcher.c:354
+msgid "kilobytes"
+msgstr "kilobytes"
 
-#: src/prefs_themes.c:831
-msgid "Information"
-msgstr "Informació"
+#: src/prefs_matcher.c:355
+msgid "megabytes"
+msgstr "megabytes"
 
-#: src/prefs_themes.c:845
-msgid "Author: "
-msgstr "Autor: "
+#: src/prefs_matcher.c:359
+msgid "contains"
+msgstr "conté"
 
-#: src/prefs_themes.c:853
-msgid "URL:"
-msgstr "URL:"
+#: src/prefs_matcher.c:360
+msgid "doesn't contain"
+msgstr "no conté"
 
-#: src/prefs_themes.c:895
-msgid "Preview"
-msgstr "Pre-visualització"
+#: src/prefs_matcher.c:383
+msgid "headers part"
+msgstr "secció capçaleres"
 
-#: src/prefs_toolbar.c:176
-msgid ""
-"Selected Action already set.\n"
-"Please choose another Action from List"
-msgstr ""
-"L'acció seleccionada ja ho està\n"
-"Per favor, escolliu una altra acció de la lista"
+#: src/prefs_matcher.c:384
+msgid "headers values"
+msgstr "valors de les capçaleres"
 
-#: src/prefs_toolbar.c:177
-msgid "Item has no icon defined."
-msgstr "L'element no té una icona definida."
+#: src/prefs_matcher.c:385
+msgid "body part"
+msgstr "secció cos"
 
-#: src/prefs_toolbar.c:178
-msgid "Item has no text defined."
-msgstr "L'element no té un text definit."
+#: src/prefs_matcher.c:386
+msgid "whole message"
+msgstr "missatge complet"
 
-#: src/prefs_toolbar.c:916
-msgid "Toolbar item"
-msgstr "Element de la barra d'eines"
+# RML I think this is ambiguous:
+# RML on filtering is a verb ("Marcar") while in summary colunm it's really
+# RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
+#: src/prefs_matcher.c:392 src/summaryview.c:6308
+msgid "Marked"
+msgstr "Marcat"
 
-#: src/prefs_toolbar.c:932
-msgid "Item type"
-msgstr "Tipus de l'element"
+#: src/prefs_matcher.c:393 src/summaryview.c:6306
+msgid "Deleted"
+msgstr "Esborrat"
 
-#: src/prefs_toolbar.c:942
-msgid "Internal Function"
-msgstr "Funció interna"
+#: src/prefs_matcher.c:394
+msgid "Replied"
+msgstr "Contestat"
 
-#: src/prefs_toolbar.c:943
-msgid "User Action"
-msgstr "Acció interna"
+#: src/prefs_matcher.c:395 src/summaryview.c:6300
+msgid "Forwarded"
+msgstr "Reenviat"
 
-#: src/prefs_toolbar.c:945 src/toolbar.c:234
-msgid "Separator"
-msgstr "Separador"
+#: src/prefs_matcher.c:397 src/summaryview.c:6290 src/toolbar.c:416
+#: src/toolbar.c:934 src/toolbar.c:1978
+msgid "Spam"
+msgstr "Correu brossa"
 
-#: src/prefs_toolbar.c:952
-msgid "Event executed on click"
-msgstr "Event executat al pulsar"
+#: src/prefs_matcher.c:398
+msgid "Has attachment"
+msgstr "Té adjunts"
 
-#: src/prefs_toolbar.c:991
-msgid "Toolbar text"
-msgstr "Text d'eines"
+#: src/prefs_matcher.c:399 src/summaryview.c:6326
+msgid "Signed"
+msgstr "Signat"
 
-#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1382
-msgid "Icon"
-msgstr "Icona"
+#: src/prefs_matcher.c:403
+msgid "set"
+msgstr "establert"
 
-#: src/prefs_toolbar.c:1042
-msgid "A_dd"
-msgstr "A_fegir"
+#: src/prefs_matcher.c:404
+msgid "not set"
+msgstr "no establert."
 
-#: src/prefs_toolbar.c:1262 src/prefs_toolbar.c:1276 src/prefs_toolbar.c:1290
-msgid "Toolbars"
-msgstr "Barra d'eines"
+#: src/prefs_matcher.c:408
+msgid "yes"
+msgstr "si"
 
-#: src/prefs_toolbar.c:1263
-msgid "Main Window"
-msgstr "Finestra principal"
+#: src/prefs_matcher.c:409
+msgid "no"
+msgstr "no"
 
-#: src/prefs_toolbar.c:1277
-msgid "Message Window"
-msgstr "Finestra de missatge"
+#: src/prefs_matcher.c:413
+msgid "Any tags"
+msgstr "Qualsevol etiqueta"
 
-#: src/prefs_toolbar.c:1291
-msgid "Compose Window"
-msgstr "Finestra de composició"
+#: src/prefs_matcher.c:414
+msgid "Specific tag"
+msgstr "Etiqueta específica"
 
-#: src/prefs_toolbar.c:1405
-msgid "Icon text"
-msgstr "Text de la icona"
+#: src/prefs_matcher.c:418
+msgid "ignored"
+msgstr "ignorat"
 
-#: src/prefs_toolbar.c:1414
-msgid "Mapped event"
-msgstr "Event mapejat"
+#: src/prefs_matcher.c:419
+msgid "not ignored"
+msgstr "no ignorat"
 
-#: src/prefs_toolbar.c:1711
-msgid "Toolbar item icon"
-msgstr "Icona de l'element de la barra d'eines"
+#: src/prefs_matcher.c:420
+msgid "watched"
+msgstr "vist"
 
-#: src/prefs_wrapping.c:80
-msgid "Auto wrapping"
-msgstr "Auto-retallar"
+#: src/prefs_matcher.c:421
+msgid "not watched"
+msgstr "no vist"
 
-#: src/prefs_wrapping.c:81
-msgid "Wrap quotation"
-msgstr "Retallar citació"
+#: src/prefs_matcher.c:425
+msgid "found"
+msgstr "trobat"
 
-#: src/prefs_wrapping.c:82
-msgid "Wrap pasted text"
-msgstr "Text envolcallat enganxat"
+#: src/prefs_matcher.c:426
+msgid "not found"
+msgstr "no trobat"
 
-#: src/prefs_wrapping.c:83
-msgid "Auto indent"
-msgstr "Auto-sagnat"
+#: src/prefs_matcher.c:430
+msgid "0 (Passed)"
+msgstr "0 (Revisat)"
 
-#: src/prefs_wrapping.c:89
-msgid "Wrap text at"
-msgstr "Text envolcallat a"
+#: src/prefs_matcher.c:431
+msgid "non-0 (Failed)"
+msgstr "no-0 (fallit)"
 
-#: src/prefs_wrapping.c:154
-msgid "Wrapping"
-msgstr "Envolcallant"
+#: src/prefs_matcher.c:569
+msgid "Condition configuration"
+msgstr "Configuració de condició"
 
-#: src/printing.c:436
-msgid "Print preview"
-msgstr "Pre-visualització d'impressió"
+#: src/prefs_matcher.c:613
+msgid "Match criteria:"
+msgstr "Criteri de selecció"
 
-#: src/printing.c:479
-msgid "First page"
-msgstr "Primera pàgina"
+#: src/prefs_matcher.c:622
+msgid "All messages"
+msgstr "Tots els missatges"
 
-#: src/printing.c:490
-msgid "Last page"
-msgstr "Última pàgina"
+#: src/prefs_matcher.c:624
+msgid "Age"
+msgstr "Edat"
 
-#: src/printing.c:496
-msgid "Zoom 100%"
-msgstr "Ampliació del 100%"
+#: src/prefs_matcher.c:625
+msgid "Phrase"
+msgstr "Frase"
 
-#: src/printing.c:498
-msgid "Zoom fit"
-msgstr "Augment ajustat"
+#: src/prefs_matcher.c:626
+msgid "Flags"
+msgstr "Etiquetes"
 
-#: src/printing.c:500
-msgid "Zoom in"
-msgstr "Augmentar"
+#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:410
+msgid "Color labels"
+msgstr "Etiquetes de color"
 
-#: src/printing.c:502
-msgid "Zoom out"
-msgstr "Disminuïr"
+#: src/prefs_matcher.c:628
+msgid "Thread"
+msgstr "Fil"
 
-#: src/printing.c:701
-#, c-format
-msgid "Page %d"
-msgstr "Pàgina %d"
+#: src/prefs_matcher.c:631
+msgid "Partially downloaded"
+msgstr "Parcialment descarregat"
 
-#: src/privacy.c:255 src/privacy.c:276
-msgid "No information available"
-msgstr "No hi ha informació disponible"
+#: src/prefs_matcher.c:634
+msgid "External program test"
+msgstr "Prova de programes externs"
+
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1616 src/prefs_matcher.c:1631
+#: src/prefs_matcher.c:2521
+msgctxt "Filtering Matcher Menu"
+msgid "All"
+msgstr "Tots"
 
-#: src/privacy.c:490
-msgid "No recipient keys defined."
-msgstr "No s'ha definit cap clau."
+#: src/prefs_matcher.c:744
+msgid "Use regexp"
+msgstr "Usar exp.reg."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
-msgid "[Error decoding BASE64]\n"
-msgstr "[Error decodificant BASE64]\n"
+#: src/prefs_matcher.c:821
+msgid "Message must match"
+msgstr "El missatge ha de concordar"
 
-#: src/procmsg.c:936 src/procmsg.c:939
-msgid "Already trying to send."
-msgstr "Ja s'ha intentat enviar "
+#: src/prefs_matcher.c:825
+msgid "at least one"
+msgstr "almenys un"
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
-#, c-format
-msgid "Couldn't open file %s."
-msgstr "No s'ha pogut obrir l'arxiu %s."
+#: src/prefs_matcher.c:826
+msgid "all"
+msgstr "tots"
 
-#: src/procmsg.c:1626
-msgid "Queued message header is broken."
-msgstr "La capçalera del missatge encuat és defectuosa."
+#: src/prefs_matcher.c:829
+msgid "of above rules"
+msgstr "de les regles anteriors"
 
-#: src/procmsg.c:1646
-msgid "An error happened during SMTP session."
-msgstr "S'ha produït un error durant la sessió SMTP."
+#: src/prefs_matcher.c:1534 src/prefs_matcher.c:1600
+msgid "Search pattern is not set."
+msgstr "Patró de cerca no establert"
 
-#: src/procmsg.c:1660
-msgid ""
-"No specific account has been found to send, and an error happened during "
-"SMTP session."
-msgstr ""
-"No s'ha especificat cap compte per enviar, i s'ha produït un error durant la "
-"sessió SMTP"
+#: src/prefs_matcher.c:1543
+msgid "Test command is not set."
+msgstr "Comanda de validació no establerta."
 
-#: src/procmsg.c:1668
-msgid ""
-"Couldn't determine sending information. Maybe the email hasn't been "
-"generated by Claws Mail."
-msgstr ""
-"No s'ha pogut obtenir l'informació d'enviament. Potser el correu no ha estat "
-"generat per Claws Mail."
+#: src/prefs_matcher.c:1617
+msgid "all addresses in all headers"
+msgstr "Totes les adreces a totes les capçaleres"
 
-#: src/procmsg.c:1690
-msgid "Couldn't create temporary file for news sending."
-msgstr "No s'ha pogut crear l'arxiu temporal per enviar noticies."
+#: src/prefs_matcher.c:1620
+msgid "any address in any header"
+msgstr "Qualsevol adreça a qualsevol capçalera"
 
-#: src/procmsg.c:1703
-msgid "Error when writing temporary file for news sending."
-msgstr ""
-"S'ha produït un error al escriure l'arxiu temporal per enviar noticies."
+#: src/prefs_matcher.c:1622
+#, c-format
+msgid "the address(es) in header '%s'"
+msgstr "la/les adreça/ces a la capçalera/es '%s'"
 
-#: src/procmsg.c:1717
+#: src/prefs_matcher.c:1623
 #, c-format
-msgid "Error occurred while posting the message to %s."
-msgstr "S'ha produït un error enviant el missatge a %s."
+msgid ""
+"Book/folder path is not set.\n"
+"\n"
+"If you want to match %s against the whole address book, you have to select "
+"'%s' from the book/folder drop-down list."
+msgstr ""
+"La ruta del llibre/carpeta no ha estat definida.\n"
+"\n"
+"Si vols que l'adreça %s coincideixi amb tot el llibre d'adreces, hauràs de "
+"seleccionar '%s' desde la llista desplegable de llibre/carpeta."
 
-#: src/procmsg.c:2269
-msgid "Filtering messages...\n"
-msgstr "Filtrant missatge...\n"
+#: src/prefs_matcher.c:1842
+msgid "Headers part"
+msgstr "Secció capçaleres"
 
-#: src/quote_fmt.c:47
-msgid "<span weight=\"bold\">symbols:</span>"
-msgstr "<span weight=\"bold\">simbols:</span>"
+#: src/prefs_matcher.c:1846
+msgid "Headers values"
+msgstr "Valors de les capçaleres"
 
-#: src/quote_fmt.c:48
-msgid "customized date format (see 'man strftime')"
-msgstr "format de data configurat (veure 'man strftime')"
+#: src/prefs_matcher.c:1850
+msgid "Body part"
+msgstr "Secció cos"
 
-#: src/quote_fmt.c:51
-msgid "email address of sender"
-msgstr "adreça de correu de l'emisor"
+#: src/prefs_matcher.c:1854
+msgid "Whole message"
+msgstr "Missatge complet"
 
-#: src/quote_fmt.c:52
-msgid "full name of sender"
-msgstr "Nom complert del remitent"
+#: src/prefs_matcher.c:1973 src/prefs_matcher.c:2017
+msgid "in"
+msgstr "dins"
 
-#: src/quote_fmt.c:53
-msgid "first name of sender"
-msgstr "nom del remitent"
+#: src/prefs_matcher.c:1975
+msgid "content is"
+msgstr "contingut és"
 
-#: src/quote_fmt.c:54
-msgid "last name of sender"
-msgstr "cognoms del remitent"
+#: src/prefs_matcher.c:1984
+msgid "Age is"
+msgstr "L'edat és"
 
-#: src/quote_fmt.c:55
-msgid "initials of sender"
-msgstr "inicials del remitent"
+#: src/prefs_matcher.c:1989
+msgid "Flag"
+msgstr "Marcador"
 
-#: src/quote_fmt.c:62
-msgid "message body"
-msgstr "cos del missatge"
+#: src/prefs_matcher.c:1990 src/prefs_matcher.c:2007
+msgid "is"
+msgstr "és"
 
-#: src/quote_fmt.c:63
-msgid "quoted message body"
-msgstr "cos de missatge marcat"
+#: src/prefs_matcher.c:1995
+msgid "Name:"
+msgstr "Nom: "
 
-#: src/quote_fmt.c:64
-msgid "message body without signature"
-msgstr "cos de missatge sense signatura"
+#: src/prefs_matcher.c:2006
+msgid "Label"
+msgstr "Etiqueta"
 
-#: src/quote_fmt.c:65
-msgid "quoted message body without signature"
-msgstr "cos de missatge marcat sense signatura"
+#: src/prefs_matcher.c:2012
+msgid "Value:"
+msgstr "Valor:"
 
-#: src/quote_fmt.c:66
-msgid "message tags"
-msgstr "etiquetes del missatge"
+#: src/prefs_matcher.c:2029
+msgid "Score is"
+msgstr "Puntuació és"
 
-#: src/quote_fmt.c:67
-msgid "current dictionary"
-msgstr "dicctionari activat"
+#: src/prefs_matcher.c:2030
+msgid "points"
+msgstr "punts"
 
-#: src/quote_fmt.c:68
-msgid "cursor position"
-msgstr "posició del cursor"
+#: src/prefs_matcher.c:2040
+msgid "Size is"
+msgstr "El tamany és"
 
-#: src/quote_fmt.c:69
-msgid "account property: your name"
-msgstr "propietat del compte: el vostre nom"
+#: src/prefs_matcher.c:2045
+msgid "Scope:"
+msgstr "Marcador:"
 
-#: src/quote_fmt.c:70
-msgid "account property: your email address"
-msgstr "propietat del compte: la vostra adreça de correu"
+#: src/prefs_matcher.c:2047
+msgid "tags"
+msgstr "etiquetes"
 
-#: src/quote_fmt.c:71
-msgid "account property: account name"
-msgstr "propietat del compte: nom de compte"
+#: src/prefs_matcher.c:2052
+msgid "type is"
+msgstr "tipus és"
 
-#: src/quote_fmt.c:72
-msgid "account property: organization"
-msgstr "pPropietat del compte : organització"
+#: src/prefs_matcher.c:2056
+msgid "Program returns"
+msgstr "El programa retorna"
 
-#: src/quote_fmt.c:73
-msgid "account property: signature"
-msgstr "propietat del compte: signatura"
+#: src/prefs_matcher.c:2126
+msgid ""
+"The entry was not saved.\n"
+"Close anyway?"
+msgstr ""
+"L'entrada no ha sigut desada.\n"
+"Tancar igualment?"
 
-#: src/quote_fmt.c:74
-msgid "account property: signature path"
-msgstr "propietat del compte: ruta de la signatura"
+#: src/prefs_matcher.c:2190
+msgid "Match Type: 'Test'"
+msgstr "Tipus de coincidència: 'Provar'"
 
-#: src/quote_fmt.c:75
-msgid "account property: default dictionary"
-msgstr "propietat del compte: diccionari per defecte"
+#: src/prefs_matcher.c:2191
+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"
+"\n"
+"The following symbols can be used:"
+msgstr ""
+"'Provar' us permet provar un missatge o element del missatge usant un "
+"programa o script extern. El programa haurà de retornar 0 o 1.\n"
+"\n"
+"Podeu usar els següents símbols:"
 
-#: src/quote_fmt.c:76
-msgid "address book <span style=\"oblique\">completion</span>: Cc"
-msgstr "llibre d'adresses <span style=\"oblique\">completion</span>: Cc"
+#: src/prefs_matcher.c:2290
+msgid "Current condition rules"
+msgstr "Regles de condició actuals"
 
-#: src/quote_fmt.c:77
-msgid "address book <span style=\"oblique\">completion</span>: From"
-msgstr "llibre d'adresses <span style=\"oblique\">completion</span>: Des de"
+#: src/prefs_message.c:120
+msgid "Headers"
+msgstr "Capçaleres"
 
-#: src/quote_fmt.c:78
-msgid "address book <span style=\"oblique\">completion</span>: To"
-msgstr "llibre d'adresses <span style=\"oblique\">completion</span>: A"
+#: src/prefs_message.c:123
+msgid "Display header pane above message view"
+msgstr "Mostrar panell de capçaleres sobre el missatge"
 
-#: src/quote_fmt.c:80
-msgid "literal backslash"
-msgstr "caràcter contrabarra"
+#: src/prefs_message.c:127
+msgid "Display (X-)Face in message view"
+msgstr "Mostrar (X-)Face en la vista del missatge"
 
-#: src/quote_fmt.c:81
-msgid "literal question mark"
-msgstr "caràcter d'interrogació"
+#: src/prefs_message.c:130
+msgid "Display Face in message view"
+msgstr "Mostrar Face en la vista del missatge"
 
-#: src/quote_fmt.c:82
-msgid "literal exclamation mark"
-msgstr "marca del literal d'exclamació"
+#: src/prefs_message.c:144
+msgid "Display headers in message view"
+msgstr "Mostra les capçaleres a la vista del missatge"
 
-#: src/quote_fmt.c:83
-msgid "literal pipe"
-msgstr "caràcter 'pipe'"
+#: src/prefs_message.c:156
+msgid "HTML messages"
+msgstr "Missatges HTML"
 
-#: src/quote_fmt.c:84
-msgid "literal opening curly brace"
-msgstr "caràcter 'claudator' obert"
+#: src/prefs_message.c:159
+msgid "Render HTML messages as text"
+msgstr "Renderitzar missatges HTML com si fos text"
 
-#: src/quote_fmt.c:85
-msgid "literal closing curly brace"
-msgstr "caràcter 'claudator' tancada"
+#: src/prefs_message.c:162
+msgid "Render HTML-only messages with plugin if possible"
+msgstr "Mostrar els missatges HTML amb un mòdul si és possible"
 
-#: src/quote_fmt.c:86
-msgid "tab"
-msgstr "tab"
+#: src/prefs_message.c:165
+msgid "Select the HTML part of multipart/alternative messages"
+msgstr "Seleccionar la part HTML en missatges multipart/alternative"
 
-#: src/quote_fmt.c:89
-msgid "<span weight=\"bold\">commands:</span>"
-msgstr "<span weight=\"bold\">comandes:</span>"
+#: src/prefs_message.c:175
+msgid "Line space"
+msgstr "Interlineat"
 
-#: src/quote_fmt.c:90
-msgid ""
-"insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
-"the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
-"symbols (or their long equivalent)"
-msgstr ""
-"insertar <span style=\"oblique\">expr</span> si x es definida, on x és un\n"
-"dels simbols [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
-"(o un dels seus equivalents sense abreviar)"
+#: src/prefs_message.c:195
+msgid "Scroll"
+msgstr "Desplaçament"
 
-#: src/quote_fmt.c:91
-msgid ""
-"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
-"of\n"
-"the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
-"symbols (or their long equivalent)"
-msgstr ""
-"insertar <span style=\"oblique\">expr</span> si x no és definida, on x és "
-"un\n"
-"dels simbols [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
-"(o un dels seus equivalents sense abreviar)"
+#: src/prefs_message.c:197
+msgid "Half page"
+msgstr "Mitja pàgina"
 
-#: src/quote_fmt.c:92
-msgid ""
-"insert file:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
-"to insert"
-msgstr ""
-"inserteu arxiu:\n"
-"<span style=\"oblique\">sub_expr</span> és evaluada com a una ruta d'arxiu a "
-"insertar"
+#: src/prefs_message.c:203
+msgid "Smooth scroll"
+msgstr "Desplaçament suau"
 
-#: src/quote_fmt.c:93
-msgid ""
-"insert program output:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
-"get\n"
-"the output from"
-msgstr ""
-"insertar programa de resposta:\n"
-"<span style=\"oblique\">sub_expr</span>  es evaluada com a una comanda per "
-"obtenir\n"
-"la resposta desde "
+#: src/prefs_message.c:209
+msgid "Step"
+msgstr "Pas"
 
-#: src/quote_fmt.c:94
-msgid ""
-"insert user input:\n"
-"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
-"user-entered text"
-msgstr ""
-"insertar entrada d'usuari:\n"
-"<span style=\"oblique\">sub_expr</span>  es una variable per ser reemplaçada "
-"per\n"
-"un text entrat per l'usuari"
+#: src/prefs_message.c:230
+msgid "Show attachment descriptions (rather than names)"
+msgstr "Mostrar descripcions dels adjunts (enlloc de noms)"
 
-#: src/quote_fmt.c:95
-msgid ""
-"attach file:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
-"to attach"
-msgstr ""
-"adjunteu arxiu:\n"
-"<span style=\"oblique\">sub_expr</span> és evaluada com a una ruta d'arxiu a "
-"adjuntar"
+#: src/prefs_message.c:233
+msgid "Quotation"
+msgstr "Símbol"
 
-#: src/quote_fmt.c:97
-msgid "<span weight=\"bold\">definition of terms:</span>"
-msgstr "<span weight=\"bold\">definició de termes:</span>"
+#: src/prefs_message.c:242
+msgid "Collapse quoted text on double click"
+msgstr "Amaga el text entre cometes amb doble click"
 
-#: src/quote_fmt.c:98
-msgid ""
-"text that can contain any of the symbols or\n"
-"commands above"
-msgstr ""
-"texte que pot contenir qualsevol dels simbols o\n"
-"comandes indicats anteriorment"
+#: src/prefs_message.c:249
+msgid "Treat these characters as quotation marks: "
+msgstr "Tractar aquests caràcters com a símbols de marcat: "
 
-#: src/quote_fmt.c:99
-msgid ""
-"text that can contain any of the symbols (no\n"
-"commands) above"
-msgstr ""
-"texte que pot contenir qualsevol dels simbols (no\n"
-"comandes) indicat anteriorment"
+#: src/prefs_message.c:355
+msgid "Text Options"
+msgstr "Opcions de Text"
 
-#: src/quote_fmt.c:100
-msgid ""
-"completion from address book only works with the first\n"
-"address of the header, it outputs the full name\n"
-"of the contact if that address matches exactly\n"
-"one contact in the address book"
-msgstr ""
-"completat desde el llibre d'adresses només funciona amb la primera\n"
-"adressa de la capçalera, mostra el nom complet\n"
-"del contacte si l'adreça coincideix exactament\n"
-"amb un contacte al llibre d'adresses"
+#: src/prefs_msg_colors.c:147
+msgid "Message view"
+msgstr "Vista de missatges"
 
-#: src/quote_fmt.c:109
-msgid "Description of symbols"
-msgstr "Descripció de símbols"
+#: src/prefs_msg_colors.c:154
+msgid "Enable coloration of message text"
+msgstr "Permetre colorejat en el text del missatge"
 
-#: src/quote_fmt.c:110
-msgid "The following symbols and commands can be used:"
-msgstr "Els següents símbols i comandes poden ser usats:"
+#: src/prefs_msg_colors.c:162
+msgid "Quote"
+msgstr "Marcat"
 
-#: src/quote_fmt.c:173
-msgid "Use template when composing new messages"
-msgstr "Usar la plantilla quan es composin missatges nous"
+#: src/prefs_msg_colors.c:174
+msgid "Cycle quote colors"
+msgstr "Reusar colors d'entrecomillat"
 
-#: src/quote_fmt.c:197
-msgid ""
-"Override From header. This doesn't change the account used to compose the "
-"new message."
+#: src/prefs_msg_colors.c:178
+msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr ""
-"Sobreescriure la capçalera Des de. Això no canvia el compte usat per "
-"composar el nou missatge."
+"Si hi ha més de 3 nívells de entrecomillat, els colors serna re-utilitzats"
 
-#: src/quote_fmt.c:299
-msgid "Use template when replying to messages"
-msgstr "Usar plantilla quan es contestin missatges"
+#: src/prefs_msg_colors.c:184
+msgid "1st Level"
+msgstr "1er nivell"
 
-#: src/quote_fmt.c:323
-msgid "Override From header. This doesn't change the account used to reply."
-msgstr ""
-"Sobreescriure la capçalera Des de. Això no canvia el compte usat per "
-"respondre."
+#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216
+#: src/prefs_msg_colors.c:242
+msgid "Text"
+msgstr "Text"
 
-#: src/quote_fmt.c:334 src/quote_fmt.c:464
-msgid "Quotation mark"
-msgstr "Símbol"
+#: src/prefs_msg_colors.c:204
+msgctxt "Tooltip"
+msgid "Pick color for 1st level text"
+msgstr "Escollir color per al text de primer nivell"
 
-#: src/quote_fmt.c:429
-msgid "Use template when forwarding messages"
-msgstr "Usar plantilla quan es reenviin missatges"
+#: src/prefs_msg_colors.c:210
+msgid "2nd Level"
+msgstr "2on nivell"
 
-#: src/quote_fmt.c:453
-msgid "Override From header. This doesn't change the account used to forward."
-msgstr ""
-"Sobreescriure la capçalera Des de. Això no canvia el compte usat per "
-"reenviar."
+#: src/prefs_msg_colors.c:230
+msgctxt "Tooltip"
+msgid "Pick color for 2nd level text"
+msgstr "Escollir color per al text de 2on nivell"
 
-#: src/quote_fmt.c:545
-msgid "Defaults"
-msgstr "Predeterminats"
+#: src/prefs_msg_colors.c:236
+msgid "3rd Level"
+msgstr "3r nivell"
 
-#: src/quote_fmt.c:563
-msgid ""
-"The \"From\" field of the \"New message\" template contains an invalid email "
-"address."
-msgstr ""
-"El camp \"Des de\" de la plantilla \"Nou missatge\" conté una adreça de "
-"correu errònia."
+#: src/prefs_msg_colors.c:256
+msgctxt "Tooltip"
+msgid "Pick color for 3rd level text"
+msgstr "Escollir color per al text de 3r nivell"
 
-#: src/quote_fmt.c:566
-msgid "The \"Subject\" field of the \"New message\" template is invalid."
-msgstr "El camp \"Assumpte\" de la plantilla \"Nou missatge\" és erroni."
+#: src/prefs_msg_colors.c:263
+msgid "Enable coloration of text background"
+msgstr "Permetre colors en el fons del missatge"
 
-#: src/quote_fmt.c:583
-msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
-msgstr "El camp \"símbol de cometa\" de la plantilla \"Respondre\" és erroni."
+#: src/prefs_msg_colors.c:279
+msgctxt "Tooltip"
+msgid "Pick color for 1st level text background"
+msgstr "Escollir color per al fons del text de 1er nivell"
 
-#: src/quote_fmt.c:603
-msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
-msgstr "El camp \"símbol de cometa\" de la plantilla \"Reenviar\" és erroni."
+#: src/prefs_msg_colors.c:300
+msgctxt "Tooltip"
+msgid "Pick color for 2nd level text background"
+msgstr "Escollir color per al fons del text de 2n nivell"
 
-#: src/quote_fmt_parse.y:541
-#, c-format
-msgid "Enter text to replace '%s'"
-msgstr "Entra text per reemplaçar '%s'"
+#: src/prefs_msg_colors.c:321
+msgctxt "Tooltip"
+msgid "Pick color for 3rd level text background"
+msgstr "Escollir color per al fons del text de 3r nivell"
 
-#: src/quote_fmt_parse.y:542
-msgid "Enter variable"
-msgstr "Inserta una variable"
+#: src/prefs_msg_colors.c:341
+msgctxt "Tooltip"
+msgid "Pick color for links"
+msgstr "Escollir color per als enllaços"
 
-#: src/send_message.c:153
-#, c-format
-msgid "Sending message using command: %s\n"
-msgstr "Enviant missatge usant l'ordre: %s\n"
+#: src/prefs_msg_colors.c:343
+msgid "URI link"
+msgstr "URI d'enllaç"
 
-#: src/send_message.c:167
-#, c-format
-msgid "Couldn't execute command: %s"
-msgstr "No s'ha pogut executar l'ordre: %s"
+#: src/prefs_msg_colors.c:360
+msgctxt "Tooltip"
+msgid "Pick color for signatures"
+msgstr "Escollir color per a les signatures"
+
+#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:354
+msgid "Folder list"
+msgstr "Llista de carpetes"
+
+#: src/prefs_msg_colors.c:380
+msgid ""
+"Pick color for Target folder. Target folder is used when the option 'Execute "
+"immediately when moving or deleting messages' is turned off"
+msgstr ""
+"Esculliu color per la carpeta de destinació. La carpeta de destinació "
+"s'usarà quan la opció 'Executeu immediatament quan mogueu o esborreu "
+"missatges' estigui desactivada"
 
-#: src/send_message.c:202
-#, c-format
-msgid "Error occurred while executing command: %s"
-msgstr "S'ha produït un error executant l'ordre: %s"
+#: src/prefs_msg_colors.c:384
+msgid "Target folder"
+msgstr "Carpeta destinació"
 
-#: src/send_message.c:352
-msgid "Connecting"
-msgstr "Connectant"
+#: src/prefs_msg_colors.c:399
+msgid "Pick color for folders containing new messages"
+msgstr "Escolliu color per a les carpetes que continguin nous missatges"
 
-#: src/send_message.c:357
-msgid "Doing POP before SMTP..."
-msgstr "Fent POP abans de SMTP..."
+#: src/prefs_msg_colors.c:401
+msgid "Folder containing new messages"
+msgstr "Carpetes que contenen nous missatges"
 
-#: src/send_message.c:360
-msgid "POP before SMTP"
-msgstr "POP abans de SMTP"
+#. TRANSLATORS: 'color %d' refers to the filtering/processing
+#. rule name and should not be translated
+#: src/prefs_msg_colors.c:428 src/prefs_msg_colors.c:459
+#, c-format
+msgctxt "Tooltip"
+msgid "Pick color for 'color %d'"
+msgstr "Seleccioneu color per 'color %d'"
 
-#: src/send_message.c:365
+#. TRANSLATORS: 'color %d' refers to the filtering/processing
+#. rule name and should not be translated
+#: src/prefs_msg_colors.c:432 src/prefs_msg_colors.c:463
 #, c-format
-msgid "Account '%s': Connecting to SMTP server: %s:%d..."
-msgstr "Compte '%s': Connectant al servidor SMTP: %s:%d..."
+msgid "Set label for 'color %d'"
+msgstr "Escollir etiqueta per a 'color %d'"
 
-#: src/send_message.c:422
-msgid "Mail sent successfully."
-msgstr "Correu enviat correctament."
+#. TRANSLATORS: 'color %d' refers to the filtering/processing
+#. rule name and should not be translated
+#: src/prefs_msg_colors.c:592
+#, c-format
+msgctxt "Dialog title"
+msgid "Pick color for 'color %d'"
+msgstr "Escolliu color per 'color %d'"
 
-#: src/send_message.c:488
-msgid "Sending HELO..."
-msgstr "Enviant HELO..."
+#: src/prefs_msg_colors.c:600
+msgctxt "Dialog title"
+msgid "Pick color for 1st level text"
+msgstr "Escollir color per al text de 1er nivell"
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
-msgid "Authenticating"
-msgstr "Autentificant-se"
+#: src/prefs_msg_colors.c:603
+msgctxt "Dialog title"
+msgid "Pick color for 2nd level text"
+msgstr "Escollir color per al text de 2on nivell"
 
-#: src/send_message.c:490 src/send_message.c:495
-msgid "Sending message..."
-msgstr "Enviant mensaje..."
+#: src/prefs_msg_colors.c:606
+msgctxt "Dialog title"
+msgid "Pick color for 3rd level text"
+msgstr "Escollir color per al text de 3r nivell"
 
-#: src/send_message.c:493
-msgid "Sending EHLO..."
-msgstr "Enviant EHLO..."
+#: src/prefs_msg_colors.c:609
+msgctxt "Dialog title"
+msgid "Pick color for 1st level text background"
+msgstr "Escollir color per al fons del text de 1r nivell"
 
-#: src/send_message.c:502
-msgid "Sending MAIL FROM..."
-msgstr "Enviant MAIL FROM..."
+#: src/prefs_msg_colors.c:612
+msgctxt "Dialog title"
+msgid "Pick color for 2nd level text background"
+msgstr "Escollir color per al fons del test de 2n nivell"
 
-#: src/send_message.c:506
-msgid "Sending RCPT TO..."
-msgstr "Enviant RCPT TO..."
+#: src/prefs_msg_colors.c:615
+msgctxt "Dialog title"
+msgid "Pick color for 3rd level text background"
+msgstr "Escollir color per al fons del text de 3r nivell"
 
-#: src/send_message.c:511
-msgid "Sending DATA..."
-msgstr "Enviant DATA..."
+#: src/prefs_msg_colors.c:618
+msgctxt "Dialog title"
+msgid "Pick color for links"
+msgstr "Escolliu color per els enllaços"
 
-#: src/send_message.c:515
-msgid "Quitting..."
-msgstr "Sortint..."
+#: src/prefs_msg_colors.c:621
+msgctxt "Dialog title"
+msgid "Pick color for target folder"
+msgstr "Escollir color per a la carpeta destinació"
 
-#: src/send_message.c:544
-#, c-format
-msgid "Sending message (%d / %d bytes)"
-msgstr "Enviant missatge (%d / %d bytes)"
+#: src/prefs_msg_colors.c:624
+msgctxt "Dialog title"
+msgid "Pick color for signatures"
+msgstr "Escollir color per a les firmes"
 
-#: src/send_message.c:597
-msgid "Sending message"
-msgstr "Enviant missatge"
+#: src/prefs_msg_colors.c:627
+msgctxt "Dialog title"
+msgid "Pick color for folder"
+msgstr "Escolliu color per 'color %d'"
 
-#: src/send_message.c:666 src/send_message.c:686
-msgid "Error occurred while sending the message."
-msgstr "Hi ha hagut un error enviant el missatge."
+#: src/prefs_msg_colors.c:840
+msgid "Colors"
+msgstr "Colors"
 
-#: src/send_message.c:669
-#, c-format
-msgid ""
-"Error occurred while sending the message:\n"
-"%s"
-msgstr ""
-"Hi ha hagut un error enviant el missatge:\n"
-"%s"
+#: src/prefs_other.c:97
+msgid "Choose preset keyboard shortcuts"
+msgstr "Escollir configuració de les dreceres de teclat"
 
-#: src/setup.c:75
-msgid "Mailbox setting"
-msgstr "Configurar bústia"
+#: src/prefs_other.c:111
+msgid "Select preset:"
+msgstr "Seleccionar combinació:"
 
-#: src/setup.c:76
+#: src/prefs_other.c:126
 msgid ""
-"First, you have to set the location of mailbox.\n"
-"You can use existing mailbox in MH format\n"
-"if you have the one.\n"
-"If you're not sure, just select OK."
+"You can also modify each menu shortcut by pressing\n"
+"any key(s) when focusing the mouse pointer on the item."
 msgstr ""
-"Primer estableixi la localització de la teva bústia.\n"
-"Pots utilitzar una bústia existent en format MH\n"
-"si ja el teniu.\n"
-"Si no estàs segur, selecciona Acceptar."
-
-#: src/sourcewindow.c:64
-msgid "Source of the message"
-msgstr "Font del missatge"
-
-#: src/sourcewindow.c:159
-#, c-format
-msgid "%s - Source"
-msgstr "%s - Font"
-
-#: src/ssl_manager.c:157
-msgid "Saved SSL certificates"
-msgstr "Certificats SSL desats"
-
-#: src/ssl_manager.c:431
-msgid "Delete certificate"
-msgstr "Esborrar certificat"
+"Podeu modificar també cada drecera de menú presionant\n"
+"alguna(es) tecla(es) al situar el punter sobre l'element."
 
-#: src/ssl_manager.c:432
-msgid "Do you really want to delete this certificate?"
-msgstr "Vols esborrar realment aquest certificat?"
+#: src/prefs_other.c:479
+msgid "Add address to destination when double-clicked"
+msgstr "Afegir adreça a la destinació amb doble click"
 
-#: src/summary_search.c:259
-msgid "Search messages"
-msgstr "Buscar en els missatges"
+#: src/prefs_other.c:482
+msgid "On exit"
+msgstr "Al sortir"
 
-#: src/summary_search.c:281
-msgid "Match any of the following"
-msgstr "Coincidir amb algun dels següents"
+#: src/prefs_other.c:485
+msgid "Confirm on exit"
+msgstr "Confirmar al sortir"
 
-#: src/summary_search.c:283
-msgid "Match all of the following"
-msgstr "Coincidir amb tots els següents"
+#: src/prefs_other.c:492
+msgid "Empty trash on exit"
+msgstr "Buidar la paperera al sortir"
 
-#: src/summary_search.c:447
-msgid "Body:"
-msgstr "Cos:"
+#: src/prefs_other.c:495
+msgid "Warn if there are queued messages"
+msgstr "Avisar si existeixen missatges en cua"
 
-#: src/summary_search.c:454
-msgid "Condition:"
-msgstr "Condició:"
+#: src/prefs_other.c:497
+msgid "Keyboard shortcuts"
+msgstr "Dreceres de teclat"
 
-#: src/summary_search.c:484
-msgid "Find _all"
-msgstr "Trob_ar a tots"
+#: src/prefs_other.c:500
+msgid "Enable customisable keyboard shortcuts"
+msgstr "Habilitar les dreceres de teclat configurables"
 
-#: src/summary_search.c:690 src/summaryview.c:1105 src/summaryview.c:1366
-#, c-format
-msgid "Searching in %s... \n"
-msgstr "Buscant a  %s... \n"
+#: src/prefs_other.c:503
+msgid ""
+"If checked, you can change the keyboard shortcuts of most of the menu items "
+"by focusing on the menu item and pressing a key combination.\n"
+"Uncheck this option if you want to lock all existing keyboard shortcuts."
+msgstr ""
+"Si el marqueu, podreu canviar les dreceres de teclat de la majoria dels "
+"items del menú marcant l'ítem de menú i prement una combinació de tecles.\n"
+"Desmarca aquesta opció si vols bloquejar totes les dreceres de teclat "
+"existents."
 
-#: src/summary_search.c:787
-msgid "Beginning of list reached; continue from end?"
-msgstr "S'ha arribat al principi de la llista, seguir desde el final?"
+#: src/prefs_other.c:510
+msgid " Choose preset keyboard shortcuts... "
+msgstr "Seleccionar configuració de dreceres de teclat"
 
-#: src/summary_search.c:789
-msgid "End of list reached; continue from beginning?"
-msgstr "S'ha acabat la llista, continuar desde el principi?"
+#: src/prefs_other.c:520
+msgid "Metadata handling"
+msgstr "Recollida de metadades"
 
-#: src/summaryview.c:429
-msgid "Create _filter rule"
-msgstr "Crear regla de _filtrat"
+#: src/prefs_other.c:521
+msgid ""
+"Safer mode asks the OS to write metadata to disk directly;\n"
+"it avoids data loss after crashes but can take some time."
+msgstr ""
+"El mode més segur consulta al SO per escriure metadades al disc "
+"directament;\n"
+"Aquest mode evita la perdua de dades per finalitzacions errònies però pot "
+"portar temps addicional."
 
-#: src/summaryview.c:557
-msgid "Toggle quick search bar"
-msgstr "Barra de búsqueda ràpida"
+#: src/prefs_other.c:525
+msgid "Safer"
+msgstr "Més segur"
 
-#: src/summaryview.c:594
-msgid "Toggle multiple selection"
-msgstr "Commutar selecció múltiple"
+#: src/prefs_other.c:527
+msgid "Faster"
+msgstr "Més ràpid"
 
-#: src/summaryview.c:1294
-msgid "Process mark"
-msgstr "Processar marques"
+#: src/prefs_other.c:545
+msgid "Socket I/O timeout"
+msgstr "Temps límit E/S socket"
 
-#: src/summaryview.c:1295
-msgid "Some marks are left. Process them?"
-msgstr "Queden algunes marques. Processar-les?"
+#: src/prefs_other.c:567
+msgid "Ask before emptying trash"
+msgstr "Preguntar abans de buidar la paperera"
 
-#: src/summaryview.c:1345
-#, c-format
-msgid "Scanning folder (%s)..."
-msgstr "Revisant carpeta (%s)..."
+#: src/prefs_other.c:569
+msgid "Ask about account specific filtering rules when filtering manually"
+msgstr ""
+"Preguntar sobre una regla de filtrat específica d'un compte quan filtreu "
+"manualment"
 
-#: src/summaryview.c:1842 src/summaryview.c:1894
-msgid "No more unread messages"
-msgstr "No hi ha més missatges sense llegir"
+#: src/prefs_other.c:574
+msgid "Use secure file deletion if possible"
+msgstr "Usar eliminació d'arxius segurs si és possible"
 
-#: src/summaryview.c:1843
-msgid "No unread message found. Search from the end?"
-msgstr "Cap missatge sense llegir trobat. Buscar desde el final?"
+#: src/prefs_other.c:578
+msgid ""
+"Use secure file deletion if possible\n"
+"(the 'shred' program is not available)"
+msgstr ""
+"Usar eliminació d'arxius segurs si és possible\n"
+"(el programa 'shred' no està disponible)"
 
-#: src/summaryview.c:1855 src/summaryview.c:1907 src/summaryview.c:1950
-#: src/summaryview.c:2002 src/summaryview.c:2081
+#: src/prefs_other.c:583
 msgid ""
-"Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
+"Use the 'shred' program to overwrite files with random data before deleting "
+"them. This slows down deletion. Be sure to read shred's man page for caveats."
 msgstr ""
-"Error intern: valor inesperat per prefs_common.next_unread_msg_dialog\n"
-
-#: src/summaryview.c:1863
-msgid "No unread messages."
-msgstr "No hi ha missatges sense llegir."
+"Useu el programa 'shred' per sobreescriure arxius amb dades aleatòries abans "
+"d'esborrar-los. Això alenteix el proces. Assegureu-vos de llegir les "
+"implicacions a la pàgina del manual del shred."
 
-#: src/summaryview.c:1895
-msgid "No unread message found. Go to next folder?"
-msgstr "No hi ha missatges sense llegir. Anar a la carpeta següent?"
+#: src/prefs_other.c:587
+msgid "Synchronise offline folders as soon as possible"
+msgstr "Sincronitzar sense línia les carpetes el més aviat possible"
 
-#: src/summaryview.c:1937 src/summaryview.c:1989
-msgid "No more new messages"
-msgstr "No hi ha més missatges nous"
+#: src/prefs_other.c:690
+msgid "Miscellaneous"
+msgstr "Miscel·lània"
 
-#: src/summaryview.c:1938
-msgid "No new message found. Search from the end?"
-msgstr "No hi ha més missatges nous. Buscar desde el final?"
+#: src/prefs_quote.c:77
+msgid "On %d\\n%f wrote:\\n\\n%q"
+msgstr "EL %d\\n%f escrigué:\\n\\n%q"
 
-#: src/summaryview.c:1958
-msgid "No new messages."
-msgstr "No hi ha missatges nous."
+#: src/prefs_receive.c:123
+msgid "External incorporation program"
+msgstr "Incorporació external de programa"
 
-#: src/summaryview.c:1990
-msgid "No new message found. Go to next folder?"
-msgstr "No hi ha més missatges nous. Anar a la cartea següent?"
+#: src/prefs_receive.c:126
+msgid "Use external program for receiving mail"
+msgstr "Usar un programa extern per rebre correu"
 
-#: src/summaryview.c:2027 src/summaryview.c:2068
-msgid "No more marked messages"
-msgstr "No hi ha més missatges marcats"
+#: src/prefs_receive.c:142
+msgid "Automatic checking"
+msgstr "Verificació automàtica"
 
-#: src/summaryview.c:2028
-msgid "No marked message found. Search from the end?"
-msgstr "Cap missatge marcat trobat. Buscar desde el final?"
+#: src/prefs_receive.c:149
+msgid "Check for new mail every"
+msgstr "Verificar l'existència de nou correu cada"
 
-#: src/summaryview.c:2037
-msgid "No marked messages."
-msgstr "No hi ha missatges marcats."
+#: src/prefs_receive.c:167
+msgid "Check for new mail on start-up"
+msgstr "Comprovar l'existència de nou correu a l'inici"
 
-#: src/summaryview.c:2069
-msgid "No marked message found. Go to next folder?"
-msgstr "No s'han trobat missatges marcats. Anar a la carpeta següent?"
+#: src/prefs_receive.c:170
+msgid "Dialogs"
+msgstr "Diàlegs"
 
-#: src/summaryview.c:2106 src/summaryview.c:2131
-msgid "No more labeled messages"
-msgstr "No hi ha més missatges etiquetats"
+#: src/prefs_receive.c:172
+msgid "Show receive dialog"
+msgstr "Mostrar diàleg de recepció"
 
-#: src/summaryview.c:2107
-msgid "No labeled message found. Search from the end?"
-msgstr "Cap missatge etiquetat trobat. Buscar desde el final?"
+#: src/prefs_receive.c:182
+msgid "Only on manual receiving"
+msgstr "Només al rebre manualment"
 
-#: src/summaryview.c:2116 src/summaryview.c:2141
-msgid "No labeled messages."
-msgstr "No hi ha missatges etiquetats."
+#: src/prefs_receive.c:193
+msgid "Close receive dialog when finished"
+msgstr "Tancar el diàleg de recepció al finalitzar"
 
-#: src/summaryview.c:2132
-msgid "No labeled message found. Search from the beginning?"
-msgstr "Cap missatge etiquetat trobat. Buscar desde el principi?"
+#: src/prefs_receive.c:196
+msgid "Don't popup error dialog on receive error"
+msgstr "No mostrar diàleg d'error en l'error de recepció"
 
-#: src/summaryview.c:2446
-msgid "Attracting messages by subject..."
-msgstr "Agrupant missatges per l'assumpte..."
+#: src/prefs_receive.c:199
+msgid "After receiving new mail"
+msgstr "Després de rebre nou correu"
 
-#: src/summaryview.c:2631
-#, c-format
-msgid "%d deleted"
-msgstr "%d esborrat(s)"
+#: src/prefs_receive.c:201
+msgid "Go to Inbox"
+msgstr "Anar a la safata d'entrada"
 
-#: src/summaryview.c:2635
-#, c-format
-msgid "%s%d moved"
-msgstr "%s%d moguts"
+#: src/prefs_receive.c:203
+msgid "Update all local folders"
+msgstr "Actualitzar totes les carpetes locals"
 
-#: src/summaryview.c:2636 src/summaryview.c:2643
-msgid ", "
-msgstr ", "
+#: src/prefs_receive.c:205
+msgid "Run command"
+msgstr "Executa comanda"
 
-#: src/summaryview.c:2641
-#, c-format
-msgid "%s%d copied"
-msgstr "%s%d copiat"
+#: src/prefs_receive.c:210
+msgid "after automatic check"
+msgstr "després de la comprovació automàtica"
 
-#: src/summaryview.c:2655
-msgid " item selected"
-msgid_plural " items selected"
-msgstr[0] " element seleccionat"
-msgstr[1] " elements seleccionats"
+#: src/prefs_receive.c:212
+msgid "after manual check"
+msgstr "després de la comprovació manual"
 
-#: src/summaryview.c:2673 src/summaryview.c:2716
+#: src/prefs_receive.c:220
 #, c-format
-msgid "%d new, %d unread, %d total (%s)"
-msgstr "%d nou(s), %d no llegit(s), %d total(s) (%s)"
-
-#: src/summaryview.c:2691
-#, fuzzy
-msgid "Message summary"
-msgstr "Part del missatge"
-
-#: src/summaryview.c:2692
-msgid "New:"
+msgid ""
+"Command to execute:\n"
+"(use %d as number of new mails)"
 msgstr ""
+"Orden a ejecutar:\n"
+"(usar %d com a n de missatges nous)"
 
-#: src/summaryview.c:2693
-#, fuzzy
-msgid "Unread:"
-msgstr "No llegits"
-
-#: src/summaryview.c:2694
-#, fuzzy
-msgid "Total:"
-msgstr "Total"
-
-# RML I think this is ambiguous:
-# RML on filtering is a verb ("Marcar") while in summary colunm it's really
-# RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
-#: src/summaryview.c:2696
-#, fuzzy
-msgid "Marked:"
-msgstr "Marcat"
-
-#: src/summaryview.c:2697
-#, fuzzy
-msgid "Replied:"
-msgstr "Contestat"
+#: src/prefs_receive.c:343 src/prefs_send.c:358
+msgid "Mail Handling"
+msgstr "Recollida de correu"
 
-#: src/summaryview.c:2698
-#, fuzzy
-msgid "Forwarded:"
-msgstr "Reenviat"
+#: src/prefs_receive.c:344
+msgid "Receiving"
+msgstr "Rebent"
 
-#: src/summaryview.c:2699
-#, fuzzy
-msgid "Locked:"
-msgstr "Bloquejat"
+#: src/prefs_send.c:161
+msgid "Save sent messages to Sent folder"
+msgstr "Desar dar missatges enviats a la carpeta Enviat"
 
-#: src/summaryview.c:2700
-#, fuzzy
-msgid "Ignored:"
-msgstr "ignorat"
+#: src/prefs_send.c:164
+msgid "Confirm before sending queued messages"
+msgstr "Confirmar abans d'enviar els missatges encuats."
 
-#: src/summaryview.c:2701
-#, fuzzy
-msgid "Watched:"
-msgstr "vist"
+#: src/prefs_send.c:167
+msgid "Never send Return Receipts"
+msgstr "Mai enviar justificants de recepció"
 
-#: src/summaryview.c:2711
-#, c-format
-msgid "%d/%d selected (%s/%s), %d unread"
-msgstr "%d/%d seleccionats (%s/%s), %d no llegits"
+#: src/prefs_send.c:170
+msgid "Show send dialog"
+msgstr "Mostrar diàleg d'enviament"
 
-#: src/summaryview.c:2991
-msgid "Sorting summary..."
-msgstr "Ordenant el resum..."
+#: src/prefs_send.c:172
+msgid "Warn when Subject is empty"
+msgstr "Avisa quan l'assumpte es buit"
 
-#: src/summaryview.c:3130
-msgid "Setting summary from message data..."
-msgstr "Establint el resum dels missatges..."
+#: src/prefs_send.c:180
+msgid "Outgoing encoding"
+msgstr "Conjunt de codis per enviar"
 
-#: src/summaryview.c:3335
-msgid "(No Date)"
-msgstr "(Sense data)"
+#: src/prefs_send.c:205
+msgid ""
+"If 'Automatic' is selected, the optimal encoding for the current locale will "
+"be used"
+msgstr ""
+"Si seleccioneu 'Automàtic' s'usarà la codificació última para a la "
+"localització actual."
 
-#: src/summaryview.c:3387
-msgid "(No Recipient)"
-msgstr "Cap recipient"
+#: src/prefs_send.c:220
+msgid "Automatic (Recommended)"
+msgstr "Automàtic (Recomanat)"
 
-#: src/summaryview.c:3422
-#, c-format
-msgid "From: %s, on %s"
-msgstr ""
+#: src/prefs_send.c:222
+msgid "7bit ASCII (US-ASCII)"
+msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/summaryview.c:3431
-#, c-format
-msgid "To: %s, on %s"
-msgstr ""
+#: src/prefs_send.c:223
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
 
-#: src/summaryview.c:4310
-msgid "You're not the author of the article.\n"
-msgstr "Vostè no es l'autor de l'article.\n"
+#: src/prefs_send.c:225
+msgid "Western European (ISO-8859-1)"
+msgstr "Europeu Occidental (ISO-8859-1)"
 
-#: src/summaryview.c:4403
-#, 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] "Realment vols esborrar el missatge seleccionat?"
-msgstr[1] "Realment vols esborrar els %d missatges seleccionats?"
+#: src/prefs_send.c:226
+msgid "Western European (ISO-8859-15)"
+msgstr "Europeu Occidental (ISO-8859-15)"
 
-#: src/summaryview.c:4406
-msgid "Delete message(s)"
-msgstr "Esborrar missatge(s)"
+#: src/prefs_send.c:228
+msgid "Central European (ISO-8859-2)"
+msgstr "Centreeuropeu (ISO-8859-2)"
 
-#: src/summaryview.c:4574
-msgid "Destination is same as current folder."
-msgstr "La destinació és la mateixa que la carpeta actual."
+#: src/prefs_send.c:230
+msgid "Baltic (ISO-8859-13)"
+msgstr "Bàltic (ISO-8859-13)"
 
-#: src/summaryview.c:4679
-msgid "Destination to copy is same as current folder."
-msgstr "La destinaciés de còpia és la carpeta actual."
+#: src/prefs_send.c:231
+msgid "Baltic (ISO-8859-4)"
+msgstr "Bàltic (ISO-8859-4)"
 
-#: src/summaryview.c:4844
-msgid "Append or Overwrite"
-msgstr "Afegir o Sobreescriure"
+#: src/prefs_send.c:233
+msgid "Greek (ISO-8859-7)"
+msgstr "Grec (ISO-8859-7)"
 
-#: src/summaryview.c:4845
-msgid "Append or overwrite existing file?"
-msgstr "Afegir o sobreescriure l'arxiu existent?"
+#: src/prefs_send.c:235
+msgid "Hebrew (ISO-8859-8)"
+msgstr "Hebreu (ISO-8859-8)"
 
-#: src/summaryview.c:4846
-msgid "_Append"
-msgstr "_Afegir"
+#: src/prefs_send.c:236
+msgid "Hebrew (Windows-1255)"
+msgstr "Hebreu (Windows-1255)"
 
-#: src/summaryview.c:4846
-msgid "_Overwrite"
-msgstr "_Sobreescriure"
+#: src/prefs_send.c:238
+msgid "Arabic (ISO-8859-6)"
+msgstr "Aràbic (ISO-8859-6)"
 
-#: src/summaryview.c:4887
-#, c-format
-msgid ""
-"You are about to print %d messages, one by one. Do you want to continue?"
-msgstr "Estàs a punt d'imprimir %d missatges, un a un. Vols continuar?"
+#: src/prefs_send.c:239
+msgid "Arabic (Windows-1256)"
+msgstr "Aràbic (Windows-1256)"
 
-#: src/summaryview.c:5371
-msgid "Building threads..."
-msgstr "Construïnt jerarquia..."
+#: src/prefs_send.c:241
+msgid "Turkish (ISO-8859-9)"
+msgstr "Turc (ISO-8859-9)"
 
-#: src/summaryview.c:5619
-msgid "Skip these rules"
-msgstr "Saltar-se aquestes regles"
+#: src/prefs_send.c:243
+msgid "Cyrillic (ISO-8859-5)"
+msgstr "Ciríl·lic (ISO-8859-5)"
 
-#: src/summaryview.c:5622
-msgid "Apply these rules regardless of the account they belong to"
-msgstr "Aplicar aquestes regles independentment del compte al que pertanyin"
+#: src/prefs_send.c:244
+msgid "Cyrillic (KOI8-R)"
+msgstr "Ciríl·lic (KOI8-R)"
 
-#: src/summaryview.c:5625
-msgid "Apply these rules if they apply to the current account"
-msgstr "Aplicar aquestes regles si s'apliquen al compte actual"
+#: src/prefs_send.c:245
+msgid "Cyrillic (X-MAC-CYRILLIC)"
+msgstr "Cyrillic (X-MAC-CYRILLIC)"
 
-#: src/summaryview.c:5654
-msgid "Filtering"
-msgstr "Filtrant"
+#: src/prefs_send.c:246
+msgid "Cyrillic (KOI8-U)"
+msgstr "Ciríl·lic (KOI8-U)"
 
-#: src/summaryview.c:5655
-msgid ""
-"There are some filtering rules that belong to an account.\n"
-"Please choose what to do with these rules:"
-msgstr ""
-"Hi ha algunes regles de filtrat que èrtanyen a un compte.\n"
-"Si us plau, escolliu que s'ha de fer amb aquestes regles:"
+#: src/prefs_send.c:247
+msgid "Cyrillic (Windows-1251)"
+msgstr "Ciríl·lic (Windows-1251)"
 
-#: src/summaryview.c:5685
-msgid "Filtering..."
-msgstr "Filtrant..."
+#: src/prefs_send.c:249
+msgid "Japanese (ISO-2022-JP)"
+msgstr "Japonès (ISO-2022-JP)"
 
-#: src/summaryview.c:5764
-msgid "Processing configuration"
-msgstr "Configuració de procesament"
+#: src/prefs_send.c:251
+msgid "Japanese (EUC-JP)"
+msgstr "Japonès (EUC-JP)"
 
-#: src/summaryview.c:6310
-msgid "Ignored thread"
-msgstr "Fil ignorat"
+#: src/prefs_send.c:252
+msgid "Japanese (Shift_JIS)"
+msgstr "Japonès (Shift_JIS)"
 
-#: src/summaryview.c:6312
-msgid "Watched thread"
-msgstr "Fil revisat"
+#: src/prefs_send.c:255
+msgid "Simplified Chinese (GB18030)"
+msgstr "Chinès simplificat (GB18030)"
 
-#: src/summaryview.c:6320
-msgid "Replied but also forwarded - click to see reply"
-msgstr "Respost però tambe reenviat - fes clic per veure la resposta"
+#: src/prefs_send.c:256
+msgid "Simplified Chinese (GB2312)"
+msgstr "Chinès simplificado (GB2312)"
 
-#: src/summaryview.c:6322
-msgid "Replied - click to see reply"
-msgstr "Respost- polsar per veure la resposta"
+#: src/prefs_send.c:257
+msgid "Simplified Chinese (GBK)"
+msgstr "Chinès simplificat (GBK)"
 
-#: src/summaryview.c:6334
-msgid "To be moved"
-msgstr "A ser mogut"
+#: src/prefs_send.c:258
+msgid "Traditional Chinese (Big5)"
+msgstr "Chinès tradicional (Big5)"
 
-#: src/summaryview.c:6336
-msgid "To be copied"
-msgstr "A ser copiat"
+#: src/prefs_send.c:260
+msgid "Traditional Chinese (EUC-TW)"
+msgstr "Chinès tradicional (EUC-TW)"
 
-#: src/summaryview.c:6348
-msgid "Signed, has attachment(s)"
-msgstr "Signat, té adjunt(s)"
+#: src/prefs_send.c:261
+msgid "Chinese (ISO-2022-CN)"
+msgstr "Chinès (ISO-2022-CN)"
 
-#: src/summaryview.c:6352
-msgid "Encrypted, has attachment(s)"
-msgstr "Encriptat, té adjunt(s)"
+#: src/prefs_send.c:264
+msgid "Korean (EUC-KR)"
+msgstr "Coreà(EUC-KR)"
 
-#: src/summaryview.c:6354
-msgid "Encrypted"
-msgstr "Encriptat"
+#: src/prefs_send.c:266
+msgid "Thai (TIS-620)"
+msgstr "Tailandès (TIS-620)"
 
-#: src/summaryview.c:6356
-msgid "Has attachment(s)"
-msgstr "Té adjunt(s)"
+#: src/prefs_send.c:267
+msgid "Thai (Windows-874)"
+msgstr "Tailandès (Windows-874)"
 
-#: src/summaryview.c:8004
-#, c-format
+#: src/prefs_send.c:271
+msgid "Transfer encoding"
+msgstr "Codificació d'enviament"
+
+#: src/prefs_send.c:282
 msgid ""
-"Regular expression (regexp) error:\n"
-"%s"
+"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
+"characters"
 msgstr ""
-"Error en l'expressió regular (regexp):\n"
-"%s"
+"Especificar la codificació d'enviament (Content-Transfer-Encoding) usada "
+"quan el cos del missatge conté caràcters no-ASCII"
 
-#: src/summaryview.c:8107
-msgid "Go back to the folder list (You have unread messages)"
-msgstr "Torneu a la llista de carpetes (Teniu missatges sense llegir)"
+#: src/prefs_send.c:359 src/send_message.c:499 src/send_message.c:503
+#: src/send_message.c:508
+msgid "Sending"
+msgstr "Enviant"
 
-#: src/summaryview.c:8112
-msgid "Go back to the folder list"
-msgstr "Tornar a la llista de carpetes"
+#: src/prefs_spelling.c:81
+msgid "Pick color for misspelled word"
+msgstr "Escolli color de les paraules incorrectes"
 
-#: src/textview.c:231
-msgid "_Open in web browser"
-msgstr "_Obrir amb el navegador web"
+#: src/prefs_spelling.c:129
+msgid "Enable spell checker"
+msgstr "Habilitar el corrector ortogràfic"
 
-#: src/textview.c:232
-msgid "Copy this _link"
-msgstr "Copiar aquest en_llaç"
+#: src/prefs_spelling.c:134
+msgid "Enable alternate dictionary"
+msgstr "Habilitar diccionari alternatiu"
 
-#: src/textview.c:239
-msgid "_Reply to this address"
-msgstr "Respondre a aquesta ad_reça"
+#: src/prefs_spelling.c:139
+msgid "Faster switching with last used dictionary"
+msgstr "Canvi més ràpid amb l'últim diccionari usat"
 
-#: src/textview.c:240
-msgid "Add to _Address book"
-msgstr "Afegir al llibre d'_Adreces"
+#: src/prefs_spelling.c:141
+msgid "Automatic spell checking"
+msgstr "Verificació ortogràfica automàtica"
 
-#: src/textview.c:241
-msgid "Copy this add_ress"
-msgstr "Copiar aquesta ad_reça"
+#: src/prefs_spelling.c:149
+msgid "Re-check message when changing dictionary"
+msgstr "Re-comprovar el missatge quan canvieu de diccionari"
 
-#: src/textview.c:247
-msgid "_Open image"
-msgstr "_Obrir imatge"
+#: src/prefs_spelling.c:153
+msgid "Dictionary"
+msgstr "Diccionari"
 
-#: src/textview.c:248
-msgid "_Save image..."
-msgstr "De_sar imatge..."
+#: src/prefs_spelling.c:190
+msgid "Check with both dictionaries"
+msgstr "Comprova amb ambdos diccionaris"
 
-#: src/textview.c:722
-#, c-format
-msgid "[%s  %s (%d bytes)]"
-msgstr "[%s  %s (%d bytes)]"
+#: src/prefs_spelling.c:197
+msgid "Get more dictionaries..."
+msgstr "Obtenir més diccionaris"
 
-#: src/textview.c:725
-#, c-format
-msgid "[%s (%d bytes)]"
-msgstr "[%s (%d bytes)]"
+#: src/prefs_spelling.c:207
+msgid "Misspelled word color"
+msgstr "Color de les faltes ortogràfiques"
 
-#: src/textview.c:914
-msgid ""
-"\n"
-"  This message can't be displayed.\n"
-"  This is probably due to a network error.\n"
-"\n"
-"  Use "
+#: src/prefs_spelling.c:220
+msgid "Pick color for misspelled word. Use black to underline"
 msgstr ""
-"\n"
-"  Aquest missatge no pot ser mostrat.\n"
-"  Probablement sigui degut a un error de xarxa.\n"
-"\n"
-"  Useu "
-
-#: src/textview.c:919
-msgid "'Network Log'"
-msgstr "'Traça de la Xarxa'"
+"Escolliu color de les paraules incorrectes. Useu el color negre per "
+"subrattlar"
 
-#: src/textview.c:920
-msgid " in the Tools menu for more information."
-msgstr " al menú Eines per més informació"
+#: src/prefs_spelling.c:337
+msgid "Spell Checking"
+msgstr "Corregint ortogràficament"
 
-#: src/textview.c:983
-msgid "  The following can be performed on this part\n"
-msgstr "  El següent serà fet en aquesta part\n"
+#: src/prefs_summaries.c:152
+msgid "the abbreviated weekday name"
+msgstr "el dia de la setmana abreviat"
 
-#: src/textview.c:985
-msgid "  by right-clicking the icon or list item:"
-msgstr "  clica amb el botó dret la icona o la llista d'elements:"
+#: src/prefs_summaries.c:153
+msgid "the full weekday name"
+msgstr "el dia de la setmana complert"
 
-#: src/textview.c:989
-msgid "     - To save, select "
-msgstr "     - Per desar, seleccioneu "
+#: src/prefs_summaries.c:154
+msgid "the abbreviated month name"
+msgstr "el nom del mes abreviat"
 
-#: src/textview.c:990
-msgid "'Save as...'"
-msgstr "'Desar com...'"
+#: src/prefs_summaries.c:155
+msgid "the full month name"
+msgstr "el nom del mes complert"
 
-#: src/textview.c:992 src/textview.c:1004 src/textview.c:1016
-#: src/textview.c:1026
-msgid " (Shortcut key: '"
-msgstr "(Drecera: '"
+#: src/prefs_summaries.c:156
+msgid "the preferred date and time for the current locale"
+msgstr "la data i hora preferida per a la localizació actual"
 
-#: src/textview.c:1000
-msgid "     - To display as text, select "
-msgstr "     - Per mostrar com a text seleccioneu "
+#: src/prefs_summaries.c:157
+msgid "the century number (year/100)"
+msgstr "el número de segle (any/100)"
 
-#: src/textview.c:1001
-msgid "'Display as text'"
-msgstr "'Mostrar com a text'"
+#: src/prefs_summaries.c:158
+msgid "the day of the month as a decimal number"
+msgstr "el dia del mes com a número decimal"
 
-#: src/textview.c:1012
-msgid "     - To open with an external program, select "
-msgstr "     - Per obrir amb un programa extern seleccioneu "
+#: src/prefs_summaries.c:159
+msgid "the hour as a decimal number using a 24-hour clock"
+msgstr "la hora com a número usant el rellotge de 24 hores"
 
-#: src/textview.c:1013
-msgid "'Open'"
-msgstr "'Obrir'"
+#: src/prefs_summaries.c:160
+msgid "the hour as a decimal number using a 12-hour clock"
+msgstr "la hora com a número usant el rellotge de 12 hores"
 
-#: src/textview.c:1021
-msgid "       (alternately double-click, or click the middle "
-msgstr "       (alternativament doble-click, click amb el botó "
+#: src/prefs_summaries.c:161
+msgid "the day of the year as a decimal number"
+msgstr "el dia de l'any com a número decimal"
 
-#: src/textview.c:1022
-msgid "mouse button)\n"
-msgstr "central del ratolí)\n"
+#: src/prefs_summaries.c:162
+msgid "the month as a decimal number"
+msgstr "el mes com a número decimal"
 
-#: src/textview.c:1024
-msgid "     - Or use "
-msgstr "     - O useu "
+#: src/prefs_summaries.c:163
+msgid "the minute as a decimal number"
+msgstr "el minut com a número decimal"
 
-#: src/textview.c:1025
-msgid "'Open with...'"
-msgstr "'Obrir amb...'"
+#: src/prefs_summaries.c:164
+msgid "either AM or PM"
+msgstr "AM o PM"
 
-#: src/textview.c:1139
-#, c-format
-msgid ""
-"The command to view attachment as text failed:\n"
-"    %s\n"
-"Exit code %d\n"
-msgstr ""
-"La comanda per veure els arxius adjunts com a text ha fallat:\n"
-"    %s\n"
-"Codi de retorn %d\n"
+#: src/prefs_summaries.c:165
+msgid "the second as a decimal number"
+msgstr "el segon com a número decimal"
 
-#: src/textview.c:2188
-msgid "Tags: "
-msgstr "Etiquetes: "
+#: src/prefs_summaries.c:166
+msgid "the day of the week as a decimal number"
+msgstr "el dia de la setmana com a número decimal"
 
-#: src/textview.c:2894
-#, fuzzy
-msgid "The real URL is different from the displayed URL."
-msgstr ""
-"La URL real és diferent de la URL mostrada.\n"
-"\n"
-"<b>URL mostrada:</b> %s\n"
-"\n"
-"<b>URL real:</b> %s\n"
-"\n"
-"Obrir-la de totes maneres?"
+#: src/prefs_summaries.c:167
+msgid "the preferred date for the current locale"
+msgstr "la data preferida per a la localizació actual"
 
-#: src/textview.c:2895
-#, fuzzy
-msgid "Displayed URL:"
-msgstr "Veure"
+#: src/prefs_summaries.c:168
+msgid "the last two digits of a year"
+msgstr "els dos últims dígits de l'any"
 
-#: src/textview.c:2896
-#, fuzzy
-msgid "Real URL:"
-msgstr "URL:"
+#: src/prefs_summaries.c:169
+msgid "the year as a decimal number"
+msgstr "l'any com a número decimal"
 
-#: src/textview.c:2897
-#, fuzzy
-msgid "Open it anyway?"
-msgstr "Enviar-lo de totes maneres?"
+#: src/prefs_summaries.c:170
+msgid "the time zone or name or abbreviation"
+msgstr "zona horària o nom o abreviatura"
 
-#: src/textview.c:2898
-msgid "Phishing attempt warning"
-msgstr "Avís d'intent de phishing"
+#: src/prefs_summaries.c:191 src/prefs_summaries.c:239
+#: src/prefs_summaries.c:519
+msgid "Date format"
+msgstr "Format de data"
 
-#: src/textview.c:2899
-msgid "_Open URL"
-msgstr "_Obrir URL"
+#: src/prefs_summaries.c:215
+msgid "Specifier"
+msgstr "Especificador"
 
-#: src/toolbar.c:192 src/toolbar.c:1930
-msgid "Receive Mail from all Accounts"
-msgstr "Rebre correu de tots els Comptes"
+#: src/prefs_summaries.c:257
+msgid "Example"
+msgstr "Exemple"
 
-#: src/toolbar.c:193 src/toolbar.c:1935
-msgid "Receive Mail from current Account"
-msgstr "Rebre correu del Compte actual"
+#: src/prefs_summaries.c:360
+msgid "Display message number next to folder name"
+msgstr "Veure el número de satges al costat del nom de la carpeta"
 
-#: src/toolbar.c:194 src/toolbar.c:1939
-msgid "Send Queued Messages"
-msgstr "Enviar missatge(s) encuat(s)"
+#: src/prefs_summaries.c:370
+msgid "Unread messages"
+msgstr "Missatge sense llegir"
 
-#: src/toolbar.c:195 src/toolbar.c:905 src/toolbar.c:1957 src/toolbar.c:1968
-msgid "Compose Email"
-msgstr "Composar correu"
+#: src/prefs_summaries.c:371
+msgid "Unread and Total messages"
+msgstr "Missatge totals i sense llegir"
 
-#: src/toolbar.c:196
-msgid "Compose News"
-msgstr "Composar notícia"
+#: src/prefs_summaries.c:381
+msgid "Open last opened folder at start-up"
+msgstr "Obrir la última carpeta oberta a l'inici"
 
-#: src/toolbar.c:197 src/toolbar.c:1996 src/toolbar.c:2006
-msgid "Reply to Message"
-msgstr "Respondre al missatge"
+#: src/prefs_summaries.c:384
+msgid "Abbreviate newsgroup names longer than"
+msgstr "Abreviar noms de grup amb més de"
 
-#: src/toolbar.c:198 src/toolbar.c:2013 src/toolbar.c:2023
-msgid "Reply to Sender"
-msgstr "Respondre al remitent"
+#: src/prefs_summaries.c:398
+msgid "letters"
+msgstr "lletres"
 
-#: src/toolbar.c:199 src/toolbar.c:2030 src/toolbar.c:2040
-msgid "Reply to All"
-msgstr "Respondre a tots"
+#: src/prefs_summaries.c:416
+msgid "Message list"
+msgstr "Llista de missatges"
 
-#: src/toolbar.c:200 src/toolbar.c:2047 src/toolbar.c:2057
-msgid "Reply to Mailing-list"
-msgstr "Respondre a la lista de correu"
+#: src/prefs_summaries.c:422
+msgid "Set default selection when entering a folder"
+msgstr "Definir selecció per defecte quan entri a la carpeta"
 
-#: src/toolbar.c:201 src/toolbar.c:1951
-msgid "Open email"
-msgstr "Obrir correu"
+#: src/prefs_summaries.c:435
+msgid "Show \"no unread (or new) message\" dialog"
+msgstr "Mostrar opció \"missatges no llegit (o nou)\""
 
-#: src/toolbar.c:202 src/toolbar.c:2064 src/toolbar.c:2075
-msgid "Forward Message"
-msgstr "Reenviar missatge"
+#: src/prefs_summaries.c:445
+msgid "Assume 'Yes'"
+msgstr "Assumir 'Si'"
 
-#: src/toolbar.c:203 src/toolbar.c:2080
-msgid "Trash Message"
-msgstr "Missatge a la Paperera"
+#: src/prefs_summaries.c:446
+msgid "Assume 'No'"
+msgstr "Assumir 'No'"
 
-#: src/toolbar.c:204 src/toolbar.c:2084
-msgid "Delete Message"
-msgstr "Esborrar missatge"
+#: src/prefs_summaries.c:454
+msgid "Open message when selected"
+msgstr "Obrir sempre els missatges quan es seleccionin"
 
-#: src/toolbar.c:206 src/toolbar.c:2092
-msgid "Go to Previous Unread Message"
-msgstr "Anar a l'anterior Sense Llegir"
+#: src/prefs_summaries.c:464
+msgid "When message view is visible"
+msgstr "Quan la vista de missatges sigui visible"
 
-#: src/toolbar.c:207 src/toolbar.c:2096
-msgid "Go to Next Unread Message"
-msgstr "Anar al Missatge Següent"
+#: src/prefs_summaries.c:470
+msgid "Thread using subject in addition to standard headers"
+msgstr "Jerarquitzar usant l'assumpte a més a més de les capçaleres estàndar"
 
-#: src/toolbar.c:210 src/toolbar.c:421
-msgid "Print"
-msgstr "Imprimir"
+#: src/prefs_summaries.c:474
+msgid "Execute immediately when moving or deleting messages"
+msgstr "Executar immediatament moviments o esborrats de missatges"
 
-#: src/toolbar.c:211
-msgid "Learn Spam or Ham"
-msgstr "Aprendre correu brossa o bò"
+#: src/prefs_summaries.c:476
+msgid ""
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
+msgstr ""
+"Posposa el moviment, copiat i esborrat de missatges fins que escolliu 'Eines/"
+"Executar'"
 
-#: src/toolbar.c:212
-msgid "Open folder/Go to folder list"
-msgstr "Obrir carpeta/Anar a la llista de carpetes"
+#: src/prefs_summaries.c:479
+msgid "Mark message as read"
+msgstr "Marcar el misstage com a llegit"
 
-#: src/toolbar.c:215 src/toolbar.c:2102
-msgid "Send Message"
-msgstr "Enviar missatge"
+#: src/prefs_summaries.c:482
+msgid "when selected, after"
+msgstr "al seleccionar-lo, després de"
 
-#: src/toolbar.c:216 src/toolbar.c:2106
-msgid "Put into queue folder and send later"
-msgstr "Posar a la cua i enviar després"
+#: src/prefs_summaries.c:502
+msgid "only when opened in a new window, or replied to"
+msgstr ""
+"només al obrir-lo en una finestra nova, o al respondre'len una finestra "
+"nova, o contestat a"
 
-#: src/toolbar.c:217 src/toolbar.c:2110
-msgid "Save to draft folder"
-msgstr "Desar a la carpeta d'esborranys"
+#: src/prefs_summaries.c:509
+msgid "Display sender using address book"
+msgstr "Mostrar remitent usant l'agenda"
 
-#: src/toolbar.c:218 src/toolbar.c:2114
-msgid "Insert file"
-msgstr "Insertar arxiu"
+#: src/prefs_summaries.c:513
+msgid "Show tooltips"
+msgstr "Mostrar ajudes d'eines"
 
-#: src/toolbar.c:219 src/toolbar.c:2118
-msgid "Attach file"
-msgstr "Adjuntar arxiu"
+#: src/prefs_summaries.c:539
+msgid "Date format help"
+msgstr "Ajuda del format de data"
 
-#: src/toolbar.c:220 src/toolbar.c:2122
-msgid "Insert signature"
-msgstr "Insertar signatura"
+#: src/prefs_summaries.c:557
+msgid "Confirm before marking all messages in a folder as read"
+msgstr ""
+"Confirmeu abans de marcar tots els missatges de la carpeta com a llegits"
 
-#: src/toolbar.c:221 src/toolbar.c:2126
-msgid "Replace signature"
-msgstr "Reemplaça la signatura"
+#: src/prefs_summaries.c:560
+msgid "Translate header names"
+msgstr "Traduïu Capçaleres"
 
-#: src/toolbar.c:222 src/toolbar.c:2130
-msgid "Edit with external editor"
-msgstr "Editar amb un editor extern"
+#: src/prefs_summaries.c:562
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"Les capçaleres standart mostrades (com 'From:', 'Subject:') seran traduïdes "
+"al vostre idioma."
 
-#: src/toolbar.c:223 src/toolbar.c:2134
-msgid "Wrap long lines of current paragraph"
-msgstr "Tallar línies llargues del paràgraf actual"
+#: src/prefs_summaries.c:679
+msgid "Summaries"
+msgstr "Sumaris"
 
-#: src/toolbar.c:224 src/toolbar.c:2138
-msgid "Wrap all long lines"
-msgstr "Tallar totes les línies llargues"
+#: src/prefs_summary_column.c:86
+msgid "Number"
+msgstr "Nmero"
 
-#: src/toolbar.c:227 src/toolbar.c:440 src/toolbar.c:2147
-msgid "Check spelling"
-msgstr "Verificar ortografia"
+#: src/prefs_summary_column.c:226
+msgid "Message list columns configuration"
+msgstr "Configuració de la llista de columnes del missatge"
 
-#: src/toolbar.c:229
-msgid "Claws Mail Actions Feature"
-msgstr "Característica Accions de Claws Mail"
+#: src/prefs_summary_column.c:243
+msgid ""
+"Select columns to be displayed in the message list. You can modify\n"
+"the order by using the Up / Down buttons or by dragging the items."
+msgstr ""
+"Seleccioneu les columnes a mostrar a la llista de missatges. Podeu "
+"modificar\n"
+"l'ordre usant els botons Amunt / Avall, o arrossegant els elements."
 
-#: src/toolbar.c:230 src/toolbar.c:2163
-msgid "Cancel receiving"
-msgstr "Cancel·lar la recepció"
+#: src/prefs_summary_open.c:109
+msgid "first marked email"
+msgstr "primer missatge marcat"
 
-#: src/toolbar.c:232 src/toolbar.c:2171
-msgid "Cancel receiving/sending"
-msgstr "Cancel·lar l'enviament/recepció"
+#: src/prefs_summary_open.c:110
+msgid "first new email"
+msgstr "primer missatge nou"
 
-#: src/toolbar.c:233 src/toolbar.c:1943
-msgid "Close window"
-msgstr "Tancar finestra"
+#: src/prefs_summary_open.c:111
+msgid "first unread email"
+msgstr "primer missatge no llegit"
 
-#: src/toolbar.c:235
-msgid "Claws Mail Plugins"
-msgstr "Connectors de Claws Mail"
+#: src/prefs_summary_open.c:112
+msgid "last opened email"
+msgstr "últim missatge llegit"
 
-#: src/toolbar.c:379 src/toolbar.c:414
-msgctxt "Toolbar"
-msgid "Trash"
-msgstr "Paperera [Barra d'eines]"
+#: src/prefs_summary_open.c:113
+msgid "last email in the list"
+msgstr "últim missatge de la llista"
+
+#: src/prefs_summary_open.c:115
+msgid "first email in the list"
+msgstr "primer missatge de la llista"
 
-#: src/toolbar.c:402
-msgid "Folders"
-msgstr "Carpetes"
+#: src/prefs_summary_open.c:184
+msgid " Selection when entering a folder"
+msgstr "Selecció per quan entri a la carpeta"
 
-#: src/toolbar.c:404
-msgid "Get Mail"
-msgstr "Rebre"
+#: src/prefs_summary_open.c:230
+msgid "Possible selections"
+msgstr "Seleccions possibles"
 
-#: src/toolbar.c:405
-msgid "Get"
-msgstr "Rebre"
+#: src/prefs_summary_open.c:266
+msgid "Selection on folder opening"
+msgstr "Selecció a l'obir la carpeta"
 
-#: src/toolbar.c:407 src/toolbar.c:408
-msgctxt "Toolbar"
-msgid "Compose"
-msgstr "Composar"
+#: src/prefs_template.c:80
+msgid "This name is used as the Menu item"
+msgstr "Aquest nom és usat com a element de Menú"
 
-#: src/toolbar.c:410
-msgid "All"
-msgstr "Tothom"
+#: src/prefs_template.c:82
+msgid ""
+"Override composing account's From header. This doesn't change the composing "
+"account."
+msgstr ""
+"Sobreescriure la capçalera Des de del compte de composició. Això no canvia "
+"el compte de composició."
 
-#: src/toolbar.c:411
-msgctxt "Toolbar"
-msgid "Sender"
-msgstr "Remitent [Barra d'eines]"
+#: src/prefs_template.c:309
+msgid "Append the new template above to the list"
+msgstr "Afegir la nova plantilla a sobre de la llista"
 
-#: src/toolbar.c:412
-msgid "List"
-msgstr "Llista"
+#: src/prefs_template.c:318
+msgid "Replace the selected template in list with the template above"
+msgstr ""
+"Susbtituïr la plantilla seleccionada a la llista per la plantilla de sobre"
 
-#: src/toolbar.c:417
-msgid "Prev"
-msgstr "Previ"
+#: src/prefs_template.c:328
+msgid "Delete the selected template from the list"
+msgstr "Esborrar la plantilla seleccionada de la llista"
 
-#: src/toolbar.c:418
-msgid "Next"
-msgstr "Següent"
+#: src/prefs_template.c:346
+msgid "Show information on configuring templates"
+msgstr "Mostrar informació al configurar plantilles"
 
-#: src/toolbar.c:426
-msgid "Draft"
-msgstr "Esborrany"
+#: src/prefs_template.c:370
+msgid "Move the selected template to the top"
+msgstr "Moure la plantilla seleccionada a l'inici"
 
-#: src/toolbar.c:429
-msgid "Insert sig."
-msgstr "Insertar sig."
+#: src/prefs_template.c:380
+msgid "Move the selected template up"
+msgstr "Moure la plantilla seleccionada amunt"
 
-#: src/toolbar.c:430
-msgid "Replace sig."
-msgstr "Reemplaçar  sig."
+#: src/prefs_template.c:388
+msgid "Move the selected template down"
+msgstr "Moure la plantilla seleccionada avall"
 
-#: src/toolbar.c:431
-msgid "Edit"
-msgstr "Editar"
+#: src/prefs_template.c:398
+msgid "Move the selected template to the bottom"
+msgstr "Moure la plantilla seleccionada al final"
 
-#: src/toolbar.c:432
-msgid "Wrap para."
-msgstr "Retallar paràgraf."
+#: src/prefs_template.c:414
+msgid "Template configuration"
+msgstr "Configuració de plantilla"
 
-#: src/toolbar.c:433
-msgid "Wrap all"
-msgstr "Retallar tot"
+#: src/prefs_template.c:602
+msgid "Templates list not saved"
+msgstr "Llista de plantilles sense desar"
 
-#: src/toolbar.c:435 src/toolbar.c:436
-msgid "Stop"
-msgstr "Parar"
+#: src/prefs_template.c:603
+msgid "The templates list has been modified. Close anyway?"
+msgstr "La llista de plantilles ha estat modificada. Tancar de totes maneres?"
 
-#: src/toolbar.c:437
-msgid "Stop all"
-msgstr "Aturar-ho tot"
+#: src/prefs_template.c:768
+msgid "The template's name is not set."
+msgstr "No s'ha establert el nom de la plantilla."
 
-#: src/toolbar.c:897
-msgid "Compose News message"
-msgstr "Composar missatge de Notícies"
+#: src/prefs_template.c:811
+msgid "The \"From\" field of the template contains an invalid email address."
+msgstr "El camp \"Des de\" de la plantilla conté una adreça de correu errònia."
 
-#: src/toolbar.c:936
-msgid "Learn spam"
-msgstr "Aprendre correu brossa"
+#: src/prefs_template.c:817
+msgid "The \"To\" field of the template contains an invalid email address."
+msgstr "El camp \"A\" de la plantilla conté una adreça de correu errònia."
 
-#: src/toolbar.c:945
-msgid "Ham"
-msgstr "Bò"
+#: src/prefs_template.c:823
+msgid "The \"Cc\" field of the template contains an invalid email address."
+msgstr "El camp \"Cc\" de la plantilla conté una adreça de correu errònia."
 
-#: src/toolbar.c:947
-msgid "Learn ham"
-msgstr "Aprendre correu bò"
+#: src/prefs_template.c:829
+msgid "The \"Bcc\" field of the template contains an invalid email address."
+msgstr "El camp \"Bcc\" de la plantilla conté una adreça de correu errònia."
 
-#: src/toolbar.c:1925
-msgid "Go to folder list"
-msgstr "Anar a la llista de carpetes"
+#: src/prefs_template.c:835
+msgid ""
+"The \"Reply-To\" field of the template contains an invalid email address."
+msgstr ""
+"El camp \"Respondre a\" de la plantilla conté una adreça de correu errònia."
 
-#: src/toolbar.c:1931
-msgid "Receive Mail from selected Account"
-msgstr "Rebre Correu de les Comptes seleccionades"
+#: src/prefs_template.c:841
+msgid "The \"Subject\" field of the template is invalid."
+msgstr "El camp \"Assumpte\" de la plantilla no és vàlid."
 
-#: src/toolbar.c:1947
-msgid "Open preferences"
-msgstr "Obrir preferències"
+#: src/prefs_template.c:912
+msgid "Delete template"
+msgstr "Esborrar plantilla"
 
-#: src/toolbar.c:1958
-msgid "Compose with selected Account"
-msgstr "Composar amb el compte seleccionat"
+#: src/prefs_template.c:913
+msgid "Do you really want to delete this template?"
+msgstr "Realment vols esborrar aquesta plantilla?"
 
-#: src/toolbar.c:1979
-msgid "Learn as..."
-msgstr "Aprendre com a..."
+#: src/prefs_template.c:925
+msgid "Delete all templates"
+msgstr "Esborrar totes les plantilles"
 
-#: src/toolbar.c:1989
-msgid "Learn as _Spam"
-msgstr "Aprendre com a correu bro_ssa"
+#: src/prefs_template.c:926
+msgid "Do you really want to delete all the templates?"
+msgstr "Realment vols esborrar totes les plantilles?"
 
-#: src/toolbar.c:1990
-msgid "Learn as _Ham"
-msgstr "Aprendre com a correu _Bò"
+#: src/prefs_template.c:1241
+msgid "Current templates"
+msgstr "Plantilles actuals"
 
-#: src/toolbar.c:1997
-msgid "Reply to Message options"
-msgstr "Opcions de Respondre al Missatge"
+#: src/prefs_template.c:1269
+msgid "Template"
+msgstr "Plantilla"
 
-#: src/toolbar.c:2001 src/toolbar.c:2018 src/toolbar.c:2035 src/toolbar.c:2052
-msgid "_Reply with quote"
-msgstr "Respondre amb _citació"
+#: src/prefs_themes.c:344 src/prefs_themes.c:705
+msgid "Default internal theme"
+msgstr "Tema intern per omissió"
 
-#: src/toolbar.c:2002 src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053
-msgid "Reply without _quote"
-msgstr "_Respondre sense citació"
+#: src/prefs_themes.c:366
+msgid "Themes"
+msgstr "Temes"
 
-#: src/toolbar.c:2014
-msgid "Reply to Sender options"
-msgstr "Opcions de Respondre a Remitent"
+#: src/prefs_themes.c:436
+msgid "Only root can remove system themes"
+msgstr "Només l'usuari root pot eliminar temes globals"
 
-#: src/toolbar.c:2031
-msgid "Reply to All options"
-msgstr "Opcions de Respondre a Tots"
+#: src/prefs_themes.c:439
+#, c-format
+msgid "Remove system theme '%s'"
+msgstr "Esborrar tema global '%s'"
 
-#: src/toolbar.c:2048
-msgid "Reply to Mailing-list options"
-msgstr "Opcions de Respondre a de Llista de correu"
+#: src/prefs_themes.c:442
+#, c-format
+msgid "Remove theme '%s'"
+msgstr "Esborrar tema '%s'"
 
-#: src/toolbar.c:2065
-msgid "Forward Message options"
-msgstr "Opcions de Re-enviar Missatge"
+#: src/prefs_themes.c:448
+msgid "Are you sure you want to remove this theme?"
+msgstr "Estàs segur de que Vols esborrar aquest tema?"
 
-#: src/uri_opener.c:88
-msgid "There are no URLs in this email."
-msgstr "No hi ha URLs dins d'aquest correu."
+#: src/prefs_themes.c:458
+#, c-format
+msgid ""
+"File %s failed\n"
+"while removing theme."
+msgstr ""
+"Error en l'arxiu %s\n"
+"al esborrar el tema."
 
-#: src/uri_opener.c:116
-msgid "Available URLs:"
-msgstr "URLs disponibles:"
+#: src/prefs_themes.c:462
+msgid "Removing theme directory failed."
+msgstr "Ha fallat al esborrar el directori del tema."
 
-#: src/uri_opener.c:181
-msgctxt "Dialog title"
-msgid "Open URLs"
-msgstr "Open URLs"
+#: src/prefs_themes.c:465
+msgid "Theme removed successfully"
+msgstr "Tema eliminat amb èxit"
 
-#: src/uri_opener.c:206
-msgid "Please select the URL to open."
-msgstr "Si us plau, seleccioneu la URL a obrir."
+#: src/prefs_themes.c:485
+msgid "Select theme folder"
+msgstr "Seleccionar carpeta del tema"
+
+#: src/prefs_themes.c:500
+#, c-format
+msgid "Install theme '%s'"
+msgstr "Installar tema '%s'"
 
-#: src/uri_opener.c:214
-msgid "Select All"
-msgstr "Seleccionar tot"
+#: src/prefs_themes.c:503
+msgid ""
+"This folder doesn't seem to be a theme folder.\n"
+"Install anyway?"
+msgstr ""
+"Aquesta carpeta no sembla una carpeta d'un tema.\n"
+"Installar de totes maneres?"
 
-#: src/wizard.c:521
-msgctxt "Welcome Mail Subject"
-msgid "Welcome to Claws Mail"
-msgstr "Benvingut a Claws Mail"
+#: src/prefs_themes.c:510
+msgid "Do you want to install theme for all users?"
+msgstr "Vols installar el tema per tots els usuaris?"
 
-#: src/wizard.c:544
-#, c-format
+#: src/prefs_themes.c:530
+msgid "Theme exists"
+msgstr "El tema ja existeix"
+
+#: src/prefs_themes.c:531
 msgid ""
+"A theme with the same name is\n"
+"already installed in this location.\n"
 "\n"
-"Welcome to Claws Mail\n"
-"---------------------\n"
-"\n"
-"Now that you have set up your account you can fetch your\n"
-"mail by clicking the 'Get Mail' button at the left of the\n"
-"toolbar.\n"
-"\n"
-"Claws Mail has lots of extra features accessible via plugins,\n"
-"like anti-spam filtering and learning (via the Bogofilter or\n"
-"SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
-"aggregator, a calendar, and much more. You can load them from\n"
-"the menu entry '/Configuration/Plugins'.\n"
-"\n"
-"You can change your Account Preferences by using the menu\n"
-"entry '/Configuration/Preferences for current account'\n"
-"and change the general Preferences by using\n"
-"'/Configuration/Preferences'.\n"
-"\n"
-"You can find further information in the Claws Mail manual,\n"
-"which can be accessed by using the menu entry '/Help/Manual'\n"
-"or online at the URL given below.\n"
-"\n"
-"Useful URLs\n"
-"-----------\n"
-"Homepage:      <%s>\n"
-"Manual:        <%s>\n"
-"FAQ:\t       <%s>\n"
-"Themes:        <%s>\n"
-"Mailing Lists: <%s>\n"
-"\n"
-"LICENSE\n"
-"-------\n"
-"Claws Mail is free software, released under the terms\n"
-"of the GNU General Public License, version 3 or later, as\n"
-"published by the Free Software Foundation, 51 Franklin Street,\n"
-"Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
-"found at <%s>.\n"
-"\n"
-"DONATIONS\n"
-"---------\n"
-"If you wish to donate to the Claws Mail project you can do\n"
-"so at <%s>.\n"
-"\n"
+"Do you want to replace it?"
 msgstr ""
+"Ja hi ha un tema amb el mateix nom\n"
+"instal·lat en aquesta ubicació.\n"
 "\n"
-"Benvinguts a Claws Mail\n"
-"-----------------------\n"
-"\n"
-"Ara que ja s'ha configurat el seu compte de correu i pot baixar el seu\n"
-"correu clicant el botó 'Rebre' situat a l'esquerra de la barra \n"
-"d'eines.\n"
-"\n"
-"Claws Mail té moltes funcionalitats addicionals com a mòduls,\n"
-"com filtres i sistemes d'aprenentatge ant-spam (mòduls Bogofilter o\n"
-"SpamAssassin), protecció de privacitat (PGP/Mime), un agregador de\n"
-"RSS, una calendari i moltes coses més. Els podeu carregar mitjançant\n"
-"l'entrada de menú '/Configuració/Connectors.\n"
-"'\n"
-"Podeu canviar les Preferències del vostre compte usant l'entrada de menú\n"
-"'/Configuració/Preferències' dell compte actual i canviar les '\n"
-"preferencies generals usant\n"
-"'/Configuració/Preferències'.\n"
-"\n"
-"Podeu obtenir més informació en el manual de Claws Mail,\n"
-"el qual és accessible mitjançant l'entrada de menú '/Ajuda/Manual'\n"
-"o de manera on-line a l'adreça donada aquí sota.\n"
-"\n"
-"URLs útils\n"
-"----------\n"
-"Pàgina oficial:      <%s>\n"
-"Manual:        <%s>\n"
-"PUF:\t       <%s>\n"
-"Temes:        <%s>\n"
-"Llistes de Correu: <%s>\n"
-"\n"
-"LLICÈNCIA\n"
-"-------\n"
-"Claws Mail is software lliure, alliberat sota les condicions\n"
-"de la Llicència Pblica General de GNU, versió 2 o posterior, \n"
-"publicada per la Fundació de Software Lliure (Free Software Foundation), 51 "
-"Franklin Street,\n"
-"Fifth Floor, Boston, MA 02110-1301, USA. La llicència pot ser\n"
-"trobada a <%s>.\n"
-"\n"
-"DONACIONS\n"
-"---------\n"
-"Si vol fer donacions al projecte Claws Mail ho pot fer\n"
-"a <%s>.\n"
-"\n"
+"Vols sobreescriure'l?"
 
-#: src/wizard.c:620
-msgid "Please enter the mailbox name."
-msgstr "Ompliu el nom de la bústia."
+#: src/prefs_themes.c:537
+#, c-format
+msgid "Couldn't delete the old theme in %s."
+msgstr "No s'ha pogut esborrar el tema antic a %s."
 
-#: src/wizard.c:648
-msgid "Please enter your name and email address."
-msgstr "Seleccioneu el vostre nom i adreça de correu"
+#: src/prefs_themes.c:545
+#, c-format
+msgid "Couldn't create destination directory %s."
+msgstr "No s'ha pogut crear el directori de destinació %s."
 
-#: src/wizard.c:659
-msgid "Please enter your receiving server and username."
+#: src/prefs_themes.c:558
+msgid "Theme installed successfully."
+msgstr "Tema instal·lat amb èxit."
+
+#: src/prefs_themes.c:565
+msgid "Failed installing theme"
+msgstr "Error al installar el tema"
+
+#: src/prefs_themes.c:568
+#, c-format
+msgid ""
+"File %s failed\n"
+"while installing theme."
 msgstr ""
-"Si us plau, introdugueu el vostre servidor de recepció i el vostre nom "
-"d'usuari."
+"Error a l'arxiu %s\n"
+"al installar el tema."
 
-#: src/wizard.c:669
-msgid "Please enter your username."
-msgstr "Si us plau introdugueu el vostre nom d'usuari."
+#: src/prefs_themes.c:667
+#, c-format
+msgid "%d themes available (%d user, %d system, 1 internal)"
+msgstr "Disponibles %d temes (%d d'usuari, %d globals, 1 intern)"
 
-#: src/wizard.c:679
-msgid "Please enter your SMTP server."
-msgstr "Ompliu el vostre servidor SMTP"
+#: src/prefs_themes.c:708
+#, c-format
+msgid "Internal theme has %d icons"
+msgstr "El tema intern té %d icones"
 
-#: src/wizard.c:690
-msgid "Please enter your SMTP username."
-msgstr "Si us plau introdugueu el vostre nom d'usuari de SMTP."
+#: src/prefs_themes.c:714
+msgid "No info file available for this theme"
+msgstr "No hi ha arxiu d'informació per a aquest tema"
 
-#: src/wizard.c:969
-#, fuzzy
-msgid "Your name:"
-msgstr "Nom de búsqueda:"
+#: src/prefs_themes.c:732
+msgid "Error: couldn't get theme status"
+msgstr "Error: no es pot obtenir l'estat del tema"
 
-#: src/wizard.c:980
-#, fuzzy
-msgid "Your email address:"
-msgstr "Adreça de correu"
+#: src/prefs_themes.c:756
+#, c-format
+msgid "%d files (%d icons), size: %s"
+msgstr "%d arxius (%d icones), tamany: %s"
 
-#: src/wizard.c:991
-msgid "Your organization:"
-msgstr "Organització: "
+#: src/prefs_themes.c:804
+msgid "Selector"
+msgstr "Selector"
 
-#: src/wizard.c:1025
-#, fuzzy
-msgid "Mailbox name:"
-msgstr "Bústies de Correu"
+#: src/prefs_themes.c:815
+msgid "Install new..."
+msgstr "Installar nou..."
 
-#: src/wizard.c:1033
-msgid ""
-"You can also specify an absolute path, for example: \"/home/john/Documents/"
-"Mail\""
-msgstr ""
-"Podeu especificar una ruta absoluta, per exemple: \"/home/joan/Documents/"
-"Correu\""
+#: src/prefs_themes.c:820
+msgid "Get more..."
+msgstr "Més temes..."
 
-#: src/wizard.c:1104
-msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:25\""
-msgstr ""
-"Podeu especificar el port afegint-lo al final: \"correu.exemple.com:25\""
+#: src/prefs_themes.c:831
+msgid "Information"
+msgstr "Informació"
 
-#: src/wizard.c:1107
-#, fuzzy
-msgid "SMTP server address:"
-msgstr "Servidor SMTP (enviar)"
+#: src/prefs_themes.c:845
+msgid "Author: "
+msgstr "Autor: "
 
-#: src/wizard.c:1113
-msgid "Use authentication"
-msgstr "Useu autentificació"
+#: src/prefs_themes.c:853
+msgid "URL:"
+msgstr "URL:"
 
-#: src/wizard.c:1122
-#, fuzzy
-msgid "(empty to use the same as receive)"
+#: src/prefs_themes.c:895
+msgid "Preview"
+msgstr "Pre-visualització"
+
+#: src/prefs_toolbar.c:176
+msgid ""
+"Selected Action already set.\n"
+"Please choose another Action from List"
 msgstr ""
-"<span size=\"small\">(buit per usar el mateix que a la recepció)</span>"
+"L'acció seleccionada ja ho està\n"
+"Per favor, escolliu una altra acció de la lista"
 
-#: src/wizard.c:1136
-msgid "SMTP username:"
-msgstr "Usuari SMTP:"
+#: src/prefs_toolbar.c:177
+msgid "Item has no icon defined."
+msgstr "L'element no té una icona definida."
 
-#: src/wizard.c:1147
-msgid "SMTP password:"
-msgstr "Contrasenya SMTP:"
+#: src/prefs_toolbar.c:178
+msgid "Item has no text defined."
+msgstr "L'element no té un text definit."
 
-#: src/wizard.c:1160
-msgid "Use SSL to connect to SMTP server"
-msgstr "Useu SSL per connectar-vos al servidor SMTP"
+#: src/prefs_toolbar.c:916
+msgid "Toolbar item"
+msgstr "Element de la barra d'eines"
 
-#: src/wizard.c:1171 src/wizard.c:1591
-msgid "Use SSL via STARTTLS"
-msgstr "Useu SSL via STARTTLS"
+#: src/prefs_toolbar.c:932
+msgid "Item type"
+msgstr "Tipus de l'element"
+
+#: src/prefs_toolbar.c:942
+msgid "Internal Function"
+msgstr "Funció interna"
 
-#: src/wizard.c:1183 src/wizard.c:1603
-msgid "Client SSL certificate (optional)"
-msgstr "Certificat SSL per a client (opcional)"
+#: src/prefs_toolbar.c:943
+msgid "User Action"
+msgstr "Acció interna"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
-#, fuzzy
-msgid "Server address:"
-msgstr "Nom del servidor :"
+#: src/prefs_toolbar.c:945 src/toolbar.c:234
+msgid "Separator"
+msgstr "Separador"
 
-#: src/wizard.c:1315
-#, fuzzy
-msgid "Local mailbox:"
-msgstr "Bústia local"
+#: src/prefs_toolbar.c:952
+msgid "Event executed on click"
+msgstr "Event executat al pulsar"
 
-#: src/wizard.c:1484
-#, fuzzy
-msgid "Server type:"
-msgstr "Nom del servidor :"
+#: src/prefs_toolbar.c:991
+msgid "Toolbar text"
+msgstr "Text d'eines"
 
-#: src/wizard.c:1494
-msgid "IMAP"
-msgstr "IMAP"
+#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1382
+msgid "Icon"
+msgstr "Icona"
 
-#: src/wizard.c:1549
-msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:110\""
-msgstr ""
-"Podeu especificar el port afegint-lo al final: \"correu.exemple.com:110\""
+#: src/prefs_toolbar.c:1042
+msgid "A_dd"
+msgstr "A_fegir"
 
-#: src/wizard.c:1580
-msgid "Use SSL to connect to receiving server"
-msgstr "Useu SSL per connectar-vos al servidor de rebuda"
+#: src/prefs_toolbar.c:1262 src/prefs_toolbar.c:1276 src/prefs_toolbar.c:1290
+msgid "Toolbars"
+msgstr "Barra d'eines"
 
-#: src/wizard.c:1645
-msgid "IMAP server directory:"
-msgstr "Directori del servidor IMAP:"
+#: src/prefs_toolbar.c:1263
+msgid "Main Window"
+msgstr "Finestra principal"
 
-#: src/wizard.c:1656
-msgid "Show only subscribed folders"
-msgstr "Mostrar només les carpetes subscrites"
+#: src/prefs_toolbar.c:1277
+msgid "Message Window"
+msgstr "Finestra de missatge"
 
-#: src/wizard.c:1664
-#, fuzzy
-msgid ""
-"Warning: this version of Claws Mail\n"
-"has been built without IMAP support."
-msgstr ""
-"<span weight=\"bold\">Avís: aquesta versió de Claws Mail\n"
-"ha estat compilat sense suport IMAP.</span>"
+#: src/prefs_toolbar.c:1291
+msgid "Compose Window"
+msgstr "Finestra de composició"
 
-#: src/wizard.c:1782
-msgid "Claws Mail Setup Wizard"
-msgstr "Assistent de configuració de Claws Mail"
+#: src/prefs_toolbar.c:1405
+msgid "Icon text"
+msgstr "Text de la icona"
 
-#: src/wizard.c:1816
-msgid "Welcome to Claws Mail"
-msgstr "Benvinguts a Claws Mail"
+#: src/prefs_toolbar.c:1414
+msgid "Mapped event"
+msgstr "Event mapejat"
 
-#: src/wizard.c:1824
-msgid ""
-"Welcome to the Claws Mail setup wizard.\n"
-"\n"
-"We will begin by defining some basic information about you and your most "
-"common mail options so that you can start to use Claws Mail in less than "
-"five minutes."
-msgstr ""
-"Benvingut a l'assistent de configuració de Claws Mail.\n"
-"\n"
-"Anem a definir alguna informació bàsica sobre vostè i els paràmetres més "
-"comuns del seu correu  perque vostè pugui usar Claws Mail en menys de cinc "
-"minuts."
+#: src/prefs_toolbar.c:1711
+msgid "Toolbar item icon"
+msgstr "Icona de l'element de la barra d'eines"
 
-#: src/wizard.c:1837
-msgid "About You"
-msgstr "Sobre Tu"
+#: src/prefs_wrapping.c:80
+msgid "Auto wrapping"
+msgstr "Auto-retallar"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
-msgid "Bold fields must be completed"
-msgstr "Camps en negreta s'han d'omplir"
+#: src/prefs_wrapping.c:81
+msgid "Wrap quotation"
+msgstr "Retallar citació"
 
-#: src/wizard.c:1852
-msgid "Receiving mail"
-msgstr "Rebent correu"
+#: src/prefs_wrapping.c:82
+msgid "Wrap pasted text"
+msgstr "Text envolcallat enganxat"
 
-#: src/wizard.c:1867
-msgid "Sending mail"
-msgstr "Enviant correu"
+#: src/prefs_wrapping.c:83
+msgid "Auto indent"
+msgstr "Auto-sagnat"
 
-#: src/wizard.c:1883
-msgid "Saving mail on disk"
-msgstr "Gravant el correu al disc"
+#: src/prefs_wrapping.c:89
+msgid "Wrap text at"
+msgstr "Text envolcallat a"
 
-#: src/wizard.c:1899
-msgid "Configuration finished"
-msgstr "Configuració finalitzada"
+#: src/prefs_wrapping.c:154
+msgid "Wrapping"
+msgstr "Envolcallant"
 
-#: src/wizard.c:1907
-msgid ""
-"Claws Mail is now ready.\n"
-"Click Save to start."
-msgstr ""
-"Claws Mail ja està preparat.\n"
-"Fes clic en Desar per començar."
+#: src/printing.c:436
+msgid "Print preview"
+msgstr "Pre-visualització d'impressió"
 
-#~ msgid "Failed to register avatars internal rendering hook"
-#~ msgstr "Ha fallat el registre intern de renderització de l'avatar"
+#: src/printing.c:479
+msgid "First page"
+msgstr "Primera pàgina"
 
-#~ msgid "%s: host lookup timed out.\n"
-#~ msgstr "%s: la cerca de l'amfitrió a superat el temps d'espera\n"
+#: src/printing.c:490
+msgid "Last page"
+msgstr "Última pàgina"
 
-#~ msgid "%s: unknown host.\n"
-#~ msgstr "%s amfitrió desconegut.\n"
+#: src/printing.c:496
+msgid "Zoom 100%"
+msgstr "Ampliació del 100%"
 
-#~ msgid "+_Insert"
-#~ msgstr "+_Insertar"
+#: src/printing.c:498
+msgid "Zoom fit"
+msgstr "Augment ajustat"
 
-#~ msgid "+_Send"
-#~ msgstr "+_Enviar"
+#: src/printing.c:500
+msgid "Zoom in"
+msgstr "Augmentar"
 
-#~ msgid "<i>%s</i>"
-#~ msgstr "<i>%s</i>"
+#: src/printing.c:502
+msgid "Zoom out"
+msgstr "Disminuïr"
 
-#~ msgid "+_Save to Drafts"
-#~ msgstr "+De_sar en Esborranys"
+#: src/printing.c:701
+#, c-format
+msgid "Page %d"
+msgstr "Pàgina %d"
 
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">. \n"
-#~ "\n"
+#: src/privacy.c:255 src/privacy.c:276
+msgid "No information available"
+msgstr "No hi ha informació disponible"
 
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Reemplaçar \"%s\" amb: </span>"
+#: src/privacy.c:490
+msgid "No recipient keys defined."
+msgstr "No s'ha definit cap clau."
 
-#~ msgid "Failed."
-#~ msgstr "Ha fallat."
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
+msgid "[Error decoding BASE64]\n"
+msgstr "[Error decodificant BASE64]\n"
 
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "Error IMAP a %s: autentificada\n"
+#: src/procmsg.c:937 src/procmsg.c:940
+msgid "Already trying to send."
+msgstr "Ja s'ha intentat enviar "
 
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "Error IMAP a %s: no autenticada\n"
+#: src/procmsg.c:1550 src/procmsg.c:1609
+#, c-format
+msgid "Couldn't open file %s."
+msgstr "No s'ha pogut obrir l'arxiu %s."
 
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "Error IMAP a %s: error de fluxe\n"
+#: src/procmsg.c:1619
+msgid "Queued message header is broken."
+msgstr "La capçalera del missatge encuat és defectuosa."
 
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "Error IMAP a %s: connexió rebutjada\n"
+#: src/procmsg.c:1639
+msgid "An error happened during SMTP session."
+msgstr "S'ha produït un error durant la sessió SMTP."
 
-#~ msgid "IMAP error on %s: memory error\n"
-#~ msgstr "Error IMAP a %s: error de memòria\n"
+#: src/procmsg.c:1653
+msgid ""
+"No specific account has been found to send, and an error happened during "
+"SMTP session."
+msgstr ""
+"No s'ha especificat cap compte per enviar, i s'ha produït un error durant la "
+"sessió SMTP"
 
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "Error IMAP a %s: error fatal\n"
+#: src/procmsg.c:1661
+msgid ""
+"Couldn't determine sending information. Maybe the email hasn't been "
+"generated by Claws Mail."
+msgstr ""
+"No s'ha pogut obtenir l'informació d'enviament. Potser el correu no ha estat "
+"generat per Claws Mail."
 
-#~ msgid "IMAP error on %s: APPEND error\n"
-#~ msgstr "Error IMAP a %s: error a APEND\n"
+#: src/procmsg.c:1683
+msgid "Couldn't create temporary file for news sending."
+msgstr "No s'ha pogut crear l'arxiu temporal per enviar noticies."
 
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "Error IMAP a %s: error a NOOP\n"
+#: src/procmsg.c:1696
+msgid "Error when writing temporary file for news sending."
+msgstr ""
+"S'ha produït un error al escriure l'arxiu temporal per enviar noticies."
 
-#~ msgid "IMAP error on %s: LOGOUT error\n"
-#~ msgstr "Error IMAP a %s: error de LOGOUT\n"
+#: src/procmsg.c:1710
+#, c-format
+msgid "Error occurred while posting the message to %s."
+msgstr "S'ha produït un error enviant el missatge a %s."
 
-#~ msgid "IMAP error on %s: CHECK error\n"
-#~ msgstr "Error IMAP a %s: error de CHECK\n"
+#: src/procmsg.c:2262
+msgid "Filtering messages...\n"
+msgstr "Filtrant missatge...\n"
 
-#~ msgid "IMAP error on %s: CLOSE error\n"
-#~ msgstr "Error IMAP a %s: error de CLOSE\n"
+#: src/quote_fmt.c:47
+msgid "<span weight=\"bold\">symbols:</span>"
+msgstr "<span weight=\"bold\">simbols:</span>"
 
-#~ msgid "IMAP error on %s: EXPUNGE error\n"
-#~ msgstr "Error IMAP a %s: error d'EXPUNGE\n"
+#: src/quote_fmt.c:48
+msgid "customized date format (see 'man strftime')"
+msgstr "format de data configurat (veure 'man strftime')"
 
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "Error IMAP a %s: error de COPY\n"
+#: src/quote_fmt.c:51
+msgid "email address of sender"
+msgstr "adreça de correu de l'emisor"
 
-#~ msgid "IMAP error on %s: UID COPY error\n"
-#~ msgstr "Error IMAP a %s: error de UID COPY\n"
+#: src/quote_fmt.c:52
+msgid "full name of sender"
+msgstr "Nom complert del remitent"
 
-#~ msgid "IMAP error on %s: CREATE error\n"
-#~ msgstr "Error IMAP a %s: error de CREATE\n"
+#: src/quote_fmt.c:53
+msgid "first name of sender"
+msgstr "nom del remitent"
 
-#~ msgid "IMAP error on %s: DELETE error\n"
-#~ msgstr "Error IMAP a %s: error de DELETE\n"
+#: src/quote_fmt.c:54
+msgid "last name of sender"
+msgstr "cognoms del remitent"
 
-#~ msgid "IMAP error on %s: EXAMINE error\n"
-#~ msgstr "Error IMAP a %s: error d'EXAMINE\n"
+#: src/quote_fmt.c:55
+msgid "initials of sender"
+msgstr "inicials del remitent"
 
-#~ msgid "IMAP error on %s: FETCH error\n"
-#~ msgstr "Error IMAP a %s: error de FETCH\n"
+#: src/quote_fmt.c:62
+msgid "message body"
+msgstr "cos del missatge"
 
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "Error IMAP a %s: error de LIST\n"
+#: src/quote_fmt.c:63
+msgid "quoted message body"
+msgstr "cos de missatge marcat"
 
-#~ msgid "IMAP error on %s: LOGIN error\n"
-#~ msgstr "Error IMAP a %s: error de LOGIN\n"
+#: src/quote_fmt.c:64
+msgid "message body without signature"
+msgstr "cos de missatge sense signatura"
 
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "Error IMAP a %s: error de LSUB\n"
+#: src/quote_fmt.c:65
+msgid "quoted message body without signature"
+msgstr "cos de missatge marcat sense signatura"
 
-#~ msgid "IMAP error on %s: RENAME error\n"
-#~ msgstr "Error IMAP a %s: error de RENAME\n"
+#: src/quote_fmt.c:66
+msgid "message tags"
+msgstr "etiquetes del missatge"
 
-#~ msgid "IMAP error on %s: SEARCH error\n"
-#~ msgstr "Error IMAP a %s: error de SEARCH\n"
+#: src/quote_fmt.c:67
+msgid "current dictionary"
+msgstr "dicctionari activat"
 
-#~ msgid "IMAP error on %s: SELECT error\n"
-#~ msgstr "Error IMAP a %s: error de SELECT\n"
+#: src/quote_fmt.c:68
+msgid "cursor position"
+msgstr "posició del cursor"
 
-#~ msgid "IMAP error on %s: STATUS error\n"
-#~ msgstr "Error IMAP a %s: error de STATUS\n"
+#: src/quote_fmt.c:69
+msgid "account property: your name"
+msgstr "propietat del compte: el vostre nom"
 
-#~ msgid "IMAP error on %s: STORE error\n"
-#~ msgstr "Error IMAP a %s: error de SEARCH\n"
+#: src/quote_fmt.c:70
+msgid "account property: your email address"
+msgstr "propietat del compte: la vostra adreça de correu"
 
-#~ msgid "IMAP error on %s: STARTTLS error\n"
-#~ msgstr "Error IMAP a %s: error de STARTTLS\n"
+#: src/quote_fmt.c:71
+msgid "account property: account name"
+msgstr "propietat del compte: nom de compte"
 
-#~ msgid "IMAP error on %s: INVAL error\n"
-#~ msgstr "Error IMAP a %s: error d'INVAL\n"
+#: src/quote_fmt.c:72
+msgid "account property: organization"
+msgstr "pPropietat del compte : organització"
 
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "Error IMAP a %s: error de SASL\n"
+#: src/quote_fmt.c:73
+msgid "account property: signature"
+msgstr "propietat del compte: signatura"
 
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "Error IMAP a %s: error de SSL\n"
+#: src/quote_fmt.c:74
+msgid "account property: signature path"
+msgstr "propietat del compte: ruta de la signatura"
 
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "Error IMAP a %s: error desconegut [%d]\n"
+#: src/quote_fmt.c:75
+msgid "account property: default dictionary"
+msgstr "propietat del compte: diccionari per defecte"
 
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr ""
-#~ "El nou nom de la carpeta no ha de contenir el separador de l'espai de noms"
+#: src/quote_fmt.c:76
+msgid "address book <span style=\"oblique\">completion</span>: Cc"
+msgstr "llibre d'adresses <span style=\"oblique\">completion</span>: Cc"
 
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+_Des_ubscriure's"
+#: src/quote_fmt.c:77
+msgid "address book <span style=\"oblique\">completion</span>: From"
+msgstr "llibre d'adresses <span style=\"oblique\">completion</span>: Des de"
 
-#~ msgid "Failed to register folder item update hook"
-#~ msgstr ""
-#~ "Ha fallat el registre de l'enllaç d'actualització d'elements de carpeta"
+#: src/quote_fmt.c:78
+msgid "address book <span style=\"oblique\">completion</span>: To"
+msgstr "llibre d'adresses <span style=\"oblique\">completion</span>: A"
 
-#~ msgid "Failed to register folder update hook"
-#~ msgstr "Ha fallat el registre de l'enllaç d'actualització de les carpetes"
+#: src/quote_fmt.c:80
+msgid "literal backslash"
+msgstr "caràcter contrabarra"
 
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (o anterior)"
+#: src/quote_fmt.c:81
+msgid "literal question mark"
+msgstr "caràcter d'interrogació"
 
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (o anterior)"
+#: src/quote_fmt.c:82
+msgid "literal exclamation mark"
+msgstr "marca del literal d'exclamació"
 
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (o anterior)"
+#: src/quote_fmt.c:83
+msgid "literal pipe"
+msgstr "caràcter 'pipe'"
 
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "no s'ha pogut copiar el missatge %s a %s\n"
+#: src/quote_fmt.c:84
+msgid "literal opening curly brace"
+msgstr "caràcter 'claudator' obert"
 
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>Tipus: </b>"
+#: src/quote_fmt.c:85
+msgid "literal closing curly brace"
+msgstr "caràcter 'claudator' tancada"
 
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>Tamany: </b>"
+#: src/quote_fmt.c:86
+msgid "tab"
+msgstr "tab"
 
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>Nom del fitxer: </b>"
+#: src/quote_fmt.c:89
+msgid "<span weight=\"bold\">commands:</span>"
+msgstr "<span weight=\"bold\">comandes:</span>"
 
-#~ msgid "failed to write Fetchinfo configuration to file\n"
-#~ msgstr "no ha pogut escriure el fitxer de configuració de Fetchinfo\n"
+#: src/quote_fmt.c:90
+msgid ""
+"insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
+"the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"
+msgstr ""
+"insertar <span style=\"oblique\">expr</span> si x es definida, on x és un\n"
+"dels simbols [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
+"(o un dels seus equivalents sense abreviar)"
 
-#~ msgid ""
-#~ "\n"
-#~ "GData Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Connector GData: Error al escriure el fitxer de la configuració del "
-#~ "connector\n"
+#: src/quote_fmt.c:91
+msgid ""
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
+"of\n"
+"the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"
+msgstr ""
+"insertar <span style=\"oblique\">expr</span> si x no és definida, on x és "
+"un\n"
+"dels simbols [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
+"(o un dels seus equivalents sense abreviar)"
 
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "S'ha trobat la localització: (%.2f,%.2f)"
+#: src/quote_fmt.c:92
+msgid ""
+"insert file:\n"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to insert"
+msgstr ""
+"inserteu arxiu:\n"
+"<span style=\"oblique\">sub_expr</span> és evaluada com a una ruta d'arxiu a "
+"insertar"
 
-#~ msgid "Alleged country of origin: "
-#~ msgstr "País al·legat d'origen: "
+#: src/quote_fmt.c:93
+msgid ""
+"insert program output:\n"
+"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
+"get\n"
+"the output from"
+msgstr ""
+"insertar programa de resposta:\n"
+"<span style=\"oblique\">sub_expr</span>  es evaluada com a una comanda per "
+"obtenir\n"
+"la resposta desde "
 
-#~ msgid "Could not resolve location of IP address "
-#~ msgstr "No s'ha pogut resoldre la direcció de l'adreça IP "
+#: src/quote_fmt.c:94
+msgid ""
+"insert user input:\n"
+"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
+"user-entered text"
+msgstr ""
+"insertar entrada d'usuari:\n"
+"<span style=\"oblique\">sub_expr</span>  es una variable per ser reemplaçada "
+"per\n"
+"un text entrat per l'usuari"
 
-#~ msgid "Try to locate sender"
-#~ msgstr "Intentar localitzar el remitent"
+#: src/quote_fmt.c:95
+msgid ""
+"attach file:\n"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to attach"
+msgstr ""
+"adjunteu arxiu:\n"
+"<span style=\"oblique\">sub_expr</span> és evaluada com a una ruta d'arxiu a "
+"adjuntar"
 
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
+#: src/quote_fmt.c:97
+msgid "<span weight=\"bold\">definition of terms:</span>"
+msgstr "<span weight=\"bold\">definició de termes:</span>"
 
-#~ msgid "United Arab Emirates"
-#~ msgstr "Emirats Àrabs Units"
+#: src/quote_fmt.c:98
+msgid ""
+"text that can contain any of the symbols or\n"
+"commands above"
+msgstr ""
+"texte que pot contenir qualsevol dels simbols o\n"
+"comandes indicats anteriorment"
 
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
+#: src/quote_fmt.c:99
+msgid ""
+"text that can contain any of the symbols (no\n"
+"commands) above"
+msgstr ""
+"texte que pot contenir qualsevol dels simbols (no\n"
+"comandes) indicat anteriorment"
 
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua I Barbuda"
+#: src/quote_fmt.c:100
+msgid ""
+"completion from address book only works with the first\n"
+"address of the header, it outputs the full name\n"
+"of the contact if that address matches exactly\n"
+"one contact in the address book"
+msgstr ""
+"completat desde el llibre d'adresses només funciona amb la primera\n"
+"adressa de la capçalera, mostra el nom complet\n"
+"del contacte si l'adreça coincideix exactament\n"
+"amb un contacte al llibre d'adresses"
 
-#~ msgid "Anguilla"
-#~ msgstr "Anguila"
+#: src/quote_fmt.c:109
+msgid "Description of symbols"
+msgstr "Descripció de símbols"
 
-#~ msgid "Albania"
-#~ msgstr "Albània"
+#: src/quote_fmt.c:110
+msgid "The following symbols and commands can be used:"
+msgstr "Els següents símbols i comandes poden ser usats:"
 
-#~ msgid "Armenia"
-#~ msgstr "Armènia"
+#: src/quote_fmt.c:173
+msgid "Use template when composing new messages"
+msgstr "Usar la plantilla quan es composin missatges nous"
 
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Antilles Holandeses"
+#: src/quote_fmt.c:197
+msgid ""
+"Override From header. This doesn't change the account used to compose the "
+"new message."
+msgstr ""
+"Sobreescriure la capçalera Des de. Això no canvia el compte usat per "
+"composar el nou missatge."
 
-#~ msgid "Angola"
-#~ msgstr "Angola"
+#: src/quote_fmt.c:299
+msgid "Use template when replying to messages"
+msgstr "Usar plantilla quan es contestin missatges"
 
-#~ msgid "Antarctica"
-#~ msgstr "Antàrtida"
+#: src/quote_fmt.c:323
+msgid "Override From header. This doesn't change the account used to reply."
+msgstr ""
+"Sobreescriure la capçalera Des de. Això no canvia el compte usat per "
+"respondre."
 
-#~ msgid "Argentina"
-#~ msgstr "Argentina"
+#: src/quote_fmt.c:334 src/quote_fmt.c:464
+msgid "Quotation mark"
+msgstr "Símbol"
 
-#~ msgid "American Samoa"
-#~ msgstr "Samoa Americana"
+#: src/quote_fmt.c:429
+msgid "Use template when forwarding messages"
+msgstr "Usar plantilla quan es reenviin missatges"
 
-#~ msgid "Austria"
-#~ msgstr "Àustria"
+#: src/quote_fmt.c:453
+msgid "Override From header. This doesn't change the account used to forward."
+msgstr ""
+"Sobreescriure la capçalera Des de. Això no canvia el compte usat per "
+"reenviar."
 
-#~ msgid "Australia"
-#~ msgstr "Austràlia"
+#: src/quote_fmt.c:545
+msgid "Defaults"
+msgstr "Predeterminats"
 
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
+#: src/quote_fmt.c:563
+msgid ""
+"The \"From\" field of the \"New message\" template contains an invalid email "
+"address."
+msgstr ""
+"El camp \"Des de\" de la plantilla \"Nou missatge\" conté una adreça de "
+"correu errònia."
 
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbaidjan"
+#: src/quote_fmt.c:566
+msgid "The \"Subject\" field of the \"New message\" template is invalid."
+msgstr "El camp \"Assumpte\" de la plantilla \"Nou missatge\" és erroni."
 
-#~ msgid "Bosnia And Herzegovina"
-#~ msgstr "Bòsnia I Hercegovina"
+#: src/quote_fmt.c:583
+msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
+msgstr "El camp \"símbol de cometa\" de la plantilla \"Respondre\" és erroni."
 
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
+#: src/quote_fmt.c:603
+msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
+msgstr "El camp \"símbol de cometa\" de la plantilla \"Reenviar\" és erroni."
 
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladesh"
+#: src/quote_fmt_parse.y:509
+#, c-format
+msgid "Enter text to replace '%s'"
+msgstr "Entra text per reemplaçar '%s'"
 
-#~ msgid "Belgium"
-#~ msgstr "Bèlgica"
+#: src/quote_fmt_parse.y:510
+msgid "Enter variable"
+msgstr "Inserta una variable"
 
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
+#: src/send_message.c:152
+#, c-format
+msgid "Sending message using command: %s\n"
+msgstr "Enviant missatge usant l'ordre: %s\n"
 
-#~ msgid "Bulgaria"
-#~ msgstr "Bulgària"
+#: src/send_message.c:166
+#, c-format
+msgid "Couldn't execute command: %s"
+msgstr "No s'ha pogut executar l'ordre: %s"
 
-#~ msgid "Bahrain"
-#~ msgstr "Bahrain"
+#: src/send_message.c:201
+#, c-format
+msgid "Error occurred while executing command: %s"
+msgstr "S'ha produït un error executant l'ordre: %s"
 
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
+#: src/send_message.c:348
+msgid "Connecting"
+msgstr "Connectant"
 
-#~ msgid "Benin"
-#~ msgstr "Benín"
+#: src/send_message.c:353
+msgid "Doing POP before SMTP..."
+msgstr "Fent POP abans de SMTP..."
 
-#~ msgid "Bermuda"
-#~ msgstr "Bermuda"
+#: src/send_message.c:356
+msgid "POP before SMTP"
+msgstr "POP abans de SMTP"
 
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei Darussalam"
+#: src/send_message.c:361
+#, c-format
+msgid "Account '%s': Connecting to SMTP server: %s:%d..."
+msgstr "Compte '%s': Connectant al servidor SMTP: %s:%d..."
 
-#~ msgid "Bolivia"
-#~ msgstr "Bolívia"
+#: src/send_message.c:418
+msgid "Mail sent successfully."
+msgstr "Correu enviat correctament."
 
-#~ msgid "Brazil"
-#~ msgstr "Brasil"
+#: src/send_message.c:484
+msgid "Sending HELO..."
+msgstr "Enviant HELO..."
 
-#~ msgid "Bahamas"
-#~ msgstr "Bahames"
+#: src/send_message.c:485 src/send_message.c:490 src/send_message.c:495
+msgid "Authenticating"
+msgstr "Autentificant-se"
 
-#~ msgid "Bhutan"
-#~ msgstr "Bhutan"
+#: src/send_message.c:486 src/send_message.c:491
+msgid "Sending message..."
+msgstr "Enviant mensaje..."
 
-#~ msgid "Bouvet Island"
-#~ msgstr "Illa Bouvet"
+#: src/send_message.c:489
+msgid "Sending EHLO..."
+msgstr "Enviant EHLO..."
 
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
+#: src/send_message.c:498
+msgid "Sending MAIL FROM..."
+msgstr "Enviant MAIL FROM..."
 
-#~ msgid "Belarus"
-#~ msgstr "Bielorússia"
+#: src/send_message.c:502
+msgid "Sending RCPT TO..."
+msgstr "Enviant RCPT TO..."
 
-#~ msgid "Belize"
-#~ msgstr "Belize"
+#: src/send_message.c:507
+msgid "Sending DATA..."
+msgstr "Enviant DATA..."
 
-#~ msgid "Canada"
-#~ msgstr "Canadà"
+#: src/send_message.c:511
+msgid "Quitting..."
+msgstr "Sortint..."
 
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Illes Cocos (Keeling)"
+#: src/send_message.c:540
+#, c-format
+msgid "Sending message (%d / %d bytes)"
+msgstr "Enviant missatge (%d / %d bytes)"
 
-#~ msgid "Central African Republic"
-#~ msgstr "República Centreafricana"
+#: src/send_message.c:593
+msgid "Sending message"
+msgstr "Enviant missatge"
 
-#~ msgid "Congo"
-#~ msgstr "Congo"
+#: src/send_message.c:662 src/send_message.c:682
+msgid "Error occurred while sending the message."
+msgstr "Hi ha hagut un error enviant el missatge."
 
-#~ msgid "Switzerland"
-#~ msgstr "Suïssa"
+#: src/send_message.c:665
+#, c-format
+msgid ""
+"Error occurred while sending the message:\n"
+"%s"
+msgstr ""
+"Hi ha hagut un error enviant el missatge:\n"
+"%s"
 
-#~ msgid "Cote D'Ivoire"
-#~ msgstr "Costa d'Ivori"
+#: src/setup.c:75
+msgid "Mailbox setting"
+msgstr "Configurar bústia"
 
-#~ msgid "Cook Islands"
-#~ msgstr "Illes Cook"
+#: src/setup.c:76
+msgid ""
+"First, you have to set the location of mailbox.\n"
+"You can use existing mailbox in MH format\n"
+"if you have the one.\n"
+"If you're not sure, just select OK."
+msgstr ""
+"Primer estableixi la localització de la teva bústia.\n"
+"Pots utilitzar una bústia existent en format MH\n"
+"si ja el teniu.\n"
+"Si no estàs segur, selecciona Acceptar."
 
-#~ msgid "Chile"
-#~ msgstr "Xile"
+#: src/sourcewindow.c:64
+msgid "Source of the message"
+msgstr "Font del missatge"
 
-#~ msgid "Cameroon"
-#~ msgstr "Camerun"
+#: src/sourcewindow.c:159
+#, c-format
+msgid "%s - Source"
+msgstr "%s - Font"
 
-#~ msgid "China"
-#~ msgstr "Xina"
+#: src/ssl_manager.c:157
+msgid "Saved SSL certificates"
+msgstr "Certificats SSL desats"
 
-#~ msgid "Colombia"
-#~ msgstr "Colombia"
+#: src/ssl_manager.c:431
+msgid "Delete certificate"
+msgstr "Esborrar certificat"
 
-#~ msgid "Costa Rica"
-#~ msgstr "Costa Rica"
+#: src/ssl_manager.c:432
+msgid "Do you really want to delete this certificate?"
+msgstr "Vols esborrar realment aquest certificat?"
 
-#~ msgid "Cuba"
-#~ msgstr "Cuba"
+#: src/summary_search.c:259
+msgid "Search messages"
+msgstr "Buscar en els missatges"
 
-#~ msgid "Cape Verde"
-#~ msgstr "Cap Verd"
+#: src/summary_search.c:281
+msgid "Match any of the following"
+msgstr "Coincidir amb algun dels següents"
 
-#~ msgid "Christmas Island"
-#~ msgstr "Illa de Nadal"
+#: src/summary_search.c:283
+msgid "Match all of the following"
+msgstr "Coincidir amb tots els següents"
 
-#~ msgid "Cyprus"
-#~ msgstr "Xipre"
+#: src/summary_search.c:447
+msgid "Body:"
+msgstr "Cos:"
 
-#~ msgid "Czech Republic"
-#~ msgstr "República Txeca"
+#: src/summary_search.c:454
+msgid "Condition:"
+msgstr "Condició:"
 
-#~ msgid "Germany"
-#~ msgstr "Alemanya"
+#: src/summary_search.c:484
+msgid "Find _all"
+msgstr "Trob_ar a tots"
 
-#~ msgid "Djibouti"
-#~ msgstr "Djibouti"
+#: src/summary_search.c:690 src/summaryview.c:1108 src/summaryview.c:1369
+#, c-format
+msgid "Searching in %s... \n"
+msgstr "Buscant a  %s... \n"
 
-# RML To be consistent with previous one.
-#~ msgid "Denmark"
-#~ msgstr "Dinamarca"
+#: src/summary_search.c:787
+msgid "Beginning of list reached; continue from end?"
+msgstr "S'ha arribat al principi de la llista, seguir desde el final?"
 
-#~ msgid "Dominica"
-#~ msgstr "Dominica"
+#: src/summary_search.c:789
+msgid "End of list reached; continue from beginning?"
+msgstr "S'ha acabat la llista, continuar desde el principi?"
 
-#~ msgid "Dominican Republic"
-#~ msgstr "República Dominicana"
+#: src/summaryview.c:430
+msgid "Create _filter rule"
+msgstr "Crear regla de _filtrat"
 
-#~ msgid "Algeria"
-#~ msgstr "Algèria"
+#: src/summaryview.c:558
+msgid "Toggle quick search bar"
+msgstr "Barra de búsqueda ràpida"
 
-#~ msgid "Ecuador"
-#~ msgstr "Equador"
+#: src/summaryview.c:595
+msgid "Toggle multiple selection"
+msgstr "Commutar selecció múltiple"
 
-#~ msgid "Estonia"
-#~ msgstr "Estònia"
+#: src/summaryview.c:1297
+msgid "Process mark"
+msgstr "Processar marques"
 
-#~ msgid "Egypt"
-#~ msgstr "Egipte"
+#: src/summaryview.c:1298
+msgid "Some marks are left. Process them?"
+msgstr "Queden algunes marques. Processar-les?"
 
-#~ msgid "Western Sahara"
-#~ msgstr "Sàhara Occidental"
+#: src/summaryview.c:1348
+#, c-format
+msgid "Scanning folder (%s)..."
+msgstr "Revisant carpeta (%s)..."
 
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
+#: src/summaryview.c:1845 src/summaryview.c:1897
+msgid "No more unread messages"
+msgstr "No hi ha més missatges sense llegir"
 
-#~ msgid "Spain"
-#~ msgstr "Espanya"
+#: src/summaryview.c:1846
+msgid "No unread message found. Search from the end?"
+msgstr "Cap missatge sense llegir trobat. Buscar desde el final?"
 
-#~ msgid "Ethiopia"
-#~ msgstr "Etiòpia"
+#: src/summaryview.c:1858 src/summaryview.c:1910 src/summaryview.c:1953
+#: src/summaryview.c:2005 src/summaryview.c:2084
+msgid ""
+"Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
+msgstr ""
+"Error intern: valor inesperat per prefs_common.next_unread_msg_dialog\n"
 
-#~ msgid "Finland"
-#~ msgstr "Finlàndia"
+#: src/summaryview.c:1866
+msgid "No unread messages."
+msgstr "No hi ha missatges sense llegir."
 
-#~ msgid "Fiji"
-#~ msgstr "Fiji"
+#: src/summaryview.c:1898
+msgid "No unread message found. Go to next folder?"
+msgstr "No hi ha missatges sense llegir. Anar a la carpeta següent?"
 
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Illes Falkland (Malvines)"
+#: src/summaryview.c:1940 src/summaryview.c:1992
+msgid "No more new messages"
+msgstr "No hi ha més missatges nous"
 
-#~ msgid "Micronesia, Federated States Of"
-#~ msgstr "Micronèsia, Estats Federats de"
+#: src/summaryview.c:1941
+msgid "No new message found. Search from the end?"
+msgstr "No hi ha més missatges nous. Buscar desde el final?"
 
-#~ msgid "Faroe Islands"
-#~ msgstr "Illes Fèroe"
+#: src/summaryview.c:1961
+msgid "No new messages."
+msgstr "No hi ha missatges nous."
 
-#~ msgid "France"
-#~ msgstr "França"
+#: src/summaryview.c:1993
+msgid "No new message found. Go to next folder?"
+msgstr "No hi ha més missatges nous. Anar a la cartea següent?"
 
-#~ msgid "France, Metropolitan"
-#~ msgstr "França, Metropolitana"
+#: src/summaryview.c:2030 src/summaryview.c:2071
+msgid "No more marked messages"
+msgstr "No hi ha més missatges marcats"
 
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
+#: src/summaryview.c:2031
+msgid "No marked message found. Search from the end?"
+msgstr "Cap missatge marcat trobat. Buscar desde el final?"
 
-#~ msgid "United Kingdom"
-#~ msgstr "Regne Unit"
+#: src/summaryview.c:2040
+msgid "No marked messages."
+msgstr "No hi ha missatges marcats."
 
-#~ msgid "Grenada"
-#~ msgstr "Granada"
+#: src/summaryview.c:2072
+msgid "No marked message found. Go to next folder?"
+msgstr "No s'han trobat missatges marcats. Anar a la carpeta següent?"
 
-#~ msgid "Georgia"
-#~ msgstr "Geòrgia"
+#: src/summaryview.c:2109 src/summaryview.c:2134
+msgid "No more labeled messages"
+msgstr "No hi ha més missatges etiquetats"
 
-#~ msgid "French Guiana"
-#~ msgstr "Guiana francès"
+#: src/summaryview.c:2110
+msgid "No labeled message found. Search from the end?"
+msgstr "Cap missatge etiquetat trobat. Buscar desde el final?"
 
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
+#: src/summaryview.c:2119 src/summaryview.c:2144
+msgid "No labeled messages."
+msgstr "No hi ha missatges etiquetats."
 
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltar"
+#: src/summaryview.c:2135
+msgid "No labeled message found. Search from the beginning?"
+msgstr "Cap missatge etiquetat trobat. Buscar desde el principi?"
 
-#~ msgid "Greenland"
-#~ msgstr "Groenlàndia"
+#: src/summaryview.c:2449
+msgid "Attracting messages by subject..."
+msgstr "Agrupant missatges per l'assumpte..."
 
-#~ msgid "Gambia"
-#~ msgstr "Gàmbia"
+#: src/summaryview.c:2634
+#, c-format
+msgid "%d deleted"
+msgstr "%d esborrat(s)"
 
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
+#: src/summaryview.c:2638
+#, c-format
+msgid "%s%d moved"
+msgstr "%s%d moguts"
 
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadalupe"
+#: src/summaryview.c:2639 src/summaryview.c:2646
+msgid ", "
+msgstr ", "
 
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Guinea Equatorial"
+#: src/summaryview.c:2644
+#, c-format
+msgid "%s%d copied"
+msgstr "%s%d copiat"
 
-#~ msgid "Greece"
-#~ msgstr "Grècia"
+#: src/summaryview.c:2658
+msgid " item selected"
+msgid_plural " items selected"
+msgstr[0] " element seleccionat"
+msgstr[1] " elements seleccionats"
 
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "Geòrgia del Sud i les Illes Sandwich del Sud"
+#: src/summaryview.c:2676 src/summaryview.c:2712
+#, c-format
+msgid "%d new, %d unread, %d total (%s)"
+msgstr "%d nou(s), %d no llegit(s), %d total(s) (%s)"
 
-#~ msgid "Guatemala"
-#~ msgstr "Guatemala"
+#: src/summaryview.c:2683
+#, c-format
+msgid ""
+"<b>Message summary</b>\n"
+"<b>New:</b> %d\n"
+"<b>Unread:</b> %d\n"
+"<b>Total:</b> %d\n"
+"<b>Size:</b> %s\n"
+"\n"
+"<b>Marked:</b> %d\n"
+"<b>Replied:</b> %d\n"
+"<b>Forwarded:</b> %d\n"
+"<b>Locked:</b> %d\n"
+"<b>Ignored:</b> %d\n"
+"<b>Watched:</b> %d"
+msgstr ""
+"<b>Resum de missatges</b>\n"
+"<b>Nous:</b> %d\n"
+"<b>Sense llegir:</b> %d\n"
+"<b>Total:</b> %d\n"
+"<b>Tamany:</b> %s\n"
+"\n"
+"<b>Marcats:</b> %d\n"
+"<b>Contestats:</b> %d\n"
+"<b>Reenviats:</b> %d\n"
+"<b>Bloquejats:</b> %d\n"
+"<b>Ignorats:</b> %d\n"
+"<b>Llegits:</b> %d"
 
-#~ msgid "Guam"
-#~ msgstr "Guam"
+#: src/summaryview.c:2707
+#, c-format
+msgid "%d/%d selected (%s/%s), %d unread"
+msgstr "%d/%d seleccionats (%s/%s), %d no llegits"
 
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea Bissau"
+#: src/summaryview.c:2989
+msgid "Sorting summary..."
+msgstr "Ordenant el resum..."
 
-#~ msgid "Guyana"
-#~ msgstr "Guaiana"
+#: src/summaryview.c:3128
+msgid "Setting summary from message data..."
+msgstr "Establint el resum dels missatges..."
 
-#~ msgid "Hong Kong"
-#~ msgstr "Hong Kong"
+#: src/summaryview.c:3333
+msgid "(No Date)"
+msgstr "(Sense data)"
 
-#~ msgid "Heard Island And Mcdonald Islands"
-#~ msgstr "Illa Illes Heard i McDonald"
+#: src/summaryview.c:3385
+msgid "(No Recipient)"
+msgstr "Cap recipient"
 
-#~ msgid "Honduras"
-#~ msgstr "Hondures"
+#: src/summaryview.c:3420
+#, c-format
+msgid ""
+"%s\n"
+"<span color='%s' style='italic'>From: %s, on %s</span>"
+msgstr ""
+"%s\n"
+"<span color='%s' style='italic'>Des de: %s, a %s</span>"
 
-#~ msgid "Croatia"
-#~ msgstr "Croàcia"
+#: src/summaryview.c:3427
+#, c-format
+msgid ""
+"%s\n"
+"<span color='%s' style='italic'>To: %s, on %s</span>"
+msgstr ""
+"%s\n"
+"<span color='%s' style='italic'>A: %s, a %s</span>"
 
-#~ msgid "Haiti"
-#~ msgstr "Haití"
+#: src/summaryview.c:4304
+msgid "You're not the author of the article.\n"
+msgstr "Vostè no es l'autor de l'article.\n"
 
-#~ msgid "Hungary"
-#~ msgstr "Hongria"
+#: src/summaryview.c:4397
+#, 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] "Realment vols esborrar el missatge seleccionat?"
+msgstr[1] "Realment vols esborrar els %d missatges seleccionats?"
 
-#~ msgid "Indonesia"
-#~ msgstr "Indonèsia"
+#: src/summaryview.c:4400
+msgid "Delete message(s)"
+msgstr "Esborrar missatge(s)"
 
-#~ msgid "Ireland"
-#~ msgstr "Irlanda"
+#: src/summaryview.c:4563
+msgid "Destination is same as current folder."
+msgstr "La destinació és la mateixa que la carpeta actual."
 
-#~ msgid "Israel"
-#~ msgstr "Israel"
+#: src/summaryview.c:4661
+msgid "Destination to copy is same as current folder."
+msgstr "La destinaciés de còpia és la carpeta actual."
 
-#~ msgid "India"
-#~ msgstr "Índia"
+#: src/summaryview.c:4823
+msgid "Append or Overwrite"
+msgstr "Afegir o Sobreescriure"
 
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Territori Britànic De l'Oceà Índic"
+#: src/summaryview.c:4824
+msgid "Append or overwrite existing file?"
+msgstr "Afegir o sobreescriure l'arxiu existent?"
 
-#~ msgid "Iraq"
-#~ msgstr "Iraq"
+#: src/summaryview.c:4825
+msgid "_Append"
+msgstr "_Afegir"
 
-#~ msgid "Iran, Islamic Republic Of"
-#~ msgstr "Iran, República Islàmica de l '"
+#: src/summaryview.c:4825
+msgid "_Overwrite"
+msgstr "_Sobreescriure"
 
-#~ msgid "Iceland"
-#~ msgstr "Islàndia"
+#: src/summaryview.c:4866
+#, c-format
+msgid ""
+"You are about to print %d messages, one by one. Do you want to continue?"
+msgstr "Estàs a punt d'imprimir %d missatges, un a un. Vols continuar?"
 
-#~ msgid "Italy"
-#~ msgstr "Itàlia"
+#: src/summaryview.c:5345
+msgid "Building threads..."
+msgstr "Construïnt jerarquia..."
 
-#~ msgid "Jamaica"
-#~ msgstr "Jamaica"
+#: src/summaryview.c:5593
+msgid "Skip these rules"
+msgstr "Saltar-se aquestes regles"
 
-#~ msgid "Jordan"
-#~ msgstr "Jordània"
+#: src/summaryview.c:5596
+msgid "Apply these rules regardless of the account they belong to"
+msgstr "Aplicar aquestes regles independentment del compte al que pertanyin"
 
-#~ msgid "Japan"
-#~ msgstr "Japó"
+#: src/summaryview.c:5599
+msgid "Apply these rules if they apply to the current account"
+msgstr "Aplicar aquestes regles si s'apliquen al compte actual"
 
-#~ msgid "Kenya"
-#~ msgstr "Kenya"
+#: src/summaryview.c:5628
+msgid "Filtering"
+msgstr "Filtrant"
 
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kyrgyzstan"
+#: src/summaryview.c:5629
+msgid ""
+"There are some filtering rules that belong to an account.\n"
+"Please choose what to do with these rules:"
+msgstr ""
+"Hi ha algunes regles de filtrat que èrtanyen a un compte.\n"
+"Si us plau, escolliu que s'ha de fer amb aquestes regles:"
 
-#~ msgid "Cambodia"
-#~ msgstr "Cambodja"
+#: src/summaryview.c:5659
+msgid "Filtering..."
+msgstr "Filtrant..."
 
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
+#: src/summaryview.c:5738
+msgid "Processing configuration"
+msgstr "Configuració de procesament"
 
-#~ msgid "Comoros"
-#~ msgstr "Comores"
+#: src/summaryview.c:6286
+msgid "Ignored thread"
+msgstr "Fil ignorat"
 
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Sant Cristóbal i Nieves"
+#: src/summaryview.c:6288
+msgid "Watched thread"
+msgstr "Fil revisat"
 
-#~ msgid "Korea, Democratic People'S Republic Of"
-#~ msgstr "República de Corea, Popular Democràtica de"
+#: src/summaryview.c:6296
+msgid "Replied but also forwarded - click to see reply"
+msgstr "Respost però tambe reenviat - fes clic per veure la resposta"
 
-#~ msgid "Korea, Republic Of"
-#~ msgstr "República De Corea"
+#: src/summaryview.c:6298
+msgid "Replied - click to see reply"
+msgstr "Respost- polsar per veure la resposta"
 
-#~ msgid "Kuwait"
-#~ msgstr "Kuwait"
+#: src/summaryview.c:6310
+msgid "To be moved"
+msgstr "A ser mogut"
 
-#~ msgid "Cayman Islands"
-#~ msgstr "Illes Caiman"
+#: src/summaryview.c:6312
+msgid "To be copied"
+msgstr "A ser copiat"
 
-#~ msgid "Kazakhstan"
-#~ msgstr "Kazakhstan"
+#: src/summaryview.c:6324
+msgid "Signed, has attachment(s)"
+msgstr "Signat, té adjunt(s)"
 
-#~ msgid "Lao People'S Democratic Republic"
-#~ msgstr "República Democràtica Popular Lao"
+#: src/summaryview.c:6328
+msgid "Encrypted, has attachment(s)"
+msgstr "Encriptat, té adjunt(s)"
 
-#~ msgid "Lebanon"
-#~ msgstr "Líban"
+#: src/summaryview.c:6330
+msgid "Encrypted"
+msgstr "Encriptat"
 
-#~ msgid "Saint Lucia"
-#~ msgstr "Santa Llúcia"
+#: src/summaryview.c:6332
+msgid "Has attachment(s)"
+msgstr "Té adjunt(s)"
 
-#~ msgid "Liechtenstein"
-#~ msgstr "Liechtenstein"
+#: src/summaryview.c:7940
+#, c-format
+msgid ""
+"Regular expression (regexp) error:\n"
+"%s"
+msgstr ""
+"Error en l'expressió regular (regexp):\n"
+"%s"
 
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
+#: src/summaryview.c:8045
+msgid "Go back to the folder list (You have unread messages)"
+msgstr "Torneu a la llista de carpetes (Teniu missatges sense llegir)"
 
-#~ msgid "Liberia"
-#~ msgstr "Libèria"
+#: src/summaryview.c:8050
+msgid "Go back to the folder list"
+msgstr "Tornar a la llista de carpetes"
 
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
+#: src/textview.c:232
+msgid "_Open in web browser"
+msgstr "_Obrir amb el navegador web"
 
-#~ msgid "Lithuania"
-#~ msgstr "Lituània"
+#: src/textview.c:233
+msgid "Copy this _link"
+msgstr "Copiar aquest en_llaç"
 
-#~ msgid "Luxembourg"
-#~ msgstr "Luxemburg"
+#: src/textview.c:240
+msgid "_Reply to this address"
+msgstr "Respondre a aquesta ad_reça"
 
-#~ msgid "Latvia"
-#~ msgstr "Letònia"
+#: src/textview.c:241
+msgid "Add to _Address book"
+msgstr "Afegir al llibre d'_Adreces"
 
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Jamahiriya Àrab Líbia"
+#: src/textview.c:242
+msgid "Copy this add_ress"
+msgstr "Copiar aquesta ad_reça"
 
-#~ msgid "Morocco"
-#~ msgstr "Marroc"
+#: src/textview.c:248
+msgid "_Open image"
+msgstr "_Obrir imatge"
 
-#~ msgid "Monaco"
-#~ msgstr "Mònaco"
+#: src/textview.c:249
+msgid "_Save image..."
+msgstr "De_sar imatge..."
 
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "Moldàvia, República de"
+#: src/textview.c:722
+#, c-format
+msgid "[%s  %s (%d bytes)]"
+msgstr "[%s  %s (%d bytes)]"
 
-#~ msgid "Madagascar"
-#~ msgstr "Madagascar"
+#: src/textview.c:725
+#, c-format
+msgid "[%s (%d bytes)]"
+msgstr "[%s (%d bytes)]"
 
-#~ msgid "Marshall Islands"
-#~ msgstr "Illes Marshall"
+#: src/textview.c:904
+msgid ""
+"\n"
+"  This message can't be displayed.\n"
+"  This is probably due to a network error.\n"
+"\n"
+"  Use "
+msgstr ""
+"\n"
+"  Aquest missatge no pot ser mostrat.\n"
+"  Probablement sigui degut a un error de xarxa.\n"
+"\n"
+"  Useu "
 
-#~ msgid "Macedonia, The Former Yugoslav Republic Of"
-#~ msgstr "Macedònia, Antiga República Iugoslava de"
+#: src/textview.c:909
+msgid "'Network Log'"
+msgstr "'Traça de la Xarxa'"
 
-#~ msgid "Mali"
-#~ msgstr "Mali"
+#: src/textview.c:910
+msgid " in the Tools menu for more information."
+msgstr " al menú Eines per més informació"
 
-# RML To be consistent with previous one.
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
+#: src/textview.c:973
+msgid "  The following can be performed on this part\n"
+msgstr "  El següent serà fet en aquesta part\n"
 
-#~ msgid "Mongolia"
-#~ msgstr "Mongòlia"
+#: src/textview.c:975
+msgid "  by right-clicking the icon or list item:"
+msgstr "  clica amb el botó dret la icona o la llista d'elements:"
 
-#~ msgid "Macao"
-#~ msgstr "Macau"
+#: src/textview.c:979
+msgid "     - To save, select "
+msgstr "     - Per desar, seleccioneu "
 
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Illes Marianes Del Nord"
+#: src/textview.c:980
+msgid "'Save as...'"
+msgstr "'Desar com...'"
 
-#~ msgid "Martinique"
-#~ msgstr "Martinica"
+#: src/textview.c:982 src/textview.c:994 src/textview.c:1006
+#: src/textview.c:1016
+msgid " (Shortcut key: '"
+msgstr "(Drecera: '"
 
-#~ msgid "Mauritania"
-#~ msgstr "Mauritània"
+#: src/textview.c:990
+msgid "     - To display as text, select "
+msgstr "     - Per mostrar com a text seleccioneu "
 
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
+#: src/textview.c:991
+msgid "'Display as text'"
+msgstr "'Mostrar com a text'"
 
-#~ msgid "Malta"
-#~ msgstr "Malta"
+#: src/textview.c:1002
+msgid "     - To open with an external program, select "
+msgstr "     - Per obrir amb un programa extern seleccioneu "
 
-#~ msgid "Mauritius"
-#~ msgstr "Maurici"
+#: src/textview.c:1003
+msgid "'Open'"
+msgstr "'Obrir'"
 
-#~ msgid "Maldives"
-#~ msgstr "Maldives"
+#: src/textview.c:1011
+msgid "       (alternately double-click, or click the middle "
+msgstr "       (alternativament doble-click, click amb el botó "
 
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
+#: src/textview.c:1012
+msgid "mouse button)\n"
+msgstr "central del ratolí)\n"
 
-#~ msgid "Mexico"
-#~ msgstr "Mèxic"
+#: src/textview.c:1014
+msgid "     - Or use "
+msgstr "     - O useu "
 
-#~ msgid "Malaysia"
-#~ msgstr "Malàisia"
+#: src/textview.c:1015
+msgid "'Open with...'"
+msgstr "'Obrir amb...'"
 
-#~ msgid "Mozambique"
-#~ msgstr "Moçambic"
+#: src/textview.c:1127
+#, c-format
+msgid ""
+"The command to view attachment as text failed:\n"
+"    %s\n"
+"Exit code %d\n"
+msgstr ""
+"La comanda per veure els arxius adjunts com a text ha fallat:\n"
+"    %s\n"
+"Codi de retorn %d\n"
 
-#~ msgid "Namibia"
-#~ msgstr "Namíbia"
+#: src/textview.c:2172
+msgid "Tags: "
+msgstr "Etiquetes: "
 
-#~ msgid "New Caledonia"
-#~ msgstr "Nova Caledònia"
+#: src/textview.c:2874
+#, c-format
+msgid ""
+"The real URL is different from the displayed URL.\n"
+"\n"
+"<b>Displayed URL:</b> %s\n"
+"\n"
+"<b>Real URL:</b> %s\n"
+"\n"
+"Open it anyway?"
+msgstr ""
+"La URL real és diferent de la URL mostrada.\n"
+"\n"
+"<b>URL mostrada:</b> %s\n"
+"\n"
+"<b>URL real:</b> %s\n"
+"\n"
+"Obrir-la de totes maneres?"
 
-#~ msgid "Niger"
-#~ msgstr "Níger"
+#: src/textview.c:2883
+msgid "Phishing attempt warning"
+msgstr "Avís d'intent de phishing"
 
-#~ msgid "Norfolk Island"
-#~ msgstr "Illa Norfolk"
+#: src/textview.c:2884
+msgid "_Open URL"
+msgstr "_Obrir URL"
 
-#~ msgid "Nigeria"
-#~ msgstr "Nigèria"
+#: src/toolbar.c:192 src/toolbar.c:1930
+msgid "Receive Mail from all Accounts"
+msgstr "Rebre correu de tots els Comptes"
 
-#~ msgid "Nicaragua"
-#~ msgstr "Nicaragua"
+#: src/toolbar.c:193 src/toolbar.c:1935
+msgid "Receive Mail from current Account"
+msgstr "Rebre correu del Compte actual"
 
-#~ msgid "Netherlands"
-#~ msgstr "Països Baixos"
+#: src/toolbar.c:194 src/toolbar.c:1939
+msgid "Send Queued Messages"
+msgstr "Enviar missatge(s) encuat(s)"
 
-#~ msgid "Norway"
-#~ msgstr "Noruega"
+#: src/toolbar.c:195 src/toolbar.c:905 src/toolbar.c:1957 src/toolbar.c:1968
+msgid "Compose Email"
+msgstr "Composar correu"
 
-#~ msgid "Nepal"
-#~ msgstr "Nepal"
+#: src/toolbar.c:196
+msgid "Compose News"
+msgstr "Composar notícia"
 
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
+#: src/toolbar.c:197 src/toolbar.c:1996 src/toolbar.c:2006
+msgid "Reply to Message"
+msgstr "Respondre al missatge"
 
-#~ msgid "Niue"
-#~ msgstr "Niue"
+#: src/toolbar.c:198 src/toolbar.c:2013 src/toolbar.c:2023
+msgid "Reply to Sender"
+msgstr "Respondre al remitent"
 
-#~ msgid "New Zealand"
-#~ msgstr "Nova Zelanda"
+#: src/toolbar.c:199 src/toolbar.c:2030 src/toolbar.c:2040
+msgid "Reply to All"
+msgstr "Respondre a tots"
 
-#~ msgid "Oman"
-#~ msgstr "Oman"
+#: src/toolbar.c:200 src/toolbar.c:2047 src/toolbar.c:2057
+msgid "Reply to Mailing-list"
+msgstr "Respondre a la lista de correu"
 
-#~ msgid "Panama"
-#~ msgstr "Panamà"
+#: src/toolbar.c:201 src/toolbar.c:1951
+msgid "Open email"
+msgstr "Obrir correu"
 
-#~ msgid "Peru"
-#~ msgstr "Perú"
+#: src/toolbar.c:202 src/toolbar.c:2064 src/toolbar.c:2075
+msgid "Forward Message"
+msgstr "Reenviar missatge"
 
-#~ msgid "French Polynesia"
-#~ msgstr "Polinèsia francès"
+#: src/toolbar.c:203 src/toolbar.c:2080
+msgid "Trash Message"
+msgstr "Missatge a la Paperera"
 
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua Nova Guinea"
+#: src/toolbar.c:204 src/toolbar.c:2084
+msgid "Delete Message"
+msgstr "Esborrar missatge"
 
-#~ msgid "Philippines"
-#~ msgstr "Filipines"
+#: src/toolbar.c:206 src/toolbar.c:2092
+msgid "Go to Previous Unread Message"
+msgstr "Anar a l'anterior Sense Llegir"
 
-#~ msgid "Pakistan"
-#~ msgstr "Pakistan"
+#: src/toolbar.c:207 src/toolbar.c:2096
+msgid "Go to Next Unread Message"
+msgstr "Anar al Missatge Següent"
 
-#~ msgid "Poland"
-#~ msgstr "Polònia"
+#: src/toolbar.c:210 src/toolbar.c:421
+msgid "Print"
+msgstr "Imprimir"
 
-#~ msgid "Saint Pierre And Miquelon"
-#~ msgstr "Sant Pere i Miquelon"
+#: src/toolbar.c:211
+msgid "Learn Spam or Ham"
+msgstr "Aprendre correu brossa o bò"
 
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairn"
+#: src/toolbar.c:212
+msgid "Open folder/Go to folder list"
+msgstr "Obrir carpeta/Anar a la llista de carpetes"
 
-#~ msgid "Puerto Rico"
-#~ msgstr "Puerto Rico"
+#: src/toolbar.c:215 src/toolbar.c:2102
+msgid "Send Message"
+msgstr "Enviar missatge"
 
-#~ msgid "Portugal"
-#~ msgstr "Portugal"
+#: src/toolbar.c:216 src/toolbar.c:2106
+msgid "Put into queue folder and send later"
+msgstr "Posar a la cua i enviar després"
 
-#~ msgid "Palau"
-#~ msgstr "Palau"
+#: src/toolbar.c:217 src/toolbar.c:2110
+msgid "Save to draft folder"
+msgstr "Desar a la carpeta d'esborranys"
 
-#~ msgid "Paraguay"
-#~ msgstr "Paraguai"
+#: src/toolbar.c:218 src/toolbar.c:2114
+msgid "Insert file"
+msgstr "Insertar arxiu"
 
-#~ msgid "Qatar"
-#~ msgstr "Katar"
+#: src/toolbar.c:219 src/toolbar.c:2118
+msgid "Attach file"
+msgstr "Adjuntar arxiu"
 
-#~ msgid "Reunion"
-#~ msgstr "Reunion"
+#: src/toolbar.c:220 src/toolbar.c:2122
+msgid "Insert signature"
+msgstr "Insertar signatura"
 
-#~ msgid "Romania"
-#~ msgstr "Romania"
+#: src/toolbar.c:221 src/toolbar.c:2126
+msgid "Replace signature"
+msgstr "Reemplaça la signatura"
 
-#~ msgid "Russian Federation"
-#~ msgstr "Federació Russa"
+#: src/toolbar.c:222 src/toolbar.c:2130
+msgid "Edit with external editor"
+msgstr "Editar amb un editor extern"
 
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
+#: src/toolbar.c:223 src/toolbar.c:2134
+msgid "Wrap long lines of current paragraph"
+msgstr "Tallar línies llargues del paràgraf actual"
 
-#~ msgid "Saudi Arabia"
-#~ msgstr "Aràbia Saudita"
+#: src/toolbar.c:224 src/toolbar.c:2138
+msgid "Wrap all long lines"
+msgstr "Tallar totes les línies llargues"
 
-#~ msgid "Solomon Islands"
-#~ msgstr "Illes Salomó"
+#: src/toolbar.c:227 src/toolbar.c:440 src/toolbar.c:2147
+msgid "Check spelling"
+msgstr "Verificar ortografia"
 
-#~ msgid "Seychelles"
-#~ msgstr "Seychelles"
+#: src/toolbar.c:229
+msgid "Claws Mail Actions Feature"
+msgstr "Característica Accions de Claws Mail"
 
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
+#: src/toolbar.c:230 src/toolbar.c:2163
+msgid "Cancel receiving"
+msgstr "Cancel·lar la recepció"
 
-#~ msgid "Sweden"
-#~ msgstr "Suècia"
+#: src/toolbar.c:232 src/toolbar.c:2171
+msgid "Cancel receiving/sending"
+msgstr "Cancel·lar l'enviament/recepció"
 
-#~ msgid "Singapore"
-#~ msgstr "Singapur"
+#: src/toolbar.c:233 src/toolbar.c:1943
+msgid "Close window"
+msgstr "Tancar finestra"
 
-#~ msgid "Saint Helena"
-#~ msgstr "Santa Helena"
+#: src/toolbar.c:235
+msgid "Claws Mail Plugins"
+msgstr "Connectors de Claws Mail"
 
-#~ msgid "Slovenia"
-#~ msgstr "Eslovènia"
+#: src/toolbar.c:379 src/toolbar.c:414
+msgctxt "Toolbar"
+msgid "Trash"
+msgstr "Paperera [Barra d'eines]"
 
-#~ msgid "Svalbard And Jan Mayen"
-#~ msgstr "Svalbard i Jan Mayen"
+#: src/toolbar.c:402
+msgid "Folders"
+msgstr "Carpetes"
 
-#~ msgid "Slovakia"
-#~ msgstr "Eslovàquia"
+#: src/toolbar.c:404
+msgid "Get Mail"
+msgstr "Rebre"
 
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
+#: src/toolbar.c:405
+msgid "Get"
+msgstr "Rebre"
 
-#~ msgid "San Marino"
-#~ msgstr "Sant Marí"
+#: src/toolbar.c:407 src/toolbar.c:408
+msgctxt "Toolbar"
+msgid "Compose"
+msgstr "Composar"
 
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
+#: src/toolbar.c:410
+msgid "All"
+msgstr "Tothom"
 
-#~ msgid "Somalia"
-#~ msgstr "Somàlia"
+#: src/toolbar.c:411
+msgctxt "Toolbar"
+msgid "Sender"
+msgstr "Remitent [Barra d'eines]"
 
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
+#: src/toolbar.c:412
+msgid "List"
+msgstr "Llista"
 
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "Sant Vaig prendre I Príncep"
+#: src/toolbar.c:417
+msgid "Prev"
+msgstr "Previ"
 
-#~ msgid "El Salvador"
-#~ msgstr "El Salvador"
+#: src/toolbar.c:418
+msgid "Next"
+msgstr "Següent"
 
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "República Àrab Síria"
+#: src/toolbar.c:426
+msgid "Draft"
+msgstr "Esborrany"
 
-#~ msgid "Swaziland"
-#~ msgstr "Swazilàndia"
+#: src/toolbar.c:429
+msgid "Insert sig."
+msgstr "Insertar sig."
 
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Illes Turks i Caicos"
+#: src/toolbar.c:430
+msgid "Replace sig."
+msgstr "Reemplaçar  sig."
 
-#~ msgid "Chad"
-#~ msgstr "Chad"
+#: src/toolbar.c:431
+msgid "Edit"
+msgstr "Editar"
 
-#~ msgid "French Southern Territories"
-#~ msgstr "Territoris Francesos del Sud"
+#: src/toolbar.c:432
+msgid "Wrap para."
+msgstr "Retallar paràgraf."
 
-#~ msgid "Togo"
-#~ msgstr "Togo"
+#: src/toolbar.c:433
+msgid "Wrap all"
+msgstr "Retallar tot"
 
-#~ msgid "Thailand"
-#~ msgstr "Tailàndia"
+#: src/toolbar.c:435 src/toolbar.c:436
+msgid "Stop"
+msgstr "Parar"
 
-#~ msgid "Tajikistan"
-#~ msgstr "Tadjikistan"
+#: src/toolbar.c:437
+msgid "Stop all"
+msgstr "Aturar-ho tot"
 
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
+#: src/toolbar.c:897
+msgid "Compose News message"
+msgstr "Composar missatge de Notícies"
 
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkmenistan"
+#: src/toolbar.c:936
+msgid "Learn spam"
+msgstr "Aprendre correu brossa"
 
-#~ msgid "Tunisia"
-#~ msgstr "Tunísia"
+#: src/toolbar.c:945
+msgid "Ham"
+msgstr "Bò"
 
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
+#: src/toolbar.c:947
+msgid "Learn ham"
+msgstr "Aprendre correu bò"
 
-#~ msgid "East Timor"
-#~ msgstr "Timor Oriental"
+#: src/toolbar.c:1925
+msgid "Go to folder list"
+msgstr "Anar a la llista de carpetes"
 
-#~ msgid "Turkey"
-#~ msgstr "Turquia"
+#: src/toolbar.c:1931
+msgid "Receive Mail from selected Account"
+msgstr "Rebre Correu de les Comptes seleccionades"
 
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinitat I Tobago"
+#: src/toolbar.c:1947
+msgid "Open preferences"
+msgstr "Obrir preferències"
 
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
+#: src/toolbar.c:1958
+msgid "Compose with selected Account"
+msgstr "Composar amb el compte seleccionat"
 
-#~ msgid "Taiwan, Province Of China"
-#~ msgstr "Taiwan, Província De la Xina"
+#: src/toolbar.c:1979
+msgid "Learn as..."
+msgstr "Aprendre com a..."
 
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "Tanzània, República Unida de"
+#: src/toolbar.c:1989
+msgid "Learn as _Spam"
+msgstr "Aprendre com a correu bro_ssa"
 
-#~ msgid "Ukraine"
-#~ msgstr "Ucraïna"
+#: src/toolbar.c:1990
+msgid "Learn as _Ham"
+msgstr "Aprendre com a correu _Bò"
 
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
+#: src/toolbar.c:1997
+msgid "Reply to Message options"
+msgstr "Opcions de Respondre al Missatge"
 
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Illes menors allunyades dels Estats Units"
+#: src/toolbar.c:2001 src/toolbar.c:2018 src/toolbar.c:2035 src/toolbar.c:2052
+msgid "_Reply with quote"
+msgstr "Respondre amb _citació"
 
-#~ msgid "United States"
-#~ msgstr "Estats Units"
+#: src/toolbar.c:2002 src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053
+msgid "Reply without _quote"
+msgstr "_Respondre sense citació"
 
-#~ msgid "Uruguay"
-#~ msgstr "Uruguai"
+#: src/toolbar.c:2014
+msgid "Reply to Sender options"
+msgstr "Opcions de Respondre a Remitent"
 
-#~ msgid "Uzbekistan"
-#~ msgstr "Uzbekistan"
+#: src/toolbar.c:2031
+msgid "Reply to All options"
+msgstr "Opcions de Respondre a Tots"
 
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Santa Seu (Ciutat del Vaticà)"
+#: src/toolbar.c:2048
+msgid "Reply to Mailing-list options"
+msgstr "Opcions de Respondre a de Llista de correu"
 
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "Saint Vincent i les Grenadines"
+#: src/toolbar.c:2065
+msgid "Forward Message options"
+msgstr "Opcions de Re-enviar Missatge"
 
-#~ msgid "Venezuela"
-#~ msgstr "Veneçuela"
+#: src/uri_opener.c:88
+msgid "There are no URLs in this email."
+msgstr "No hi ha URLs dins d'aquest correu."
 
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Illes Verges Britàniques"
+#: src/uri_opener.c:116
+msgid "Available URLs:"
+msgstr "URLs disponibles:"
 
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Illes Verges dels Estats Units"
+#: src/uri_opener.c:181
+msgctxt "Dialog title"
+msgid "Open URLs"
+msgstr "Open URLs"
 
-#~ msgid "Viet Nam"
-#~ msgstr "Vietnam"
+#: src/uri_opener.c:206
+msgid "Please select the URL to open."
+msgstr "Si us plau, seleccioneu la URL a obrir."
 
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
+#: src/uri_opener.c:214
+msgid "Select All"
+msgstr "Seleccionar tot"
 
-#~ msgid "Wallis And Futuna"
-#~ msgstr "Wallis i Futuna"
+#: src/wizard.c:521
+msgctxt "Welcome Mail Subject"
+msgid "Welcome to Claws Mail"
+msgstr "Benvingut a Claws Mail"
 
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
+#: src/wizard.c:544
+#, c-format
+msgid ""
+"\n"
+"Welcome to Claws Mail\n"
+"---------------------\n"
+"\n"
+"Now that you have set up your account you can fetch your\n"
+"mail by clicking the 'Get Mail' button at the left of the\n"
+"toolbar.\n"
+"\n"
+"Claws Mail has lots of extra features accessible via plugins,\n"
+"like anti-spam filtering and learning (via the Bogofilter or\n"
+"SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
+"aggregator, a calendar, and much more. You can load them from\n"
+"the menu entry '/Configuration/Plugins'.\n"
+"\n"
+"You can change your Account Preferences by using the menu\n"
+"entry '/Configuration/Preferences for current account'\n"
+"and change the general Preferences by using\n"
+"'/Configuration/Preferences'.\n"
+"\n"
+"You can find further information in the Claws Mail manual,\n"
+"which can be accessed by using the menu entry '/Help/Manual'\n"
+"or online at the URL given below.\n"
+"\n"
+"Useful URLs\n"
+"-----------\n"
+"Homepage:      <%s>\n"
+"Manual:        <%s>\n"
+"FAQ:\t       <%s>\n"
+"Themes:        <%s>\n"
+"Mailing Lists: <%s>\n"
+"\n"
+"LICENSE\n"
+"-------\n"
+"Claws Mail is free software, released under the terms\n"
+"of the GNU General Public License, version 3 or later, as\n"
+"published by the Free Software Foundation, 51 Franklin Street,\n"
+"Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
+"found at <%s>.\n"
+"\n"
+"DONATIONS\n"
+"---------\n"
+"If you wish to donate to the Claws Mail project you can do\n"
+"so at <%s>.\n"
+"\n"
+msgstr ""
+"\n"
+"Benvinguts a Claws Mail\n"
+"-----------------------\n"
+"\n"
+"Ara que ja s'ha configurat el seu compte de correu i pot baixar el seu\n"
+"correu clicant el botó 'Rebre' situat a l'esquerra de la barra \n"
+"d'eines.\n"
+"\n"
+"Claws Mail té moltes funcionalitats addicionals com a mòduls,\n"
+"com filtres i sistemes d'aprenentatge ant-spam (mòduls Bogofilter o\n"
+"SpamAssassin), protecció de privacitat (PGP/Mime), un agregador de\n"
+"RSS, una calendari i moltes coses més. Els podeu carregar mitjançant\n"
+"l'entrada de menú '/Configuració/Connectors.\n"
+"'\n"
+"Podeu canviar les Preferències del vostre compte usant l'entrada de menú\n"
+"'/Configuració/Preferències' dell compte actual i canviar les '\n"
+"preferencies generals usant\n"
+"'/Configuració/Preferències'.\n"
+"\n"
+"Podeu obtenir més informació en el manual de Claws Mail,\n"
+"el qual és accessible mitjançant l'entrada de menú '/Ajuda/Manual'\n"
+"o de manera on-line a l'adreça donada aquí sota.\n"
+"\n"
+"URLs útils\n"
+"----------\n"
+"Pàgina oficial:      <%s>\n"
+"Manual:        <%s>\n"
+"PUF:\t       <%s>\n"
+"Temes:        <%s>\n"
+"Llistes de Correu: <%s>\n"
+"\n"
+"LLICÈNCIA\n"
+"-------\n"
+"Claws Mail is software lliure, alliberat sota les condicions\n"
+"de la Llicència Pblica General de GNU, versió 2 o posterior, \n"
+"publicada per la Fundació de Software Lliure (Free Software Foundation), 51 "
+"Franklin Street,\n"
+"Fifth Floor, Boston, MA 02110-1301, USA. La llicència pot ser\n"
+"trobada a <%s>.\n"
+"\n"
+"DONACIONS\n"
+"---------\n"
+"Si vol fer donacions al projecte Claws Mail ho pot fer\n"
+"a <%s>.\n"
+"\n"
 
-#~ msgid "Yemen"
-#~ msgstr "Yémen"
+#: src/wizard.c:620
+msgid "Please enter the mailbox name."
+msgstr "Ompliu el nom de la bústia."
 
-#~ msgid "Mayotte"
-#~ msgstr "Maiòta"
+#: src/wizard.c:648
+msgid "Please enter your name and email address."
+msgstr "Seleccioneu el vostre nom i adreça de correu"
 
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "Sèrbia i Montenegro"
+#: src/wizard.c:659
+msgid "Please enter your receiving server and username."
+msgstr ""
+"Si us plau, introdugueu el vostre servidor de recepció i el vostre nom "
+"d'usuari."
 
-#~ msgid "South Africa"
-#~ msgstr "Sud-àfrica"
+#: src/wizard.c:669
+msgid "Please enter your username."
+msgstr "Si us plau introdugueu el vostre nom d'usuari."
 
-#~ msgid "Zambia"
-#~ msgstr "Zàmbia"
+#: src/wizard.c:679
+msgid "Please enter your SMTP server."
+msgstr "Ompliu el vostre servidor SMTP"
 
-#~ msgid "Democratic Republic Of The Congo"
-#~ msgstr "República Democràtica Del Congo"
+#: src/wizard.c:690
+msgid "Please enter your SMTP username."
+msgstr "Si us plau introdugueu el vostre nom d'usuari de SMTP."
 
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabwe"
+#: src/wizard.c:969
+msgid "<span weight=\"bold\">Your name:</span>"
+msgstr "<span weight=\"bold\">El vostre nom:</span>"
 
-#~ msgid "GeoLocation"
-#~ msgstr "Geolocalització"
+#: src/wizard.c:979
+msgid "<span weight=\"bold\">Your email address:</span>"
+msgstr "<span weight=\"bold\">La vostra adreça de correu:</span>"
 
-#~ msgid "Could not initialize clutter"
-#~ msgstr "No s'ha pogut inicialitzar el corrector"
+#: src/wizard.c:989
+msgid "Your organization:"
+msgstr "Organització: "
 
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "No s'ha pogut crear l'expressió regular: %s\n"
+#: src/wizard.c:1022
+msgid "<span weight=\"bold\">Mailbox name:</span>"
+msgstr "<span weight=\"bold\">Nom de la bústia:</span>"
 
-#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-#~ msgstr ""
-#~ "Ha fallat el registre de vi_sualitzacio de la vista del missatge en el "
-#~ "connector de GeoLocalització"
+#: src/wizard.c:1030
+msgid ""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
+msgstr ""
+"Podeu especificar una ruta absoluta, per exemple: \"/home/joan/Documents/"
+"Correu\""
 
-#~ msgid ""
-#~ "This plugin provides GeoLocation functionality for Claws Mail.\n"
-#~ "\n"
-#~ "Warning: It is technically impossible to derive the geographic location "
-#~ "of senders from their E-Mails with any amount of certainty. The results "
-#~ "presented by this plugin are only rough estimates. In particular, mailing "
-#~ "list managers often strip sender information from the mails, so mails "
-#~ "from mailing lists may be assigned to the location of the mailing list "
-#~ "server instead of the mail sender.\n"
-#~ "When in doubt, don't trust the results of this plugin, and don't rely on "
-#~ "this information to divorce your spouse.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about "
-#~ "marital quarrels)."
-#~ msgstr ""
-#~ "Aquest connector proporciona la funcionalitat de geolocalització per "
-#~ "Claws Mail.\n"
-#~ "\n"
-#~ "Atenció: És tècnicament impossible derivar la ubicació geogràfica dels "
-#~ "remitents dels correus electrònics amb qualsevol quantitat de certesa. "
-#~ "Els resultats presentats per aquest connector són només estimacions "
-#~ "aproximades. En particular, els administradors de la llista de correu "
-#~ "sovint despullen informació del remitent dels correus, per la qual les "
-#~ "llistes de correu poden ser assignades enlloc del remitent del correu.\n"
-#~ "En cas de dubte, no confien en els resultats d'aquest connector, i no "
-#~ "confiar en aquesta informació per divorciar-se de la seva cònjuge.\n"
-#~ "\n"
-#~ "La teva opinió és benvinguda a <berndth at gmx.de> (però només si no es "
-#~ "tracta de baralles conjugals)."
+#: src/wizard.c:1101
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
+msgstr ""
+"Podeu especificar el port afegint-lo al final: \"correu.exemple.com:25\""
 
-#~ msgid "GeoLocation integration"
-#~ msgstr "Integració per Geolocalització"
+#: src/wizard.c:1104
+msgid "<span weight=\"bold\">SMTP server address:</span>"
+msgstr "<span weight=\"bold\">Adreça del servidor SMTP:</span>"
 
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Error en la lectura d'estadístiques de memòria cau</"
-#~ "span>"
+#: src/wizard.c:1110
+msgid "Use authentication"
+msgstr "Useu autentificació"
 
-#~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
-#~ "%d errors</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Utilitzant %s a %d fitxers,%d  directoris, %d altres "
-#~ "i %d errors</span>"
+#: src/wizard.c:1118
+msgid "<span size=\"small\">(empty to use the same as receive)</span>"
+msgstr ""
+"<span size=\"small\">(buit per usar el mateix que a la recepció)</span>"
 
-#~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Error al esborrar la memòria cau d'avatars.</span>"
+#: src/wizard.c:1132
+msgid "SMTP username:"
+msgstr "Usuari SMTP:"
 
-#~ msgid "seconds"
-#~ msgstr "segons"
+#: src/wizard.c:1143
+msgid "SMTP password:"
+msgstr "Contrasenya SMTP:"
 
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "mbox (etPan!)..."
+#: src/wizard.c:1156
+msgid "Use SSL to connect to SMTP server"
+msgstr "Useu SSL per connectar-vos al servidor SMTP"
 
-#~ msgid "+_Save"
-#~ msgstr "+De_sar"
+#: src/wizard.c:1167 src/wizard.c:1582
+msgid "Use SSL via STARTTLS"
+msgstr "Useu SSL via STARTTLS"
 
-#~ msgid ""
-#~ "\n"
-#~ "Notification Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Connector de notificació: Error al escriure la configuració del mòdul a "
-#~ "l'arxiu\n"
+#: src/wizard.c:1179 src/wizard.c:1594
+msgid "Client SSL certificate (optional)"
+msgstr "Certificat SSL per a client (opcional)"
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%sSi us plau, escriviu la paraula "
-#~ "de pas per: </span>\n"
-#~ "\n"
-#~ "%.*s\n"
+#: src/wizard.c:1246 src/wizard.c:1276 src/wizard.c:1530
+msgid "<span weight=\"bold\">Server address:</span>"
+msgstr "<span weight=\"bold\">Adreça del servidor:</span>"
 
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "               uid \"%s\" (Validesa: %s)\n"
+#: src/wizard.c:1306
+msgid "<span weight=\"bold\">Local mailbox:</span>"
+msgstr "<span weight=\"bold\">Bústia local:</span>"
 
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>Recupera comentaris afegit abans de :</b>\n"
-#~ "<small>(En dies; escriu -1 per recuperar tots els comentaris)</small>"
+#: src/wizard.c:1497
+msgid "<span weight=\"bold\">Server type:</span>"
+msgstr "<span weight=\"bold\">Tipus de servidor:</span>"
 
-#~ msgid ""
-#~ "<b>Refresh interval in minutes:</b>\n"
-#~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
-#~ msgstr ""
-#~ "<b>Interval de refresc en minuts:</b>\n"
-#~ "<small>(Poseu a 0 per desactivar el refresc automàtic per aquest feed)</"
-#~ "small>"
+#: src/wizard.c:1507
+msgid "IMAP"
+msgstr "IMAP"
 
-#~ msgid "<b>If an item changes, do not mark it as new:</b>"
-#~ msgstr "<b>Si un element canvia, no marcar-lo com nou.</b>"
+#: src/wizard.c:1541
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
+msgstr ""
+"Podeu especificar el port afegint-lo al final: \"correu.exemple.com:110\""
 
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(aquest event es recurrent)</span>"
+#: src/wizard.c:1546
+msgid "<span weight=\"bold\">Username:</span>"
+msgstr "<span weight=\"bold\">Nom d'usuari:</span>"
 
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b> a:</b>"
+#: src/wizard.c:1571
+msgid "Use SSL to connect to receiving server"
+msgstr "Useu SSL per connectar-vos al servidor de rebuda"
 
-#~ msgid "+Discard"
-#~ msgstr "+Descartar"
+#: src/wizard.c:1636
+msgid "IMAP server directory:"
+msgstr "Directori del servidor IMAP:"
 
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "Desar dar missatges enviats a la carpeta Enviat"
+#: src/wizard.c:1647
+msgid "Show only subscribed folders"
+msgstr "Mostrar només les carpetes subscrites"
 
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>Resum de missatges</b>\n"
-#~ "<b>Nous:</b> %d\n"
-#~ "<b>Sense llegir:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Tamany:</b> %s\n"
-#~ "\n"
-#~ "<b>Marcats:</b> %d\n"
-#~ "<b>Contestats:</b> %d\n"
-#~ "<b>Reenviats:</b> %d\n"
-#~ "<b>Bloquejats:</b> %d\n"
-#~ "<b>Ignorats:</b> %d\n"
-#~ "<b>Llegits:</b> %d"
+#: src/wizard.c:1655
+msgid ""
+"<span weight=\"bold\">Warning: this version of Claws Mail\n"
+"has been built without IMAP support.</span>"
+msgstr ""
+"<span weight=\"bold\">Avís: aquesta versió de Claws Mail\n"
+"ha estat compilat sense suport IMAP.</span>"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Des de: %s, a %s</span>"
+#: src/wizard.c:1773
+msgid "Claws Mail Setup Wizard"
+msgstr "Assistent de configuració de Claws Mail"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>A: %s, a %s</span>"
+#: src/wizard.c:1807
+msgid "Welcome to Claws Mail"
+msgstr "Benvinguts a Claws Mail"
 
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">El vostre nom:</span>"
+#: src/wizard.c:1815
+msgid ""
+"Welcome to the Claws Mail setup wizard.\n"
+"\n"
+"We will begin by defining some basic information about you and your most "
+"common mail options so that you can start to use Claws Mail in less than "
+"five minutes."
+msgstr ""
+"Benvingut a l'assistent de configuració de Claws Mail.\n"
+"\n"
+"Anem a definir alguna informació bàsica sobre vostè i els paràmetres més "
+"comuns del seu correu  perque vostè pugui usar Claws Mail en menys de cinc "
+"minuts."
 
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">La vostra adreça de correu:</span>"
+#: src/wizard.c:1828
+msgid "About You"
+msgstr "Sobre Tu"
 
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">Nom de la bústia:</span>"
+#: src/wizard.c:1836 src/wizard.c:1851 src/wizard.c:1866 src/wizard.c:1882
+msgid "Bold fields must be completed"
+msgstr "Camps en negreta s'han d'omplir"
 
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">Adreça del servidor SMTP:</span>"
+#: src/wizard.c:1843
+msgid "Receiving mail"
+msgstr "Rebent correu"
 
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">Adreça del servidor:</span>"
+#: src/wizard.c:1858
+msgid "Sending mail"
+msgstr "Enviant correu"
 
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">Bústia local:</span>"
+#: src/wizard.c:1874
+msgid "Saving mail on disk"
+msgstr "Gravant el correu al disc"
 
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">Tipus de servidor:</span>"
+#: src/wizard.c:1890
+msgid "Configuration finished"
+msgstr "Configuració finalitzada"
 
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">Nom d'usuari:</span>"
+#: src/wizard.c:1898
+msgid ""
+"Claws Mail is now ready.\n"
+"Click Save to start."
+msgstr ""
+"Claws Mail ja està preparat.\n"
+"Fes clic en Desar per començar."
 
 #~ msgid ""
 #~ "\n"
@@ -20737,6 +20623,9 @@ msgstr ""
 #~ msgid "Always mark as unread"
 #~ msgstr "Marqueu sempre com a no llegida"
 
+#~ msgid "If only its text has changed"
+#~ msgstr "Si només el text canvia"
+
 #~ msgid "Never mark as unread"
 #~ msgstr "No marqueu mai com a no llegit"
 
@@ -20755,6 +20644,9 @@ msgstr ""
 #~ msgid "Default refresh interval in minutes"
 #~ msgstr "Interval de refresc per defecte en minuts"
 
+#~ msgid "Set to 0 to disable automatic refreshing"
+#~ msgstr "Poseu a 0 per desactivar el refresc automàtic"
+
 #~ msgid "Default number of expired items to keep"
 #~ msgstr "Número d'ocurrències caducades a mantenir per defecte"
 
diff --git a/po/cs.po b/po/cs.po
index 7819b7e..04aeb6c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 11:20+0000\n"
 "PO-Revision-Date: 2015-12-14 20:12+0100\n"
 "Last-Translator: David Vachulka <david at konstrukce-cad.com>\n"
 "Language-Team: Czech <cs at li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Poedit 1.8.4\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -27,15 +27,15 @@ msgstr ""
 "Jsou stále otevřena nějaká okna s rozepsanou zprávou.\n"
 "Před úpravou účtů zavřete prosím všechna tato okna."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Nemohu vytvořit složku."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Úpravy účtů"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -45,46 +45,46 @@ msgstr ""
 "zde uvedeny. Zaškrtnutím ve sloupci 'P' určíte, zda účet bude touto funkcí "
 "zpracován. Tučný text značí aktuální účet."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " Nastavit účet jako _výchozí "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 "Účty se vzdáleně umístěnými složkami (např. IMAP) nemohou být kopírovány."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Opravdu chcete odstranit účet '%s'?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Nepojmenovaný)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Odstranit účet"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "P"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 "Funkce 'Přijmout poštu ze všech účtů' načte zprávy z účtů označených "
 "zaškrtnutím"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -97,11 +97,11 @@ msgstr ""
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -154,10 +154,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
@@ -417,18 +417,18 @@ msgid "_Book"
 msgstr "_Kniha"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "Ú_pravy"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "Nápo_věda"
 
@@ -467,13 +467,13 @@ msgstr "_Odstranit knihu"
 msgid "_Save"
 msgstr "_Uložit"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "Vybrat vš_e"
 
@@ -482,7 +482,7 @@ msgid "C_ut"
 msgstr "_Vyjmout"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovat"
@@ -532,8 +532,8 @@ msgstr "Najít duplikované..."
 msgid "Edit custom attributes..."
 msgstr "Upravit uživatelské atributy..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_O programu"
 
@@ -649,7 +649,7 @@ msgstr "Vyžadována silnější autentizace"
 msgid "Sources"
 msgstr "Zdroje adres"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Kniha adres"
@@ -700,7 +700,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Odstranit složku"
 
@@ -813,7 +813,7 @@ msgid "Person"
 msgstr "Osoba"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Složka"
 
@@ -949,19 +949,20 @@ msgstr "Aktualizace adres"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualizace selhala. Změny do slovníku nebyly zapsány. "
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:750 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4892
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "Chyba"
 
@@ -993,67 +994,67 @@ msgstr "LDAP atribut"
 msgid "Attribute Value"
 msgstr "Hodnota atributu"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Nic"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "prohlížeč"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "MIME parser"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "složky"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "filtr"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "zabezpečení"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "oznamování"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "utilita"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "věci"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 "Tento modul poskytuje možnost %s (%s), která je už obsažena v modulu %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "Modul byl již načten"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Nepodařilo se vyhradit paměť pro modul"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Tento modul není licencován dle GPL v3 nebo dle jiné kompatibilní licence."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Tento modul je určen pro Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1062,7 +1063,7 @@ msgstr ""
 "Vaše verze Claws Mail je novější než ta, se kterou byl zkompilován modul "
 "'%s'."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1070,16 +1071,16 @@ msgstr ""
 "Vaše verze Claws Mail je novější než ta, se kterou byl zkompilován tento "
 "modul."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Vaše verze Claws Mail je příliš stará na použití s modulem '%s'."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Vaše verze Claws Mail je příliš stará na použití s tímto modulem."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "Inicializace SSL spojení selhala\n"
 
@@ -1468,7 +1469,7 @@ msgstr "_Odstranit"
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_Zpráva"
 
@@ -1536,7 +1537,7 @@ msgstr "_Zalomené"
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vybrat vš_e"
@@ -1601,7 +1602,7 @@ msgstr "Smazat řádek"
 msgid "Delete to end of line"
 msgstr "Smazat do konce řádku"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Najít"
@@ -1646,47 +1647,47 @@ msgstr "Systém _zabezpečení"
 msgid "_Priority"
 msgstr "_Priorita"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Kódování znaků"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Západní Evropa"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltské"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabština"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonština"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Čínština"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Korejština"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Thajština"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Kniha adres"
 
@@ -1694,7 +1695,7 @@ msgstr "_Kniha adres"
 msgid "_Template"
 msgstr "Ša_blona"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Ak_ce"
 
@@ -1730,11 +1731,11 @@ msgstr "Zobrazit _pravítko"
 msgid "_Normal"
 msgstr "_Normální"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Všem"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_Odesílateli"
 
@@ -1758,27 +1759,27 @@ msgstr "Ní_zká"
 msgid "_Lowest"
 msgstr "Ne_jnižsí"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bitové ASCII (US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Řečtina (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turečtina (ISO-8859-_9)"
 
@@ -1826,46 +1827,46 @@ msgstr "Chyba v těle šablony \"Předat\" na řádku %d."
 msgid "Fw: multiple emails"
 msgstr "Fw: vice zprav"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Přesměrovat\" na řádku %d."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpovědět komu:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskusní skupiny:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Pokračování:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "V odpovědi komu:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nepodařilo se připojit soubor (konverze znakové sady se nezdařila)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1883,73 +1884,73 @@ msgstr[2] ""
 "Následující soubory byly připojeny: \n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Značka pro citaci\" v šabloně je neplatná."
 
-#: src/compose.c:3605
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemohu získat velikost souboru '%s'."
 
-#: src/compose.c:3616
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Chystáte se vložit soubor %s do těla zprávy. Jste si tím jistý?"
 
-#: src/compose.c:3619
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "Jste si jistý?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "_Vložit"
 
-#: src/compose.c:3744
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:3745
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "Prázdný soubor"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "_Přesto přiložit"
 
-#: src/compose.c:3755
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Upraveno]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[žádný předmět] - Psaní zprávy%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Napsat zprávu"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4820 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1957,55 +1958,55 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:5035
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "Jediný adresát je výchozí příjemce kopií (viz nastavení účtu). Opravdu "
 "odeslat?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/compose.c:5067
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "Jediný adresát je výchozí příjemce skrytých kopií (viz nastavení účtu). "
 "Opravdu odeslat?"
 
-#: src/compose.c:5084
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Fronta"
 
-#: src/compose.c:5104
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Předmět je prázdný.  %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Přesto odeslat?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Opravdu zařadit do fronty?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2015,7 +2016,7 @@ msgstr ""
 "\n"
 "Konverze znakové sady se nezdařila."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2025,7 +2026,7 @@ msgstr ""
 "\n"
 "Nepodařilo se získat šifrovací klíč příjemce."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2036,7 +2037,7 @@ msgstr ""
 "\n"
 "Podepisování se nezdařilo: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2047,11 +2048,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "Zprávu nelze uložit do fronty pro odeslání."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5196 src/compose.c:5256
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2059,7 +2060,7 @@ msgstr ""
 "Zpráva byla uložena do fronty ale nemohla být odeslána.\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5246
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2068,7 +2069,7 @@ msgstr ""
 "%s\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5621
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2079,7 +2080,7 @@ msgstr ""
 "na %s.\n"
 "Odeslat v kódování %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2092,72 +2093,73 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:5790
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Nepodařilo se zašifrovat zprávu: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "Varování šifrování"
 
-#: src/compose.c:5912
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "_Pokračovat"
 
-#: src/compose.c:5961
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "Není dostupný žádný účet pro odeslání pošty!"
 
-#: src/compose.c:5970
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Vybraný účet není NNTP: Odeslání není možné. "
 
-#: src/compose.c:6205
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Příloha %s už neexistuje. Ignorovat?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Zrušit posílání"
 
-#: src/compose.c:6206
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "Ignorovat přílohu"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "Část originálu %s"
 
-#: src/compose.c:6824
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "Přidat do knihy adres"
 
-#: src/compose.c:6985
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "Smazat obsah pole"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Použijte <tab> pro automatické dokončení podle knihy adres"
 
-#: src/compose.c:7204
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "MIME typ"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:7273
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "Uložit zprávu do "
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7327 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2168,23 +2170,23 @@ msgstr "Uložit zprávu do "
 msgid "_Browse"
 msgstr "P_rocházet"
 
-#: src/compose.c:7783
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "_Záhlaví"
 
-#: src/compose.c:7788
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "_Přílohy"
 
-#: src/compose.c:7802
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "_Ostatní"
 
-#: src/compose.c:7817
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "Pře_dmět:"
 
-#: src/compose.c:8041
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2193,19 +2195,19 @@ msgstr ""
 "Nelze spustit kontrolu pravopisu.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "_Od:"
 
-#: src/compose.c:8197
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "Účet použitý pro tuto zprávu"
 
-#: src/compose.c:8199
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "Adresa odesílatele musí být uvedena"
 
-#: src/compose.c:8365
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2214,68 +2216,68 @@ msgstr ""
 "Systém zabezpečení '%s' se nepodařilo načíst. Nebudete moci digitálně "
 "podepsat nebo šifrovat zprávu."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "Žá_dné"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8584 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Chyba v těle šablony na řádku %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "Chyba v poli 'Od' šablony."
 
-#: src/compose.c:8701
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "Chyba v poli 'Komu' šablony."
 
-#: src/compose.c:8719
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "Chyba v poli 'Kopie' šablony."
 
-#: src/compose.c:8737
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "Chyba v poli 'Skrytá kopie' šablony."
 
-#: src/compose.c:8755
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "Chyba v poli 'Komu' šablony."
 
-#: src/compose.c:8774
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "Chyba v poli 'Předmět' šablony."
 
-#: src/compose.c:9043
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:9058
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:9132
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9149
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: src/compose.c:9190
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:9210
+#: src/compose.c:9227
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:9211
+#: src/compose.c:9228
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:9462
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2286,15 +2288,15 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9968 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potřebuje přístup k síti, aby mohl odeslat tuto zprávu."
 
-#: src/compose.c:9977
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "Zprávu nelze uložit do fronty pro odeslání."
 
-#: src/compose.c:9979
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2305,15 +2307,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "Nelze uložit koncept."
 
-#: src/compose.c:10161
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "Nelze uložit koncept"
 
-#: src/compose.c:10162
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2321,24 +2323,24 @@ msgstr ""
 "Nemohu uložit koncept.\n"
 "Chcete zrušit ukončení nebo zahodit tuto zprávu?"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "_Zrušit ukončení"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "_Zahodit zprávu"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "Výběr souboru"
 
-#: src/compose.c:10352
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Soubor '%s' nelze číst."
 
-#: src/compose.c:10354
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2347,54 +2349,54 @@ msgstr ""
 "Soubor '%s' obsahuje neplatné znaky\n"
 "pro nastavené kódování, vložení může obsahovat chyby."
 
-#: src/compose.c:10441
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:10442
+#: src/compose.c:10459
 msgid "This message has been modified. Discard it?"
 msgstr "Zpráva byla modifikována. Chcete ji zahodit?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Zahodit"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "Uložit jako _koncept"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: src/compose.c:10446
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Zpráva byla modifikována. Chcete uložit poslední změny?"
 
-#: src/compose.c:10447
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "_Neukládat"
 
-#: src/compose.c:10518
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použít šablonu '%s'?"
 
-#: src/compose.c:10520
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "Použít šablonu"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10538 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: src/compose.c:11379
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "Vložit nebo připojit?"
 
-#: src/compose.c:11380
+#: src/compose.c:11397
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2402,16 +2404,16 @@ msgstr ""
 "Chcete obsah souboru(ů) vložit do textu zprávy nebo soubor(y) připojit ke "
 "zprávě jako přílohu?"
 
-#: src/compose.c:11382
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "_Přiložit"
 
-#: src/compose.c:11599
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba formátu citace na řádku %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2628,8 +2630,8 @@ msgid " Check File "
 msgstr " Otestovat soubor "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Soubor"
 
@@ -2775,7 +2777,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2957,7 +2959,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Maximální počet položek, které budou vráceny při prohledávání."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Server"
 
@@ -3091,15 +3093,15 @@ msgid "Stylesheet"
 msgstr "Šablona stylu"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Žádná"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Výchozí"
 
@@ -3605,27 +3607,27 @@ msgstr "Koš"
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Zpracovávám (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopíruji %s do %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Přesouvám %s do %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aktualizuji vyrovnávací paměť pro %s..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Zpracovávám zprávy..."
 
@@ -3647,11 +3649,11 @@ msgstr "Vybrat složku"
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215
+#: src/imap_gtk.c:271 src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:424 src/plugins/rssyl/rssyl_cb_menu.c:206
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' nemůže být obsaženo ve jméně složky."
@@ -3659,7 +3661,7 @@ msgstr "'%c' nemůže být obsaženo ve jméně složky."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Složka '%s' už existuje."
@@ -3683,7 +3685,7 @@ msgstr "Označit všechny jako přečtené rekurzi_vně"
 msgid "R_un processing rules"
 msgstr "S_pustit pravidla zpracování"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_Prohledat složku..."
 
@@ -3741,12 +3743,12 @@ msgstr "Opravdu chcete označit všechny zprávy v této složce jako přečten
 msgid "Mark all as read"
 msgstr "Označit všechny jako přečtené"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prohledávám složku %s%c%s..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prohledávám složku %s..."
@@ -3793,7 +3795,7 @@ msgstr "Otevírám složku %s..."
 msgid "Folder could not be opened."
 msgstr "Složku nelze otevřít."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
@@ -4033,7 +4035,7 @@ msgstr ""
 "Lokalizace: %s (znaková sada: %s)\n"
 "Operační systém: neznámý"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "Tým Claws Mail"
 
@@ -5017,9 +5019,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
@@ -5057,14 +5059,14 @@ msgstr "Zavedené moduly"
 msgid "Page Index"
 msgstr "Index stránky"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Skrýt"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5502,234 +5504,193 @@ msgstr "Velikost souboru:"
 msgid "Load Image"
 msgstr "Načíst obrázek"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "Přerušeno IMAP4 spojení\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP chyba na %s:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr " autentizován\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr " ne autentizován\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr " špatný stav\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr " chyba proudu\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr " chyba parsování (velmi pravděpodobně non-RFC data ze serveru)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr " spojení odmítnuto\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr " chyba paměti\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr " Fatální chyba\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr " chyba protokolu(velmi pravděpodobně non-RFC data ze serveru)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr " spojení nepřijato\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " APPEND chyba\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " NOOP chyba\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " LOGOUT chyba\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " CAPABILITY chyba\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " CHECK chyba\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " CLOSE chyba\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " EXPUNGE chyba\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " COPY chyba\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " UID COPY chyba\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " CREATE chyba\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " DELETE chyba\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " EXAMINE chyba\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " FETCH chyba\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " UID FETCH chyba\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " LIST chyba\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " LOGIN chyba\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr " LSUB chyba\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " RENAME chyba\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " SEARCH chyba\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " UID SEARCH chyba\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " SELECT chyba\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " STATUS chyba\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " STORE chyba\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " UID STORE chyba\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " SUBSCRIBE chyba\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " UNSUBSCRIBE chyba\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " STARTTLS chyba\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " INVAL chyba\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " EXTENSION chyba\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " SASL chyba\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " SSL chyba\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr " Neznámá chyba [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5741,7 +5702,7 @@ msgstr ""
 "Přihlášení pomocí CRAM-MD5 pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul CRAM-MD5 SASL."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5753,7 +5714,7 @@ msgstr ""
 "Přihlášení pomocí DIGEST-MD5 pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul DIGEST-MD5 SASL."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5765,50 +5726,37 @@ msgstr ""
 "Přihlášení pomocí SCRAM-SHA-1 pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul SCRAM SASL."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"Přihlášení pomocí CRAM-MD5 pracuje pouze pokud byl libetpan zkompilován s "
-"podporou SASL a je nainstalován zásuvný modul CRAM-MD5 SASL."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Připojení k %s selhalo: přihlášení odmítnuto.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Připojení k %s selhalo: přihlášení odmítnuto.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Připojení k %s selhalo"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojení s %s bylo rozpojeno. Obnovuji spojení...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail potřebuje přístup k síti, aby mohl přistupovat k IMAP serveru."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Nezabezpečené připojení"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5821,104 +5769,104 @@ msgstr ""
 "\n"
 "Chcete pokračovat v připojování k serveru? Komunikace nebude zabezpečena."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "_Pokračovat v připojování"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Účet '%s': Připojuji se na IMAP4 server: %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "Nelze spustit TLS relaci.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Přidávám zprávy..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Kopíruji zprávy..."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "nelze nastavit příznak odstranění\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Vyhledávám odhlášené složky v %s..."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hledám podsložky %s..."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit mailbox: selhal příkaz LIST\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit mailbox\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat mailbox: %s na %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "nelze odstranit mailbox\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST selhal\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Označuji zprávy..."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "Server vyžeduje TLS pro přihlášení.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodařilo se načíst údaje o schopnostech serveru IMAP.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5927,20 +5875,20 @@ msgstr ""
 "Připojení k %s selhalo: server požaduje TLS, ale Claws Mail je zkompilován "
 "bez podpory TLS.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Přihlašování k serveru je mimo provoz.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Stahuji zprávu..."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nelze nastavit příznak odstranění: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5991,7 +5939,7 @@ msgstr "_Odebírání"
 msgid "_Subscribe..."
 msgstr "_Odebírat..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "_Odhlásit..."
 
@@ -6028,20 +5976,20 @@ msgstr "Zdědit vlastnosti z rodičovské složky"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadejte nové jméno pro '%s':"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6064,7 +6012,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
@@ -6091,7 +6039,7 @@ msgstr "_Vyhledat"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Vyberte podsložku ve složce %s, kterou chcete odebírat: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Odebírat"
 
@@ -6124,8 +6072,8 @@ msgstr "odebírat"
 msgid "unsubscribe"
 msgstr "odhlásit"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428
+#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Nastavit u podsložek"
 
@@ -6318,32 +6266,32 @@ msgstr "Vyberte Pine soubor"
 msgid "Import Pine file into Address Book"
 msgstr "Importovat Pine soubor do knihy adres"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail potřebuje přístup k síti, aby mohl stáhnout zprávy."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s selhal\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Načítám nové zprávy"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Načítám"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6351,24 +6299,24 @@ msgstr[0] "Hotovo (%d zpráva (%s) přijato)"
 msgstr[1] "Hotovo (%d zprávy (%s) přijato)"
 msgstr[2] "Hotovo (%d zpráv (%s) přijato)"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Hotovo (Nejsou žádné nové zprávy)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Časový limit"
 
@@ -6405,7 +6353,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
@@ -6430,7 +6378,7 @@ msgstr "Zjišťuji počet nových zpráv (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuji počet zpráv (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Ukončuji"
 
@@ -6482,7 +6430,7 @@ msgstr "Chyba soketu."
 msgid "Socket error on connection to %s:%d."
 msgstr "Chyba socketu v připojení k %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Připojení bylo ukončeno vzdáleným počítačem."
 
@@ -6504,11 +6452,11 @@ msgstr ""
 "Mailbox je uzamčen:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Autentizace selhala."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6517,7 +6465,7 @@ msgstr ""
 "Autentizace selhala:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6874,816 +6822,811 @@ msgstr "NetworkManager: network is online.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: síť je odpojena.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "Z_obrazit"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "Nastav_ení"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "_Přidat mailbox"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Změnit pořadí schránek..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "_Importovat mbox soubor..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "_Exportovat do mbox souboru..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "Exportovat _vybrané do mbox souboru..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Vyprázdnit všechny _koše"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "Uložit email j_ako..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "Uložit část j_ako..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Nastavení stránky..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "_Tisk..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "Synchronizovat složky"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "_Konec"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "Vybrat _vlákno"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_Hledat v aktuální zprávě..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_Rychlé vyhledávání"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "Zobrazit nebo s_krýt"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "Nástrojová lišta"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "Zobrazované _sloupce"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "V seznamu _složek..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "V seznamu _zpráv..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "Us_pořádání"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Seřadit"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "_Seskupit dle předmětu"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "_Sbalit všechna vlákna"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Jít na"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Předchozí zpráva"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "_Další zpráva"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Pře_dchozí nepřečtenou zpráva"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Da_lší nepřečtená zpráva"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Předchozí no_vá zpráva"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "D_alší nová zpráva"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Předchozí _označená zpráva"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Další o_značená zpráva"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Předchozí _obarvená zpráva"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Další o_barvená zpráva"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Předchozí otevřená zpráva"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Další otevřená zpráva"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Rodičovská zpráva"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Následující nepřečtená _složka"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Jiná složka..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Další část"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Předchozí část"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Rolování zpráv"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Předchozí řádek"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Další řádek"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Předchozí stránka"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Další stránka"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Dekódovat"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "Otevřít v _novém okně"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Zd_roj zprávy"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Část zprávy"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Zobrazit jako text"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Otevřít"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Otevřít čím..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Citace"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "_Aktualizace souhrnu"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "Přij_mout"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Přijmout z _aktuálního účtu"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Přijmout ze _všech účtů"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "Přerušit stahování zprá_v"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "_Odeslat pozdržené zprávy"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "_Napsat nový mail"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "_Napsat news zprávu"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Odpovědět ko_mu"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Postoupit a odpovědět"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "Pře_dat"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Předat jako pří_lohu"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Pře_směrovat"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Pošta"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Zobrazit archív"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "Kontaktovat vlastníka"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "Přesunou_t..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Kopírovat..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Přesuno_ut do koše"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "_Odstranit..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Přesunout vlákno do _koše"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "Odstranit _vlákno"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Stornovat news zprávu"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "Označ_it"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "Odo_značit"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Označit jako _nepřečtené"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Označit jako _přečtené"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Označit všechny jako přečtené"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorovat vlákno"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Přestat ignorovat vlákno"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Sledovat vlákno"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Nesledovat vlákno"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Označit jako _spam"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Označit jako n_e spam"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Zamknout"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Odemknout"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "O_barvit"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Zn_ačky"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "Znovu _upravit"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Zkontrolovat podpis"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Přidat odesílatele do kni_hy adres"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "S_bírat adresy"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "Z aktuální _složky..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "Z vybraných _zpráv..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "Pře_filtrovat všechny zprávy ve složce"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Přefiltrovat _vybrané zprávy"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustit pravidl_o zpracování složky"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Vytvořit pravidlo _filtru"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "Podle _Od"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Podle _Komu"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "Podle _Předmětu"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Vytvořit pravidlo zpracování"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Seznam _URLs..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "_Zjistit nové zprávy ve všech složkách"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "_Odstranit duplikáty zpráv"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "Ve vybrané složce"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "Ve všech složkách"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "S_pustit"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "Vy_mazat"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "SSL cer_tifikáty"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "Záznam filtrování"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "Záznam o připojení"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "_Zapomenout všechna hesla relace"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "_Zapomenout všechna hesla relace"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "_Zvolit aktuální účet"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "Upravit a_ktuální účet..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Vytvořit _nový účet..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "U_pravit účty..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "_Volby..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "Před zpracování..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "Následné zpracování..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Filtrování..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "Ša_blony..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Akce..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "Znač_ky..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "FAQ (online)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "_Význam ikon"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Nastavit jako výchozí klient"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "Offline _mód"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Řádek men_u"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "_Náhled zprávy"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "_Stavový řádek"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Záhlaví sloupců"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "Zobrazit _vlákna"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Skrýt přečtená vlákna"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "Skrýt přeč_tené zprávy"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Skrýt odstraněné zprávy"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Zobrazit všechny _hlavičky"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "_Sbalit vše"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Sbalit od úrovně _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Sbalit od úrovně _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Text _vedle ikon"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Jen _ikony"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "Jen _text"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Standartní"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Tři sloupce"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "Široký náhled _zpráv"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "Široký _seznam zpráv"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "Podle čí_sla"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "Podle _velikosti"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "Podle _data"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Podle data vlákna"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "Podle _předmětu"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "Podle _barevného označení zprávy"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Podle tag"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "Podle _značky"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "Podle _stavu"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "Podle _přílohy"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Podle skóre"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Podle zamknuto"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "N_eřadit"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Vzestupně"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Sestupně"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_Autodetekce"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Použít značky..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Došlo k chybě (chybám). Klikněte zde pro zobrazení protokolu."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 "Pracujete v režimu online. Klikněte na ikonu pro přechod do režimu offline"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 "Pracujete v režimu offline. Klikněte na ikonu pro přechod do režimu online"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Vybrat účet"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Síťový protokol"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Protokol filtrování zpráv a zpracování složek"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "protokolování filtrů zapnuto\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "protokolování filtrů vypnuto\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Odstranit všechny zprávy ve VŠECH koších?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Neukončit"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Přidat mailbox"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7693,18 +7636,18 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Mailbox '%s' již existuje."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7714,43 +7657,43 @@ msgstr ""
 "Může to být tím, že mailbox již existuje, nebo nemáte dostatečná práva pro "
 "zápis."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "Zasílání zpráv do konference není povoleno"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Import souboru mbox se nezdařil."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "Export do mbox souboru se nezdařil."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Ukončit Claws Mail?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Synchronizace složek"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete nyní synchronizovat složky?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Synchronizovat"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -7758,33 +7701,33 @@ msgstr[0] "Odstraněna %d duplicitní zpráva v %d složkách.\n"
 msgstr[1] "Odstraněny %d duplicitní zprávy v %d složkách.\n"
 msgstr[2] "Odstraněno %d duplicitních zpráv v %d složkách.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Zpracování složky - pravidla prováděná před pravidly složky"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Zpracování složky - pravidla prováděná po pravidlech složky"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Filtr pro příjem - nastavení pravidel"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "Nemohu zaregistrovat jako výchozí klient: není možné získat cestu."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail byl zaregistrován jako výchozí klient."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nemohu zaregistrovat jako výchozí klient: není možné zapisovat do registrů."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7866,7 +7809,7 @@ msgstr "Přepsat mbox soubor"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento soubor již existuje. Chcete ho přepsat?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Přepsat"
@@ -7912,19 +7855,19 @@ msgstr "Dosažen konec zprávy, pokračovat od začátku?"
 msgid "Search finished"
 msgstr "Hledání ukončeno"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "_Napsat novou zprávu"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Náhled zprávy"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<návratová adresa nebyla nalezena>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7939,11 +7882,11 @@ msgstr ""
 "Návratová adresa: %s\n"
 "Doporučuje se neodesílat potvrzení o doručení."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Neodesílat"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7954,64 +7897,64 @@ msgstr ""
 "'Komu:' a 'Kopie:' nejste oficiálním adresátem.\n"
 "Doporučuje se neodesílat potvrzení o doručení."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Přijímaní zprávy (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nepodařilo se rozšifrovat: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Zpráva nevyhovuje MIME standardu. Může být špatně zobrazena."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Přepsat existující soubor?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Zobrazit všechny %s."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Je zobrazen jen první megabyte textu."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "Obdržel potvrzení pro tuto zprávu : byla zobrazena příjemcem."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "U této zprávy jste vyžádal(a) potvrzení o doručení."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Tato zpráva vyžaduje potvrzení o duručení."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Odeslat potvrzení"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8019,7 +7962,7 @@ msgstr ""
 "Tato zpráva byla částečně stažena\n"
 "a byla odstraněna ze serveru."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8028,15 +7971,15 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Označit ke stažení"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Označit k odstranění"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8045,12 +7988,12 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude stažena úplně."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Odoznačit"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8059,11 +8002,11 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude odstraněna."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Oznámení o doručení"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8073,19 +8016,19 @@ msgstr ""
 "Tato zpráva byla doručena do více vašich účtů.\n"
 "Vyberte si prosím účet, ze kterého bude odesláno potvrzení o doručení:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Odeslat oznámení"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nemohu tisknout: zpráva neobsahuje text."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8093,7 +8036,7 @@ msgstr ""
 "\n"
 "  Ve složce nejsou žádné zprávy"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8101,7 +8044,7 @@ msgstr ""
 "\n"
 "  Zpráva smazána"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8109,16 +8052,16 @@ msgstr ""
 "\n"
 "  Zpráva byla smazána nebo přesunuta do jiné složky"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "Během učení došlo k chybě.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Přesouvám zprávy..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Odstraňuji zprávy..."
 
@@ -8219,7 +8162,8 @@ msgid "Go back to email"
 msgstr "Zpět na zprávu"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190
+#: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nepodařilo se uložit tuto část zprávy: %s"
@@ -8297,80 +8241,80 @@ msgstr "Velikost:"
 msgid "Description:"
 msgstr "Popis:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "NNTP spojení %s:%d bylo odpojeno.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Účet '%s': Připojuji se na NNTP server: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Chyba logování na %s:%d ...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan nepodporuje návratový kód 480, takže nyní je vybráno pokračovat\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Režim čtení selhal, přesto pokračuji\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Chyba při vytvoření sezení s %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Chyba autentizace pro %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail potřebuje přístup k síti, aby mohl přistupovat k serveru "
 "diskusních skupin."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "nemohu vybrat skupinu: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "nemohu nastavit skupinu: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah příspěvků: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "nelze získat xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "získávám xover %d - %d v %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "nelze získat xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "neplatná xover řádka\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9135,7 +9079,8 @@ msgstr ""
 "Text zpráv, které předáváte (forward) nebo přesměrováváte (redirect) nebude "
 "kontrolován"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Podpisy"
 
@@ -9243,12 +9188,14 @@ msgstr ""
 "\n"
 "Nastavení v /Nastavení/Volby/Zásuvné moduly/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Rozpoznávání spamu"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Učení se rozpoznávat spam"
@@ -9833,7 +9780,7 @@ msgstr "CSS z tohoto souboru bude aplikováno na všechny HTML části"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "_Procházet"
@@ -9842,93 +9789,93 @@ msgstr "_Procházet"
 msgid "Select stylesheet"
 msgstr "Vyberte šablona stylu"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Načítání vzdáleného obsahu je zakázáno."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Načíst obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Odblokovat externí obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Povolit Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Povolit zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Povolit Javu"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Otevřít odkazy v externím prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s je poškozený nebo není podporovaný kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Prohledat web"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Otevřít v prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Otevřít v prohlížeči (povolit vzdálený obsah)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Otevřít v prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Otevřít obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Kopírovat odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Stáhnout odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Uložit obrázek jako"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Kopírovat obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Načíst kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML prohlížeč"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10020,11 +9967,11 @@ msgid ""
 msgstr ""
 "Přidá X-FETCH-TIME hlavičku s datem a časem doručení zprávy ve formátu RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "Zásuvný modul GData: Autentizace vyžadována"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10041,29 +9988,29 @@ msgstr ""
 "autorizace dostanete autorizační kód. Vložte kód do políčka dole pro udělení "
 "přístupu Claws Mail k seznamu kontaktů Google."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Krok 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr "Klikněte pro otevření autorizační stránky Google v prohlížeči"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Krok 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Vložte kód:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Zásuvný modul GData: Chyba při dotazu na kontakty: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10072,7 +10019,7 @@ msgstr[1] "Přidány %d z"
 msgstr[2] "Přidáno %d z"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
@@ -10080,41 +10027,41 @@ msgstr[0] "1 kontakt pro uložení"
 msgstr[1] "%d kontakty pro uložení"
 msgstr[2] "%d kontaktů pro uložení"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Zásuvný modul GData: Spuštěn asynchronní dotaz na kontakty\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Zásuvný modul GData: Chyba při dotazu na skupiny: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "Zásuvný modul GData: Skupiny obdrženy\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Zásuvný modul GData: Spuštěn asynchronní dotaz na skupiny\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Zásuvný modul GData: Chyba autentizace: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "Zásuvný modul GData: Autentizace úspěšná\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Zásuvný modul GData: Spuštěna interaktivní autentizace\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "Zásuvný modul GData: Obdržen autorizační kód, vyžadující autorizaci\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10122,26 +10069,26 @@ msgstr ""
 "Zásuvný modul GData: Nezískán autorizační kód, požadavek na autorizaci "
 "zrušen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Zásuvný modul GData: Chyba obnovení autentizace: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Zásuvný modul GData: Obnovení autentizace úspěšné\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Zásuvný modul GData: Pokus o obnovení autentizace\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autentizace"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Uživatelské jméno:"
 
@@ -10184,7 +10131,7 @@ msgstr ""
 "\n"
 "Zpětná vazba na <berndth at gmx.de> vítána."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "GData integrace"
 
@@ -10406,7 +10353,7 @@ msgstr "Časový limit požadavku vypršel"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "sekunda(sekund)"
@@ -10693,28 +10640,28 @@ msgid "Specify authentication"
 msgstr "Nastavit autentizaci"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Uživatelské jméno"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Heslo"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -11641,7 +11588,8 @@ msgstr "Vyprší za"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavte '0' pro uložení hesla po celou dobu relace"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minut"
@@ -11800,157 +11748,162 @@ msgstr "Digitální podpis nebyl zkontrolován."
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Jádro: Nelze získat klíč - neběží žádná služba (gpg-agent)."
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "Podpis nemůže být zkontrolován - %s."
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Správný podpis od \"%s\" [ultimate]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Správný podpis od \"%s\" [full]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Správný podpis od \"%s\" [marginal]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Správný podpis od \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "Klíč 0x%s pro ověření tohoto podpisu není dostupný"
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s prošlou platností od \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Správný podpis od \"%s\", ale klíč vypršel"
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Správný podpis od \"%s\", ale klíč byl odvolán"
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Špatný podpis od \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "Klíč 0x%s pro ověření tohoto podpisu není dostupný"
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "Digitální podpis nebyl zkontrolován"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "Chyba při kontrole podpisu: žádný status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Chyba při kontrole podpisu: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Digitálně podepsáno na %s pomocí %s ID klíče %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Správný podpis od uid \"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Klíč s prošlou platností \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Podpis s prošlou platností od uid\"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Odvolaný klíč \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ŠPATNÝ podpis od \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid \"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "Odvolán"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Majitel Trust: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "Žádný klíč!"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint primárního klíče:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "VAROVÁNÍ: Adresa autora podpisu \"%s\" nesouhlasí s DNS záznamem\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Ověřená adresa autora podpisu je \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nelze načíst obsah zprávy, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nelze inicializovat data, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "Specifikace tajného klíče není jednoznačná"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Tajný klíč nebyl nalezen (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Nepodařilo se nastavit tajný klíč: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme protokol '%s' je nepoužitelný: Jádro '%s' není správně nainstalováno."
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -11959,12 +11912,12 @@ msgstr ""
 "Gpgme protokol '%s' je nepoužitelný: Je nainstalováno jádro '%s' verze %s, "
 "ale pro správnou funkci je vyžadována verze %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme protokol '%s' je nepoužitelný (neznámý problém)"
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11972,7 +11925,7 @@ msgstr ""
 "GnuPG není korektně instalováno, nebo je verze příliš stará.\n"
 "Podpora pro OpenPGP je vypnuta."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -11980,11 +11933,11 @@ msgstr ""
 "Chcete-li generovat klíče, musíte nejprve uložit informace o účtu tlačítkem "
 "\"OK\".\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "Nenalezen PGP klíč"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -11994,12 +11947,12 @@ msgstr ""
 "podepisovat zprávy a přijímat šifrované zprávy.\n"
 "Chcete vytvořit nový pár klíčů?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nepodařilo se vygenerovat nový pár klíčů: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12007,11 +11960,11 @@ msgstr ""
 "Generuji nový pár klíčů... Prosím pohybujte myší abyste pomohli generátoru "
 "získat dostatek entropie..."
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Nepodařilo se vygenerovat nový pár klíčů: neznámá chyba"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12024,19 +11977,19 @@ msgstr ""
 "\n"
 "Chcete je uložit na server klíčů?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "Klíč vygenerován"
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "Klíč exportován."
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "Nelze exportovat klíč."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "Export klíče není ve Windows implementován."
 
@@ -12267,9 +12220,9 @@ msgstr "Zobrazit konzoli Pythonu..."
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Procházet"
 
@@ -12575,7 +12528,7 @@ msgstr ""
 "název kanálu."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Ověřit platnost SSL certifikátu"
 
@@ -12732,17 +12685,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Aktualizuji komentáře pro '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Vyžadována autorizace)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (Neuatorizován)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (Nenalezen)"
 
@@ -12878,21 +12831,21 @@ msgid ""
 msgstr ""
 "Upozornění, že záhlaví, jako Předmět, nejsou šifrovány S/MIME systémem."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Oznamování spamu..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Oznamovat spam online..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "Spam zpráva"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12908,19 +12861,19 @@ msgstr ""
 "* spamcop.net\n"
 "* lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Oznamování spamu"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Povolen"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Přeposlat:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -13124,7 +13077,8 @@ msgid "Show"
 msgstr "Zobrazit"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "dnech"
 
@@ -13217,7 +13171,7 @@ msgid "Next month"
 msgstr "Další měsíc"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13250,7 +13204,7 @@ msgstr ""
 "Je možné se přihlásit k webCal kanálu, exportovat schůzky a kalendáře, "
 "publikovat volný/zaneprázdněn informace a dostávat informace od druhých."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Kalendář"
 
@@ -13432,63 +13386,63 @@ msgstr "Účastníci:"
 msgid "Action:"
 msgstr "Akce:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Nová schůzka..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Exportovat kalendář..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_Přihlásit webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "Pře_jmenovat..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "U_pdatovat přihlášení"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "Zobrazení jako _seznam"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "Zobrazení po _týdnech"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "Zobrazení po _měsících"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Schůzky"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "v minulosti"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "dnes"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "zítra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "tento týden"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "později"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13497,17 +13451,17 @@ msgstr ""
 "\n"
 "Jsou plánovány tyto události %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Čas (%d sekund) připojení k %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Chyba %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13520,7 +13474,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13533,7 +13487,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13544,7 +13498,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13555,42 +13509,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nepodařilo se vytvořit složku %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail potřebuje přístup na síť pro update Webcal kanálu."
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Stahování kalendáře pro %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "nové přihlášení"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail potřebuje přístup na síť pro update přihlášení."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Přihlásit WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Vložte WebCal URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Nemohu parsovat URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Skutečně chcete odhlásit?"
 
@@ -13963,81 +13917,81 @@ msgstr "Nemohu exportovat informaci volný/zaneprázdněn."
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Nemohu exportovat volný/zaneprázdněn do '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Připomenutí"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Upozornit mně"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "minut před událostí"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Export kalendáře"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Automaticky exportovat kalendář do"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Nemohu exportovat do lokálního souboru nebo URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Specifikovat lokální soubor nebo URL (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Vložit webcal přihlášení do exportu"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Příkaz pro spuštění po exportu kalendáře"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registrovat Claws kalendář do XFCE Orage"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Povolit Orage (verze vyšší než 4.4) vidět Claws Mail kalendář"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Exportovat jako GNOME shell kalendář server"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr "Registrovat rozhraní D-Bus kalendáře pro export kalendáře Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Volný/zaneprázdněn informace"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Automaticky exportovat volný/zaneprázdněn stav do"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Specifikovat lokální nebo URL (http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Příkaz pro spuštění po exportu stavu volný/zaneprázdněn"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Získat stav volný/zaneprázdněn jiných z"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14046,7 +14000,7 @@ msgstr ""
 "Specifikovat lokální soubor nebo URL (http://server/path/file.ifb). Použijte "
 "%u pro levou část emailové adresy, %d pro doménu"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "Volby SSL"
 
@@ -14101,12 +14055,12 @@ msgstr "nastala chyba v POP3 relaci\n"
 msgid "TOP command unsupported\n"
 msgstr "Příkaz TOP není podporován\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14114,7 +14068,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Diskusní skupiny (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Lokální mbox soubor"
 
@@ -14142,11 +14096,11 @@ msgstr "Celé jméno"
 msgid "Mail address"
 msgstr "Poštovní adresa"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Automatická konfigurace"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -14236,7 +14190,7 @@ msgstr ""
 "Zprávy překračující tento limit budou staženy pouze částečně. Když takovou "
 "zprávu vyberete, budete moci dokončit stažení nebo ji odstranit."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14248,71 +14202,66 @@ msgstr "Maximální počet příspěvků pro stažení"
 msgid "unlimited if 0 is specified"
 msgstr "(pokud je 0, je to neomezený počet)"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Hledaný text:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "adresář pro IMAP server"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(obvykle prázdné)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Zobrazovat pouze odebírané složky"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Mód efektivní šířka pásma (prevence stahování vzdálených značek)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Tento mód používá menší šířku pásma, ale může být pomalejší s některými "
 "servery."
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Při načítání zpracovat zprávy filtrem pro příjem"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Při načítání filtrovat zprávy zásuvnými moduly"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "Zpracovat tento účet při volbě 'Přijmout poštu ze všech účtů'"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Záhlaví"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Generovat číslo zprávy"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Poslat mailovou adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Přidat záhlaví user agent"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentizace (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14320,179 +14269,179 @@ msgstr ""
 "Pokud necháte tyto položky prázdné, bude použito uživatelské jméno a heslo "
 "stejné jako pro příjem."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizace POP3 před odesláním"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "Časový limit pro POP autentizaci: "
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "minut(y)"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Automaticky vložit podpis"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Oddělovač podpisu"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Slovníky pro kontrolu pravopisu"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Výchozí slovník"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Výchozí alternativní slovník"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Předat"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Výchozí systém zabezpečení"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Zprávy vždy digitálně podepsat"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Zprávy vždy šifrovat"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "Odpověď na podepsanou zprávu vždy podepsat"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Odpověď na šifrovanou zprávu vždy šifrovat"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Odesílanou zprávu šifrovat také vaším klíčem"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Odeslané šifrované zprávy uložit jako čistý text"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Nepoužívat SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Použít SSL pro POP3 spojení"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použít příkaz STARTTLS pro spuštění SSL relace"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použít SSL pro IMAP4 spojení"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Použít SSL pro NNTP připojení"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Odesílání (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nepoužítvat SSL (pokud je to ale nutné, použít STARTTLS)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Použít SSL pro SMTP připojení"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Klientské certifikáty"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Certifikát pro příjem"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Soubor klientského certifikátu jako PKCS12 nebo PEM soubor"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Certifikát pro odeslání"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Automaticky přijímat platné certifikáty SSL"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Použít neblokující SSL"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Vypněte, pokud máte problémy se SSL připojením"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "POP3 port"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "IMAP4 port"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Název domény"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14500,123 +14449,123 @@ msgstr ""
 "Jméno domény bude použito pro generované Message-ID a při připojení SMTP "
 "serverů."
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Příkaz pro komunikaci se serverem"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Přesunout smazané maily do koše a okamžitě vymazat"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
 msgstr ""
 "Přesunout smazané maily do koše namísto použití \\Deleted flag, bez vymazání."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Zprávu zaslanou do více skupin označit jako přečtenou a obarvit:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Ukládat odeslané zprávy do"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Ukládat odložené zprávy do"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Ukládat odstraněné zprávy do"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Nebylo zadáno jméno účtu."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "Nebyla zadána poštovní adresa."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "Nebyl zadán SMTP server."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Nebylo zadáno uživatelské číslo."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "Nebyl zadán POP3 server."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "Výchozí složka pro doručování zpráv (inbox) neexistuje."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "Nebyl zadán IMAP4 server."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "Nebyl zadán NNTP server."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "Nebyl zadán název lokálního mailbox souboru."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "Nebyl zadán příkaz pro odeslání."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Přijmout"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablony"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Zabezpečení"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Nastavení pro nový účet"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - nastavení účtu"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Selhalo (špatná adresa)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Soubor s podpisem"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Vybrat soubor s certifikátem"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (modul nebyl načten)"
@@ -14738,20 +14687,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Opravdu chcete odstranit všechny akce?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
+#: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Neuložený záznam"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Záznam nebyl uložen. Chcete přesto okno zavřít?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Pokračovat v úpravách"
 
@@ -15644,7 +15594,7 @@ msgstr "Zobrazení"
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Předvolby"
 
@@ -15788,7 +15738,7 @@ msgstr "Chybové zprávy"
 msgid "Status messages for filtering/processing log"
 msgstr "Zprávy pro záznam filtrování/zpracování"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Ostatní"
 
@@ -16416,15 +16366,15 @@ msgstr "Barva pro složku"
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Vyberte klávesové zkratky"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Vyberte schéma:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16432,35 +16382,35 @@ msgstr ""
 "Můžete modifikovat klávesové zkratky v nabídce tak, že\n"
 "najedete myší nad položku nabídky a stisknete klávesovou zkratku."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Přidat adresu do cíle dvojklikem"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Při ukončení"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Potvrdit ukončení"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Při ukončení vyprázdnit koš"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Varovat pokud jsou zprávy ve frontě"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Klávesové zkratky"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Povolit přizpůsobování klávesových zkratek"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16470,15 +16420,15 @@ msgstr ""
 "vybráním a tiskem dané kombinace.\n"
 "Zrušte volbu, pokud chcete uzamknout všechny stávající klávesové zkratky."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr " Vyberte klávesové zkratky..."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Zpracování metadat"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16486,33 +16436,33 @@ msgstr ""
 "Bezpečný mód se zeptá OS na zapsání metadat přímo na disk;\n"
 "zabrání ztrátě dat při chybě, ale může zabrat nějaký čas."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Bezpečněji"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Rychleji"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Časový limit pro V/V operace se socketem"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Dotázat se před vymazáním koše"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Dotázat se na filtrovací pravidla pro specifické účty při manuálním "
 "filtrování"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Použít bezpečné smazání souboru, když je to možné"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16520,7 +16470,7 @@ msgstr ""
 "Použít bezpečné smazání souboru, když je to možné\n"
 "(program 'shred' není dostupný)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16528,32 +16478,11 @@ msgstr ""
 "Použít program 'shred' pro přepsání souboru náhodnými daty před smazáním. "
 "Zpomalí mazání. Ujistěte se jste přečetl manuál shredu pro výstrahu."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchronizovat offline složky jakmile to bude možné"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Zadejte heslo"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Zadejte heslo"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Zadejte heslo"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Různé"
 
@@ -16810,8 +16739,8 @@ msgstr ""
 "Určete kódování (Content-Transfer-Encoding), které bude použito, pokud "
 "zpráva obsahuje znaky neobsažené v ASCII"
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Odesílání"
 
@@ -17538,35 +17467,35 @@ msgstr "Žádné informace nejsou dostupné"
 msgid "No recipient keys defined."
 msgstr "Nejsou definovány klíče příjemce."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba při dekódování BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Již probíhá pokus o odeslání."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Nepodařilo se otevřít soubor%s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "Hlavička zprávy ve frontě je poškozená."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "Nastala chyba během SMTP relace."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 "Nebyl nalezen účet pro odeslání zprávy a nastala chyba během SMTP relace."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17574,20 +17503,20 @@ msgstr ""
 "Nepodařilo se zjistit informace nutné pro odeslání. Tento e-mail "
 "pravděpodobně nebyl vygenerován programem Claws Mail."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "Nelze vytvořit dočasný soubor pro odesílání do diskusní skupiny."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "Chyba při zápisu dočasného souboru pro odesílání do diskusní skupiny."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Nastala chyba při posílání zprávy do %s."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Filtruji zprávy...\n"
 
@@ -17884,88 +17813,88 @@ msgstr "Vložte text pro nahrazení '%s'"
 msgid "Enter variable"
 msgstr "Zadání proměnných"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Posílám zprávu pomocí příkazu: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nemohu provést příkaz: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Nastala chyba během provádění příkazu: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Připojení"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Provádím POP před SMTP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP před SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Účet '%s': Připojuji se na SMTP server: %s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "Pošta byla úspěšně odeslána."
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Posílám HELO..."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Autentizuji"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Posílám zprávu..."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "Posílám EHLO..."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "Posílám MAIL FROM..."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "Posílám RCPT TO..."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "Posílám DATA..."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Ukončuji..."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Posílám zprávu"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Nastala chyba při posílání zprávy."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18846,12 +18775,12 @@ msgstr "Vyberte odkaz, který chcete otevřít."
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "=?UTF-8?Q?V=C3=ADtejte?= v Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -18946,126 +18875,126 @@ msgstr ""
 " <%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Prosím uveďte název schránky (mailboxu)."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Prosím uveďte své jméno a e-mailovou adresu."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Prosím uveďte název serveru a uživatelské jméno pro příjem zpráv."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Prosím uveďte vaše přihlašovací jméno."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Prosím uveďte jméno SMTP serveru."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Prosím uveďte přihlašovací jméno pro SMTP server."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Vaše jméno:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Vaše mailové adresa:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Vaše organizace:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Mailbox jméno:"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 "Je možno nastavit úplnou cestu, například \"/home/john/Documents/Mail\""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr "Můžete specifikovat číslo portu: \"mail.example.com:25\""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "Adresa SMTP server:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Použít autentizaci"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(prázdné pro použití téhož jako pro příjem)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "SMTP uživatelské jméno:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "SMTP heslo:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Použít SSL pro připojení k SMTP serveru"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Použít SSL pomocí STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Klientský SSL certifikát (volitelné)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Adresu serveru:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Lokální mailbox:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Typ serveru:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr "Můžete specifikovat číslo portu: \"mail.example.com:110\""
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Použít SSL pro připojení k serveru pro příjem zpráv"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "Adresář IMAP serveru:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Zobrazovat pouze odebírané složky"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19073,15 +19002,15 @@ msgstr ""
 "Varování: tato verze Claws Mail\n"
 "byla zkompilována bez podpory IMAP."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Průvodce nastavením Claws Mail"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Vítejte v Claws Mail"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19094,31 +19023,31 @@ msgstr ""
 "Začneme nastavením několika základních informací o Vás a Vašem poštovním "
 "účtu, takže budete moci začít používat Claws Mail za méně než pět minut."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "O Vás"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Tučně nadepsaná pole musí být vyplněna"
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Příjem zpráv"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Odesílání zpráv"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Ukládání zpráv na disk"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Konfigurace dokončena"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19126,9 +19055,6 @@ msgstr ""
 "Claws Mail je nyní připraven.\n"
 "Stiskněte uložit a můžeme začít."
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Podpis nemůže být zkontrolován - %s."
-
 #~ msgid "+_Insert"
 #~ msgstr "+_Vložit"
 
diff --git a/po/de.po b/po/de.po
index 6ffc4d3..ba5eedd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 23:04+0100\n"
 "PO-Revision-Date: 2015-12-15 13:15+0100\n"
 "Last-Translator: Thomas Bellmann <ThomasBellmann at gmx.net>\n"
 "Language-Team: Deutsch <>\n"
@@ -33,7 +33,7 @@ msgstr ""
 # "message body" -> "Textkörper" or "Nachrichtenkörper"?
 # "failed" -> "schlug fehl" or "fehlgeschlagen"?
 #
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -41,15 +41,15 @@ msgstr ""
 "Einige Editor-Fenster sind geöffnet.\n"
 "Bitte schließen Sie vor dem Bearbeiten von Email-Konten alle Editor-Fenster."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Ordner kann nicht erstellt werden."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Konten bearbeiten"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -59,43 +59,43 @@ msgstr ""
 "Das Kontrollkästchen zeigt an, welche Konten einbezogen sind. Fette Schrift "
 "markiert das Standardkonto."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr "_Als Standardkonto setzen"
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Konten mit ferngelegenen Ordnern sind nicht kopierbar."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie von %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Möchten Sie das Konto '%s' wirklich löschen?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Unbenannt)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Konto löschen"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Abrufen' holt Nachrichten von den gewählten Konten ab"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -108,11 +108,11 @@ msgstr "'Abrufen' holt Nachrichten von den gewählten Konten ab"
 msgid "Name"
 msgstr "Name"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -165,10 +165,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -431,18 +431,18 @@ msgid "_Book"
 msgstr "Adressb_uch"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "E_xtras"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -481,13 +481,13 @@ msgstr "Adressbuch _löschen"
 msgid "_Save"
 msgstr "_Speichern"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Schließen"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "_Alle auswählen"
 
@@ -496,7 +496,7 @@ msgid "C_ut"
 msgstr "_Ausschneiden"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopieren"
@@ -546,8 +546,8 @@ msgstr "Duplikate finden..."
 msgid "Edit custom attributes..."
 msgstr "Benutzerdefinierte Angaben..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "Ü_ber"
 
@@ -663,7 +663,7 @@ msgstr "Stärkere Authentifizierung erforderlich"
 msgid "Sources"
 msgstr "Quellen"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adressbuch"
@@ -714,7 +714,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Ordner löschen"
 
@@ -827,7 +827,7 @@ msgid "Person"
 msgstr "Person"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Ordner"
 
@@ -963,19 +963,19 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Fehler bei Aktualisierung. Änderungen nicht ins Verzeichnis geschrieben."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9473
 msgid "Notice"
 msgstr "Anmerkung"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
+#: src/alertpanel.c:159 src/compose.c:5680 src/compose.c:6203
+#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868 src/plugins/pgpcore/sgpgme.c:750
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5621 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "Fehler"
 
@@ -1007,43 +1007,43 @@ msgstr "LDAP Name"
 msgid "Attribute Value"
 msgstr "Zusatzangabe"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Nichts"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "ein Betrachter"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "ein MIME-Parser"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "Ordner"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "Filter"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "ein Datenschutzinterface"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "ein Melder"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "ein Werkzeug"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "Dinge"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1051,25 +1051,25 @@ msgstr ""
 "Dieses Plugin stellt %s (%s) zur Verfügung, was schon vom Plugin %s "
 "bereitgestellt wird."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "Plugin ist bereits geladen"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Fehler bei Speicherzuweisung für das Plugin"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Diese Modul ist nicht unter GPL v3 oder einer kompatiblen Folgelizenz "
 "zugelassen."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Dies ist ein Plugin für Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1078,7 +1078,7 @@ msgstr ""
 "Ihr Claws Mail ist neuer als die Version, mit der das Plugin '%s' kompiliert "
 "wurde."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1086,16 +1086,16 @@ msgstr ""
 "Ihr Claws Mail ist neuer als die Version, mit der das Plugin kompiliert "
 "wurde."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Ihre Claws Mail-Version ist zu alt für das Plugin '%s'."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Ihre Claws Mail-Version ist zu alt für das Plugin."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "SSL-Verbindung schlug fehl\n"
 
@@ -1484,7 +1484,7 @@ msgstr "_Entfernen"
 msgid "_Properties..."
 msgstr "_Eigenschaften..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_Nachricht"
 
@@ -1552,7 +1552,7 @@ msgstr "mit _Umbruch"
 msgid "_Unwrapped"
 msgstr "_ohne Umbruch"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Alles auswählen"
@@ -1617,7 +1617,7 @@ msgstr "Zeile löschen"
 msgid "Delete to end of line"
 msgstr "Bis zum Ende der Zeile löschen"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Suchen"
@@ -1662,47 +1662,47 @@ msgstr "Datenschutz_system"
 msgid "_Priority"
 msgstr "_Priorität"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Zei_chenkodierung"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Westeuropäisch"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Thailändisch"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adressbuch"
 
@@ -1710,7 +1710,7 @@ msgstr "_Adressbuch"
 msgid "_Template"
 msgstr "Vorlage"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "A_ktionen"
 
@@ -1746,11 +1746,11 @@ msgstr "_Lineal anzeigen"
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Alle"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "Absender"
 
@@ -1774,27 +1774,27 @@ msgstr "_Gering"
 msgid "_Lowest"
 msgstr "_Sehr gering"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automatisch"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Mitteleuropäisch (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Türkisch (ISO-8859-_9)"
 
@@ -1846,47 +1846,47 @@ msgstr "Der Körper der \"Weiterleiten\"-Vorlage hat eine Fehler in Zeile %d."
 msgid "Fw: multiple emails"
 msgstr "Fw: mehrere E-Mails"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Der Körper der \"Umleiten\"-Vorlage hat einen Fehler in Zeile %d."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4935 src/compose.c:4937
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Newsgruppen:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Followup an:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "In-Reply-To:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4932 src/compose.c:4940
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "An:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Datei konnte nicht angehängt werden (Zeichensatzkonvertierung schlug fehl)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1901,16 +1901,16 @@ msgstr[1] ""
 "Die folgenden Dateien wurden angehängt: \n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Das \"Zitatzeichen\" der Vorlage ist ungültig."
 
-#: src/compose.c:3605
+#: src/compose.c:3602
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Die Größe der Datei '%s' ist nicht ermittelbar."
 
-#: src/compose.c:3616
+#: src/compose.c:3613
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1919,57 +1919,57 @@ msgstr ""
 "Sie sind dabei eine %s große Datei in den Nachrichtenkörper einzufügen. "
 "Möchten Sie das wirklich tun?"
 
-#: src/compose.c:3619
+#: src/compose.c:3616
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3617 src/compose.c:10529 src/compose.c:11390
 msgid "_Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:3744
+#: src/compose.c:3741
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:3745
+#: src/compose.c:3742
 msgid "Empty file"
 msgstr "Leere Datei"
 
-#: src/compose.c:3746
+#: src/compose.c:3743
 msgid "_Attach anyway"
 msgstr "Trotzdem _anhängen"
 
-#: src/compose.c:3755
+#: src/compose.c:3752
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:3782
+#: src/compose.c:3779
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4772 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Bearbeitet]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4779 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Nachricht verfassen%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4782 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[kein Betreff] - Nachricht verfassen%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4784 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Nachricht verfassen"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4811 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1977,51 +1977,51 @@ msgstr ""
 "Kein Konto zum Versenden von E-Mails angegeben.\n"
 "Bitte wählen Sie einen E-Mail-Konto vor dem Senden."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5031 src/compose.c:5063 src/compose.c:5105
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:5035
+#: src/compose.c:5032
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Der einzige Empfänger ist die Standard-Cc-Adresse. Trotzdem senden?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5033 src/compose.c:5065 src/compose.c:5098 src/compose.c:5622
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Senden"
 
-#: src/compose.c:5067
+#: src/compose.c:5064
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Der einzige Empfänger ist die Standard-Bcc-Adresse. Trotzdem senden?"
 
-#: src/compose.c:5084
+#: src/compose.c:5081
 msgid "Recipient is not specified."
 msgstr "Kein Empfänger angegeben."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5100 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Postausgang"
 
-#: src/compose.c:5104
+#: src/compose.c:5101
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Betreff ist leer. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5102 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Trotzdem senden?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Trotzdem vorspeichern?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5105 src/toolbar.c:425
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5158 src/compose.c:9993
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2031,7 +2031,7 @@ msgstr ""
 "\n"
 "Zeichensatz-Konvertierung schlug fehl."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5161 src/compose.c:9996
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2041,7 +2041,7 @@ msgstr ""
 "\n"
 "Schlüssel des Empfängers nicht erhältlich."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5167 src/compose.c:9990
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2052,7 +2052,7 @@ msgstr ""
 "\n"
 "Fehler bei digitaler Signatur: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5170
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2063,11 +2063,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5172
 msgid "Could not queue message for sending."
 msgstr "Nachricht konnte nicht zum Senden vorgespeichert werden."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5187 src/compose.c:5247
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2076,7 +2076,7 @@ msgstr ""
 "gesendet. Benutzen Sie 'Ausgehende Nachrichten senden'\n"
 "aus dem Hauptmenü zum Wiederholen."
 
-#: src/compose.c:5246
+#: src/compose.c:5243
 #, c-format
 msgid ""
 "%s\n"
@@ -2086,7 +2086,7 @@ msgstr ""
 "Benutzen Sie \"Vorgespeicherte Nachrichten senden\" vom Hauptfenster zum "
 "Wiederholen."
 
-#: src/compose.c:5621
+#: src/compose.c:5618
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2097,7 +2097,7 @@ msgstr ""
 "spezifizierten Zeichensatz %s konvertiert werden.\n"
 "Als %s senden?"
 
-#: src/compose.c:5679
+#: src/compose.c:5676
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2110,73 +2110,73 @@ msgstr ""
 "\n"
 "Trotzdem senden?"
 
-#: src/compose.c:5790
+#: src/compose.c:5787
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "E-Mail konnte nicht verschlüsselt werden: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5908
 msgid "Encryption warning"
 msgstr "Verschlüsselungshinweis"
 
-#: src/compose.c:5912
+#: src/compose.c:5909
 msgid "C_ontinue"
 msgstr "F_ortfahren"
 
-#: src/compose.c:5961
+#: src/compose.c:5958
 msgid "No account for sending mails available!"
 msgstr "Kein Konto zum Versenden von E-Mails vorhanden!"
 
-#: src/compose.c:5970
+#: src/compose.c:5967
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Gewähltes Konto ist nicht NNTP: Absenden schlug fehl."
 
-#: src/compose.c:6205
+#: src/compose.c:6202
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Der Anhang %s existiert nicht mehr. Ignorieren?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6203 src/mainwindow.c:651 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Senden abbrechen"
 
-#: src/compose.c:6206
+#: src/compose.c:6203
 msgid "Ignore attachment"
 msgstr "Anhang ignorieren"
 
 # Maybe not completely correct translated but I could not get the context...
-#: src/compose.c:6246
+#: src/compose.c:6243
 #, c-format
 msgid "Original %s part"
 msgstr "Originaler %s-Teil"
 
-#: src/compose.c:6824
+#: src/compose.c:6825
 msgid "Add to address _book"
 msgstr "Zum Adress_buch hinzufügen"
 
-#: src/compose.c:6985
+#: src/compose.c:6986
 msgid "Delete entry contents"
 msgstr "Inhalt des Eintrags löschen"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6990 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Mit <tab> automatisch aus dem Adressbuch vervollständigen"
 
-#: src/compose.c:7204
+#: src/compose.c:7212
 msgid "Mime type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:7273
+#: src/compose.c:7281
 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7318 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2187,23 +2187,23 @@ msgstr "Nachricht speichern unter "
 msgid "_Browse"
 msgstr "_Durchsuchen"
 
-#: src/compose.c:7783
+#: src/compose.c:7791
 msgid "Hea_der"
 msgstr "_Kopfzeile"
 
-#: src/compose.c:7788
+#: src/compose.c:7796
 msgid "_Attachments"
 msgstr "_Anhänge"
 
-#: src/compose.c:7802
+#: src/compose.c:7810
 msgid "Othe_rs"
 msgstr "_Weiteres"
 
-#: src/compose.c:7817
+#: src/compose.c:7825
 msgid "S_ubject:"
 msgstr "B_etreff:"
 
-#: src/compose.c:8041
+#: src/compose.c:8049
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2212,19 +2212,19 @@ msgstr ""
 "Rechtschreibprüfung konnte nicht gestartet werden.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8188
 msgid "_From:"
 msgstr "V_on:"
 
-#: src/compose.c:8197
+#: src/compose.c:8205
 msgid "Account to use for this email"
 msgstr "Für diese E-Mail zu verwendendes Konto"
 
-#: src/compose.c:8199
+#: src/compose.c:8207
 msgid "Sender address to be used"
 msgstr "Zu benutzende Absenderadresse"
 
-#: src/compose.c:8365
+#: src/compose.c:8373
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2233,68 +2233,68 @@ msgstr ""
 "Das Datenschutzsystem '%s' kann nicht geladen werden. Es wird nicht möglich "
 "sein, diese Nachricht zu signieren oder zu verschlüsseln."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Keines"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8575 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Der Text der Vorlage hat einen Fehler in Zeile %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8691
 msgid "Template From format error."
 msgstr "Formatierungsfehler in Von-Vorlage."
 
-#: src/compose.c:8701
+#: src/compose.c:8709
 msgid "Template To format error."
 msgstr "Formatierungsfehler in An-Vorlage."
 
-#: src/compose.c:8719
+#: src/compose.c:8727
 msgid "Template Cc format error."
 msgstr "Formatierungsfehler in Cc-Vorlage."
 
-#: src/compose.c:8737
+#: src/compose.c:8745
 msgid "Template Bcc format error."
 msgstr "Formatierungsfehler in Bcc-Vorlage."
 
-#: src/compose.c:8755
+#: src/compose.c:8763
 msgid "Template Reply-To format error."
 msgstr "Formatierungsfehler in Reply-to-Vorlage."
 
-#: src/compose.c:8774
+#: src/compose.c:8782
 msgid "Template subject format error."
 msgstr "Formatierungsfehler in Betreff-Vorlage."
 
-#: src/compose.c:9043
+#: src/compose.c:9051
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME-Typ."
 
-#: src/compose.c:9058
+#: src/compose.c:9066
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:9132
+#: src/compose.c:9140
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:9149
+#: src/compose.c:9157
 msgid "MIME type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:9190
+#: src/compose.c:9198
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:9210
+#: src/compose.c:9218
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:9211
+#: src/compose.c:9219
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:9462
+#: src/compose.c:9470
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2305,15 +2305,15 @@ msgstr ""
 "Prozess beenden?\n"
 "Prozessgruppen-ID: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9959 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail benötigt Zugang zum Netz, um diese E-Mail zu senden."
 
-#: src/compose.c:9977
+#: src/compose.c:9985
 msgid "Could not queue message."
 msgstr "Nachricht konnte nicht vorgespeichert werden."
 
-#: src/compose.c:9979
+#: src/compose.c:9987
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2323,15 +2323,15 @@ msgstr ""
 "Nachricht konnte nicht vorgespeichert werden\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10165
 msgid "Could not save draft."
 msgstr "Entwurf konnte nicht gespeichert werden."
 
-#: src/compose.c:10161
+#: src/compose.c:10169
 msgid "Could not save draft"
 msgstr "Entwurf konnte nicht gespeichert werden"
 
-#: src/compose.c:10162
+#: src/compose.c:10170
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2339,24 +2339,24 @@ msgstr ""
 "Entwurf konnte nicht gespeichert werden.\n"
 "Möchten Sie das Beenden zurücknehmen oder die Nachricht verwerfen?"
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Cancel exit"
 msgstr "Beenden _zurücknehmen"
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Discard email"
 msgstr "_Nachricht verwerfen"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10332 src/compose.c:10346
 msgid "Select file"
 msgstr "Datei auswählen"
 
-#: src/compose.c:10352
+#: src/compose.c:10360
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 
-#: src/compose.c:10354
+#: src/compose.c:10362
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2365,54 +2365,54 @@ msgstr ""
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 
-#: src/compose.c:10441
+#: src/compose.c:10449
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
-#: src/compose.c:10442
+#: src/compose.c:10450
 msgid "This message has been modified. Discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10451 src/compose.c:10455
 msgid "_Save to Drafts"
 msgstr "Entwurf _speichern"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: src/compose.c:10446
+#: src/compose.c:10454
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Diese Nachricht wurde geändert. Die letzten Änderungen speichern?"
 
-#: src/compose.c:10447
+#: src/compose.c:10455
 msgid "_Don't save"
 msgstr "_Nicht Speichern"
 
-#: src/compose.c:10518
+#: src/compose.c:10526
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Möchten Sie die Vorlage '%s' anwenden?"
 
-#: src/compose.c:10520
+#: src/compose.c:10528
 msgid "Apply template"
 msgstr "Vorlage anwenden"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10529 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "Ersetzen"
 
-#: src/compose.c:11379
+#: src/compose.c:11387
 msgid "Insert or attach?"
 msgstr "Einfügen oder Anhängen?"
 
-#: src/compose.c:11380
+#: src/compose.c:11388
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2420,16 +2420,16 @@ msgstr ""
 "Wollen Sie den Inhalt der Datei in den Nachrichtenkörper einfügen oder an "
 "die Nachricht anhängen?"
 
-#: src/compose.c:11382
+#: src/compose.c:11390
 msgid "_Attach"
 msgstr "_Anhang"
 
-#: src/compose.c:11599
+#: src/compose.c:11607
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Zitat-Formatierungsfehler in Zeile %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11902
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2649,8 +2649,8 @@ msgid " Check File "
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Datei"
 
@@ -2798,7 +2798,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2983,7 +2983,7 @@ msgstr ""
 "Die maximale Zahl von Einträgen, die im Suchresultat ausgegeben werden "
 "sollen."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Allgemein"
 
@@ -3119,15 +3119,15 @@ msgid "Stylesheet"
 msgstr "Stylesheet"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "ohne"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Standard"
 
@@ -3638,27 +3638,27 @@ msgstr "Papierkorb"
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bearbeitung läuft (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopiere %s nach %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Verschiebe %s nach %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "aktualisiere Pufferspeicher für %s..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Bearbeitung läuft..."
 
@@ -3684,7 +3684,7 @@ msgstr "NeuerOrdner"
 #: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
 #: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
@@ -3692,7 +3692,7 @@ msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Der Ordner '%s' existiert bereits."
@@ -3716,7 +3716,7 @@ msgstr "Rekursiv alle als gelesen marki_eren"
 msgid "R_un processing rules"
 msgstr "Verarbeit_ungsregel anwenden"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_Ordner durchsuchen..."
 
@@ -3775,12 +3775,12 @@ msgstr ""
 msgid "Mark all as read"
 msgstr "Alle als gelesen markieren"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Ordner %s%c%s wird durchsucht..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Ordner %s wird durchsucht..."
@@ -3827,7 +3827,7 @@ msgstr "Öffne Ordner %s..."
 msgid "Folder could not be opened."
 msgstr "Ordner konnte nicht geöffnet werden."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Papierkorb leeren"
 
@@ -4070,7 +4070,7 @@ msgstr ""
 "Locale: %s (Zeichensatz: %s)\n"
 "Betriebssystem: unbekannt"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "Das Claws Mail Team"
 
@@ -5066,9 +5066,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -5106,14 +5106,14 @@ msgstr "Aktivierte Plugins"
 msgid "Page Index"
 msgstr "Seitenindex"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Ausblenden"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5556,234 +5556,193 @@ msgstr "Dateigröße:"
 msgid "Load Image"
 msgstr "Bild laden"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4-Verbindung unterbrochen\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP Fehler auf %s:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr " authentifiziert\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr " nicht authentifiziert\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr " schlechter Zustand\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr " stream-Fehler\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr "Parsingfehler (sehr wahrscheinlich ein nicht RFC-konformer Server)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr "Verbindung verweigert\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr "Speicherfehler\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr "Fataler Fehler\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr "Protokollfehler (sehr wahrscheinlich ein nicht RFC-konformer Server)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr "Verbindung nicht akzeptiert\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " APPEND-Fehler\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " NOOP-Fehler\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " LOGOUT-Fehler\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " CAPABILITY-Fehler\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " CHECK-Fehler\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " CLOSE-Fehler\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " EXPUNGE-Fehler\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " COPY-Fehler\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " UID COPY-Fehler\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " CREATE-Fehler\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " DELETE-Fehler\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " EXAMINE-Fehler\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " FETCH-Fehler\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " UID FETCH-Fehler\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " LIST-Fehler\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " LOGIN-Fehler\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr " LSUB-Fehler\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " RENAME-Fehler\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " SEARCH-Fehler\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " UID SEARCH-Fehler\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " SELECT-Fehler\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " STATUS-Fehler\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " STORE-Fehler\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " UID STORE-Fehler\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " SUBSCRIBE-Fehler\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " UNSUBSCRIBE-Fehler\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " STARTTLS-Fehler\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " INVAL-Fehler\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " EXTENSION-Fehler\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " SASL-Fehler\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " SSL-Fehler\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr "Unbekannter Fehler [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5795,7 +5754,7 @@ msgstr ""
 "CRAM-MD5-Logins nur möglich, wenn libetpan mit SASL-Unterstützung kompiliert "
 "wurde und das CRAM-MD5 SASL-Plugin installiert ist."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5807,7 +5766,7 @@ msgstr ""
 "DIGEST-MD5-Logins sind nur möglich, wenn libetpan mit SASL-Unterstützung "
 "kompiliert wurde und das DIGEST-MD5 SASL-Plugin installiert ist."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5819,51 +5778,38 @@ msgstr ""
 "SCRAM-SHA-1 -Logins sind nur möglich, wenn libetpan mit SASL-Unterstützung "
 "kompiliert wurde und das SCRAM-SHA-1 -Plugin installiert ist."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"CRAM-MD5-Logins nur möglich, wenn libetpan mit SASL-Unterstützung kompiliert "
-"wurde und das CRAM-MD5 SASL-Plugin installiert ist."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Verbindung zu %s schlug fehl: Login abgelehnt.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Verbindung zu %s schlug fehl: Login abgelehnt.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Verbindung zu %s schlug fehl"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail benötigt eine Netzwerkverbindung, um auf den IMAP-Server "
 "zuzugreifen."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5877,104 +5823,104 @@ msgstr ""
 "Soll die Verbindung zu diesem Server fortgesetzt werden? Die Kommunikation "
 "wäre nicht geschützt."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "Das Verbinden _fortsetzen"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Konto '%s': Verbinde mit IMAP4-Server: %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Keine Verbindung zum IMAP4-Server: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung zum IMAP4-Server: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "TLS-Sitzung konnte nicht gestartet werden.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Einloggen am IMAP-Server %s schlug fehl.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Einloggen am IMAP-Server %s schlug fehl."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Nachrichten werden hinzugefügt..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert..."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "Gelöscht-Merker nicht setzbar\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "Löschen schlug fehl\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Suche nach nicht abonnierten Ordnern in %s..."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Suche nach Unterordnern von %s..."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Mailbox kann nicht erstellt werden: LIST schlug fehl\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "Mailbox kann nicht erstellt werden\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s kann nicht in %s umbenannt werden\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "Mailbox kann nicht gelöscht werden\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST schlug fehl\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Nachrichten-Merker setzen..."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Ordner %s kann nicht ausgewählt werden\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "Server erfordert TLS zum Einloggen.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Ressourcen können nicht aktualisiert werden.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5983,20 +5929,20 @@ msgstr ""
 "Verbindung zu %s schlug fehl: Server erfordert TLS, aber Claws Mail wurde "
 "ohne TLS-Unterstützung kompiliert.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Serverlogins sind deaktiviert.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Nachricht wird abgeholt..."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Gelöscht-Merker nicht setzbar: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6048,7 +5994,7 @@ msgstr "Ab_onnements"
 msgid "_Subscribe..."
 msgstr "_Abonnieren..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "_Abmelden..."
 
@@ -6086,20 +6032,20 @@ msgstr "Eigenschaften des Überordners übernehmen"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Neuer Name für '%s':"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6122,7 +6068,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ordner '%s' kann nicht entfernt werden."
@@ -6149,7 +6095,7 @@ msgstr "_Suchen"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Wählen Sie einen Unterordner von %s zum Abonnieren: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Abonnieren"
 
@@ -6379,56 +6325,56 @@ msgstr "Pine-Datei auswählen"
 msgid "Import Pine file into Address Book"
 msgstr "Pine-Datei ins Adressbuch importieren"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail benötigt Zugang zum Netzwerk, um Mails abzurufen."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s schlug fehl\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Hole neue Nachrichten"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Bereit"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Abholen erfolgt"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Erledigt (%d Nachricht (%s) empfangen)"
 msgstr[1] "Erledigt (%d Nachrichten (%s) empfangen)"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Erledigt (keine neuen Nachrichten)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Verbindung schlug fehl"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Authentifizierung schlug fehl"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Zeitüberschreitung"
 
@@ -6464,7 +6410,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung zu POP3-Server: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Authentifizierung erfolgt..."
 
@@ -6489,7 +6435,7 @@ msgstr "Anzahl neuer Nachrichten wird geholt (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Anzahl neuer Nachrichten wird geholt (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Ende"
 
@@ -6540,7 +6486,7 @@ msgstr "Socket-Fehler"
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-Fehler beim Verbinden mit %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Verbindung durch Gegenseite getrennt."
 
@@ -6562,11 +6508,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Authentifizierung schlug fehl."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6575,7 +6521,7 @@ msgstr ""
 "Authentifizierung schlug fehl:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6933,818 +6879,813 @@ msgstr "NetworkManager: Netzwerk ist online.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: Netzwerk ist offline.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Datei"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "_Ansicht"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Konfiguration"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "_Neue Mailbox"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Reihenfolge der Mailboxen ändern..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "Mbox-Datei _importieren..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "In Mbox-Datei e_xportieren..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "Auswahl in Mbox-Datei _exportieren..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Alle _Papierkörbe leeren"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Speichere E-Mail als..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_Speichere Teil als..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "D_atei/Seite einrichten..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "Ordner syn_chronisieren"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "_Beenden"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "Diskurs aus_wählen"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "In aktueller _Nachricht suchen..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_Schnellsuche"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "Ein- oder Aus_blenden"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "_Werkzeugleiste"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "Angezeigte _Spalten"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "in _Ordnerliste..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "in _Nachrichtenliste..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "Bildschirm-La_yout"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Sortieren nach"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "Diskurse na_ch Betreff aufbauen"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "Alle Diskurse _ausklappen"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "Alle Diskurse _einklappen"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "Ge_he zu"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "voriger N_achricht"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "nächster Na_chricht"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "vorig_er ungelesener Nachricht"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "nächster un_gelesener Nachricht"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "_voriger neuer Nachricht"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "nächster neuer Nachr_icht"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "voriger mar_kierter Nachricht"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "nächster _markierter Nachricht"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "voriger ei_ngefärbter Nachricht"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "nächster eingefärbter Nach_richt"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "voriger geöffneter Nachricht"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "nächster geöffneter Nachricht"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "übergeordne_ter Nachricht"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "nächstem _ungelesenen Ordner"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "anderem _Ordner..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Nächster Teil"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Voriger Teil"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Blättere zu"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "voriger Zeile"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "nächster Zeile"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "voriger Seite"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "nächster Seite"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "De_kodierung"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "Öffnen in neuem _Fenster"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "_Quelltext anzeigen"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Nachrichtenteil"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Als Text darstellen"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Öffnen"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Öffnen mit..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "_Zitate"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "Darstellung akt_ualisieren"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "_Empfangen"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Vom a_ktuellen Konto"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Von _allen Konten"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "Empfang _abbrechen"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "Vorgespei_cherte Nachrichten senden"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "Neue _Nachricht verfassen"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Neue _News-Nachricht verfassen"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "An_twort an"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Mailingliste"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Fo_llow-up und Antwort an"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "We_iterleiten als Anhang"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "_Umleiten"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "Mailin_gliste"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "_Verfassen"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "A_bmelden"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Archiv ansehen"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "Kontakt"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "_Verschieben..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Kopieren..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "In den _Papierkorb verschieben"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "_Löschen..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Diskurs in den _Papierkorb verschieben"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "Diskurs e_ntfernen"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "New_s-Beitrag annullieren"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_Markieren"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_Demarkieren"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "_Als ungelesen markieren"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Als g_elesen markieren"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Alle als _gelesen markieren"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Dis_kurs ignorieren"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Diskurs _nicht ignorieren"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Diskurs be_obachten"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Disk_urs nicht beobachten"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Als _Spam markieren"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Als Nic_ht-Spam markieren"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "_Sperren"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "En_tsperren"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "_Farbmarkierung"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Nachrichten-Mar_ken"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "Ü_berarbeiten"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Digitale Signatur prüfen"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "A_bsender ins Adressbuch übernehmen"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "Adressen sa_mmeln"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "Aus aktuellem Ordner..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "Aus gewählten Nachrichten..."
 
 # msgid "/_Tools/---"
 # msgstr "/E_xtras/---"
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "All_e Nachrichten im Ordner filtern"
 
 # msgid "/_Tools/---"
 # msgstr "/E_xtras/---"
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "_Gewählte Nachrichten filtern"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Ordner-Verarbeitungsregeln _anwenden"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Filterre_gel erstellen"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatisch"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "_Nach Absender"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Nach _Empfänger"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "Nach _Betreff"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "_Verarbeitungsregel erstellen"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "_URLs anzeigen..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "Alle _Ordner auf neue Nachrichten prüfen"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "_Doppelte Nachrichten löschen"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "In gewähltem Ordner"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "In allen Ordnern"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "Ausfü_hren"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "_Löschen"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "SSL-_Zertifikate"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "_Filterprotokoll"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "_Netzwerkprotokoll"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "Alle _Sitzungskennwörter verwerfen"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "Alle _Sitzungskennwörter verwerfen"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "Aktuelles Konto _wechseln"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "Einstellungen für akt_uelles Konto..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Neues _Konto erstellen..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "Konten _bearbeiten..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "_Einstellungen..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "_Vorverarbeitungsregeln..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "_Nachverarbeitungsregeln..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Filtern..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "V_orlagen..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Aktionen..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "_Marken..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "Erweiterungen / _Plugins..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Handbuch"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "_Online-FAQ mit Nutzerbeiträgen"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "_Symbolerklärung"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Als Standardanwendung setzen"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "_Offline arbeiten"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Men_üleiste"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "Nachrichtenansicht"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "Statusanzeige"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Spaltenköpfe"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "_Diskurs-Ansicht"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Gelesene Diskurse verbergen"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "_Gelesene Nachrichten verbergen"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Gelöschte _Nachrichten verbergen"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "_Vollbildansicht"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Alle einklappen"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Ab _2. Ebene einklappen"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Ab _3. Ebene einklappen"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Text _unter Symbolen"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Text _neben Symbolen"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Nur _Symbole"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "Nur _Text"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Standard"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Drei Spalten"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "_Breite Nachrichtenansicht"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "Breite _Nachrichtenliste"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "_Ein-Feld-Anzeige"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "Nummer"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "Größe"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "_Datum"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Diskursdatum"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "_Betreff"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "Farbmarkierung"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Marke"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "_Markierung"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "Status"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "Anhang"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Bewertung"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Sperre"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "Nicht sortieren"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Absteigend"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_Automatisch erkennen"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Marken anwenden..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Es sind einige Fehler aufgetreten. Hier klicken um das Log anzusehen."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Sie sind online. Das Symbol anklicken, um offline zu gehen"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "Sie sind offline. Das Symbol anklicken, um online zu gehen"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Konto wählen"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Netzwerkprotokoll"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Filter-/Verarbeitungsprotokoll"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "Filterprotokoll aktiviert\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "Filterprotokoll deaktiviert.\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "keine"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Alle Nachrichten in Papierkörben löschen?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Nicht beenden"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7754,18 +7695,18 @@ msgstr ""
 "Wird eine existierende Mailbox angegeben,\n"
 "wird sie automatisch durchsucht."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Die Mailbox '%s' existiert bereits."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7775,79 +7716,79 @@ msgstr ""
 "Möglicherweise existieren einige Dateien bereits oder Sie haben keine "
 "Schreibrechte"
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "keine Nachrichten erlaubt"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Mbox-Import schlug fehl."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "Export in Mbox schlug fehl."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail beenden?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Ordner-Synchronisation"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Sollen die Ordner jetzt synchronisiert werden?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Synchronisieren"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Lösche doppelte Nachrichten..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d doppelte Nachricht in Ordner %d gelöscht.\n"
 msgstr[1] "%d doppelte Nachrichten in Ordner %d gelöscht.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Ordnerregeln vorausgehende Verarbeitungsregeln"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Ordnerregeln nachfolgende Verarbeitungsregeln"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Filter-Konfiguration"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Registrierung als Standardanwendung schlug fehl: Pfad zur ausführbaren Datei "
 "wurde nicht gefunden."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail wurde als Standardanwendung eingetragen."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Eintragung als Standardanwendung schlug fehl: es konnte nicht in die "
 "Registry geschrieben werden."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7927,7 +7868,7 @@ msgstr "Mbox-Datei überschreiben "
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Die Datei existiert bereits. Soll sie überschrieben werden?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Überschreiben"
@@ -7973,19 +7914,19 @@ msgstr "Ende der Nachricht erreicht; vom Anfang fortsetzen?"
 msgid "Search finished"
 msgstr "Suche beendet"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "_Neue Nachricht verfassen"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Nachrichtenansicht"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<Kein Antwortpfad gefunden>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8000,11 +7941,11 @@ msgstr ""
 "Antwortpfad: %s\n"
 "Es wird geraten, die Empfangsbestätigung nicht zu senden."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "Nicht Sen_den"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -8016,48 +7957,48 @@ msgstr ""
 "offiziell an Sie adressiert.\n"
 "Es wird empfohlen, keine  Empfangsbestätigung zu senden."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Nachricht (%s) wird abgeholt..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Entschlüsseln schlug fehl: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Nachricht entspricht nicht dem MIME-Standard und könnte falsch dargestellt "
 "werden."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Speichern als"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Existierende Datei überschreiben?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Datei '%s' konnte nicht gespeichert werden."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Alle %s anzeigen."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Nur das erste Megabyte an Text wird angezeigt."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8065,19 +8006,19 @@ msgstr ""
 "Sie haben eine Empfangsbestätigung für diese Nachricht: Der Empfänger hat "
 "sie geöffnet."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Sie haben eine Empfangsbestätigung für diese Nachricht erbeten."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Diese Nachricht erwartet eine Empfangsbestätigung."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Bestätigung senden"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8085,7 +8026,7 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen\n"
 "und auf dem Server gelöscht."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8094,15 +8035,15 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Zum Herunterladen markieren"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Zum Löschen markieren"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8111,12 +8052,12 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß und wird heruntergeladen."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Demarkieren"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8125,11 +8066,11 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s und wird gelöscht werden."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8141,19 +8082,19 @@ msgstr ""
 "Bitte wählen Sie, welches Konto Sie zum Senden der Empfangsbestätigung "
 "verwenden möchten:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "Benachrichtigung _senden"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Drucken schlug fehl: Die Nachricht enthält keinen Text."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8161,7 +8102,7 @@ msgstr ""
 "\n"
 "  Keine Nachrichten in diesem Ordner"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8169,7 +8110,7 @@ msgstr ""
 "\n"
 "  Nachricht wurde gelöscht"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8177,16 +8118,16 @@ msgstr ""
 "\n"
 "  Nachricht wurde in den Papierkorb oder einen anderen Ordner verschoben"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "Beim Lernen ist ein Fehler aufgetreten.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Nachrichten werden verschoben..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Nachrichten werden gelöscht..."
 
@@ -8288,7 +8229,7 @@ msgid "Go back to email"
 msgstr "Zurück zur E-Mail"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Teil einer mehrteiligen Nachricht konnte nicht gespeichert werden: %s"
@@ -8366,81 +8307,81 @@ msgstr "Größe:"
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "NNTP-Verbindung zu %s:%d wurde unterbrochen.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Konto '%s': Verbinde mit NNTP-Server: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Fehler beim Einloggen in %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan unterstützt Statusmeldung 480 nicht, also machen wir erstmal "
 "weiter\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Leser-Modus schlug fehl, fahre trotzdem fort\n"
 
 # Nochmal ankucken.
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Fehler beim Erstellen einer Sitzung mit %s:%d ...\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Fehler beim Authentifizieren an %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail benötigt Zugang zum Netz, um auf den News-Server zuzugreifen."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "Gruppe %s konnte nicht gewählt werden\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "Gruppe %s konnte nicht gesetzt werden\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ungültiger Artikelbereich: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "XHDR nicht abrufbar\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Newsübersicht wird geholt: %d - %d in %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "Newsübersicht nicht abrufbar\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "ungültige XOVER Zeile\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9938,7 +9879,7 @@ msgstr "Das CSS in dieser Datei wird auf alle HTML-Elemente angewendet"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Durchsuchen"
@@ -9947,93 +9888,93 @@ msgstr "Durchsuchen"
 msgid "Select stylesheet"
 msgstr "Wähle Stylesheet"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Nachzuladende Inhalte sind deaktiviert"
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Bilder laden"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Nachzuladende Inhalte aktivieren"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "JavaScript aktivieren"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Plugins aktivieren"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Java aktivieren"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Links im Webbrowser öffnen"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ein Fehler trat auf: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s ist ein missgebildeter oder nicht unterstützter Feed."
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Das Web durchsuchen"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Im Betrachter öffnen"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "In Betrachter öffnen (Nachladen von Inhalten aktivieren)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Im Webbrowser öffnen"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Bild öffnen"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Link-Adresse kopieren"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Download-Link"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Bild speichern unter"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Bild kopieren"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Importiere Feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy - HTML-Betrachter"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10131,11 +10072,11 @@ msgstr ""
 "Fügt diese Kopfzeile hinzu: X-FETCH-TIME mit Datum und Uhrzeit des "
 "Nachrichtenempfangs im RFC822-Format"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "GData-Plugin: Autorisierung erforderlich"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10148,31 +10089,31 @@ msgstr ""
 "Sie müssen Claws Mail autorisieren, mit dem GData-Plugin auf Ihre Google-"
 "Kontakte zugreifen zu können."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Schritt 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 "Klicken Sie hier, um die Seite für die Google-Autorisierung in einem Browser "
 "zu öffnen"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Schritt 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Geben Sie den Code ein:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "GData-Plugin: Fehler beim Abfragen der Kontakte: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10180,48 +10121,48 @@ msgstr[0] "%d von"
 msgstr[1] "%d von"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 Kontakt dem Zwischenspeicher hinzugefügt"
 msgstr[1] "%d Kontakte dem Zwischenspeicher hinzugefügt"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "GData-Plugin: Beginne asynchrone Abfrage von Kontakten\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "GData-Plugin: Fehler bei der Abfrage von Gruppen: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "GData-Plugin: Gruppen empfangen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "GData-Plugin: Beginne asynchrone Abfrage von Gruppen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "GData-Plugin: Fehler beim Autorisieren: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData-Plugin: Autorisierung erfolgreich\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "GData-Plugin: Beginne interaktive Autorisierung\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "GData-Plugin: Autorisierungs-Code erhalten, fordere Autorisierung an\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10229,26 +10170,26 @@ msgstr ""
 "GData-Plugin: Keinen Autorisierungs-Code erhalten, breche "
 "Autorisierungsanfrage ab\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData-Plugin: Fehler beim Erneuern der Autorisierung: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData-Plugin: Erneuern der Autorisierung erfolgreich: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-Plugin: Versuche, Autorisierung zu erneuern\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Authentifizierung"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Benutzername:"
 
@@ -10292,7 +10233,7 @@ msgstr ""
 "\n"
 "Rückmeldungen an <berndth at gmx.de> sind gern gesehen."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "GData-Integration"
 
@@ -10525,7 +10466,7 @@ msgstr "Zeitüberschreitung der Anfrage"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "Sekunde(n)"
@@ -10821,28 +10762,28 @@ msgid "Specify authentication"
 msgstr "Authentifizierung spezifizieren"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Benutzer-ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Kennwort"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Authentifizierungsverfahren"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -11932,161 +11873,166 @@ msgstr "Die Signatur wurde nicht geprüft."
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP-Core: Schlüssel ist nicht verfügbar, kein GPG-Agent aktiv."
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "Die Signatur kann nicht geprüft werden - %s."
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Gültige Signatur von \"%s\" [uneingeschränkt vertrauenswürdig]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Gültige Signatur von \"%s\" [vollständig vertrauenswürdig]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Gültige Signatur von \"%s\" [marginal vertrauenswürdig]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Gültige Signatur von \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "Schlüssel 0x%s zum Prüfen dieser Signatur nicht verfügbar"
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Signatur von \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Gültige Signatur von \"%s\", aber der Schlüssel ist verfallen."
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Gültige Signatur von \"%s\", aber der Schlüssel wurde widerrufen."
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Ungültige Signatur von \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "Schlüssel 0x%s zum Prüfen dieser Signatur nicht verfügbar"
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "Die Signatur wurde nicht geprüft"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "Fehler beim Prüfen der Signatur: kein Status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Fehler beim Prüfen der Signatur: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Signatur erstellt auf %s unter Verwendung von %s Schlüssel-ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Gültige Signatur von \"%s\" (Gültigkeit: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Verfallener Schlüssel uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Verfallene Signatur von \"%s\" (Gültigkeit: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Widerrufener Schlüssel uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "UNGÜLTIGE Signatur von '%s'\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid \"%s\" (Gültigkeit: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "Widerrufen"
 
 # Wird bei GnuPG nicht übersetzt:
 # http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob_plain;f=po/de.po;hb=6d9491842d5da597980eaa59e1e3e2137965fe09
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Owner Trust: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "Kein Schlüssel!"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "Primärer Schlüssel-Fingerabdruck:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "ACHTUNG: Adresse des Unterzeichners \"%s\" passt nicht zum DNS-Eintrag\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Überprüfte Adresse des Unterzeichners ist \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Keine Daten aus Nachricht erhältlich, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Daten konnten nicht initialisiert werden, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "Angaben zum privaten Schlüssel sind mehrdeutig"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Privater Schlüssel nicht gefunden (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fehler beim Setzen des privaten Schlüssels: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' ist nicht richtig "
 "installiert."
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12095,12 +12041,12 @@ msgstr ""
 "Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' der Version %s ist "
 "installiert, aber Version %s ist erforderlich.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme Protokoll '%s' ist nicht nutzbar (unbekannter Fehler)"
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12108,7 +12054,7 @@ msgstr ""
 "GnuPG ist nicht richtig installiert oder muss aktualisiert werden.\n"
 "OpenPGP-Unterstützung deaktiviert."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12116,11 +12062,11 @@ msgstr ""
 "Sie müssen die Kontodaten mit \"OK\" speichern, bevor Sie ein Schlüsselpaar "
 "erzeugen können.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "kein PGP-Schlüssel gefunden"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -12130,12 +12076,12 @@ msgstr ""
 "E-Mails signieren noch verschlüsselte E-Mails empfangen können.\n"
 "Möchten Sie jetzt ein neues Schlüsselpaar erzeugen?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Es konnte kein neues Schlüsselpaar erzeugt werden: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12143,11 +12089,11 @@ msgstr ""
 "Neues Schlüsselpaar wird erzeugt... Bitte die Maus bewegen, um beim Erzeugen "
 "von Entropy zu helfen..."
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Neues Schlüsselpaar konnte nicht erzeugt werden: unbekannter Fehler"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12160,19 +12106,19 @@ msgstr ""
 "\n"
 "Soll er zu einem Schlüsselserver exportiert werden?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "Schlüssel erzeugt."
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "Schlüssel exportiert."
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "Schlüssel-Export schlug fehl."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "Schlüssel-Export funktioniert nicht unter Windows."
 
@@ -12405,9 +12351,9 @@ msgstr "Python-Konsole öffnen..."
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Durchsuchen"
 
@@ -12718,7 +12664,7 @@ msgstr ""
 "Titel des Feeds ändert"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Überprüfe Gültigkeit des SSL-Zertifikats"
 
@@ -12879,17 +12825,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Aktualisiere Kommentare für %s..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Autorisierung erforderlich)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (nicht autorisiert)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (nicht gefunden)"
 
@@ -13028,21 +12974,21 @@ msgstr ""
 "Bitte beachten, dass Kopfzeilen (wie Betreff) vom S/Mime-System nicht "
 "verschlüsselt werden."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Melde Spam..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Spam online melden..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "SpamReport"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13058,19 +13004,19 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org-Nominierungssystem"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Spam melden"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Weiterleiten an:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Kennwort:"
 
@@ -13371,7 +13317,7 @@ msgid "Next month"
 msgstr "Nächster Monat"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13406,7 +13352,7 @@ msgstr ""
 "Kalender exportieren, Ihre free/busy-Informationen veröffentlichen und "
 "selbige von anderen abrufen."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -13590,63 +13536,63 @@ msgstr "Teilnehmer:"
 msgid "Action:"
 msgstr "Verlauf:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Neues Treffen..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "Kalender _exportieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "WebCal _abonnieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "Abonnements akt_ualisieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "_Listenansicht"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "_Wochenansicht"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "_Monatsansicht"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Treffen"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "in der Vergangenheit"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "heute"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "morgen"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "diese Woche"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "später"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13655,17 +13601,17 @@ msgstr ""
 "\n"
 "Diese Termine sind geplant %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Zeitüberschreitung (%d Sekunden) beim Verbinden zu %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Fehler %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13678,7 +13624,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13691,7 +13637,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13702,7 +13648,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13713,44 +13659,44 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Ordner %s konnte nicht erstellt werden."
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws Mail benötigt Zugang zum Netz, um den WebCal-Feed zu aktualisieren."
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Hole Kalender für %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "Neues Abonnement"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 "Claws Mail benötigt Zugang zum Netz, um dieses Abonnement zu aktualisieren."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "WebCal abonnieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "WebCal-URL eingeben:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Konnte URL nicht analysieren"
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Wollen Sie wirklich abbestellen?"
 
@@ -14122,89 +14068,89 @@ msgid "Couldn't export free/busy to '%s'\n"
 msgstr ""
 "Die free/busy-Informationen konnten nicht nach '%s' exportiert werden.\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Erinnerungen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Benachrichtige mich"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "Minuten vor einem Termin"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Kalender-Export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Exportiere Kalender automatisch nach "
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Sie können in eine lokale Datei oder zu einer URL exportieren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr ""
 "Angabe einer lokalen Datei oder einer URL (http://user:pass@server/path/file."
 "ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Webcal-Abonnements in Export einbeziehen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Nach dem Export des Kalenders auszuführender Befehl"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Claws-Kalender in XFCEs Orage-Kalender registrieren."
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "Erlaubt Orage (Version 4.4 oder höher), den Claws Mail-Kalender zu sehen."
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Als GNOME Shell Kalender-Server exportieren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Das \"D-Bus calendar server interface\" registrieren, um Claws Mails' "
 "Kalender zu exportieren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Frei/beschäftigt-Informationen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Exportiere frei/beschäftigt-Status automatisch nach "
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr ""
 "Angabe einer lokalen Datei oder einer URL (http://user:pass@server/path/file."
 "ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr ""
 "Nach dem Export der frei/beschäftigt-Informationen auszuführender Befehl"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Frei/Beschäftigt-Status anderer Personen holen von"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14214,7 +14160,7 @@ msgstr ""
 "ifb). Benutzen Sie %u für den linken Teil der E-Mailadresse und %d für die "
 "Domain."
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "SSL-Einstellungen"
 
@@ -14269,12 +14215,12 @@ msgstr "Fehler bei der POP3-Sitzung\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-Befehl nicht unterstützt\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14282,7 +14228,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Lokale Mbox-Datei"
 
@@ -14310,11 +14256,11 @@ msgstr "Vollständiger Name"
 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Automatisch konfigurieren"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "_Abbrechen"
 
@@ -14404,7 +14350,7 @@ msgstr ""
 "Nachrichten über diesem Limit werden teilweise abgerufen. Wenn Sie sie "
 "auswählen, können sie vollständig heruntergeladen oder gelöscht werden."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14416,71 +14362,66 @@ msgstr "Höchstzahl herunterzuladender Artikel"
 msgid "unlimited if 0 is specified"
 msgstr "unbegrenzt, wenn 0 angegeben"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Textsuche nach:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "IMAP Serververzeichnis"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(gewöhnlich leer)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Nur abonnierte Ordner anzeigen"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreiteneffizienter Modus (lädt keine ferngelegenen Marken)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Dieser Modus nutzt weniger Bandbreite, kann aber bei manchen Servern "
 "langsamer sein."
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Nachrichten bei Empfang filtern"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filtern über Plugins bei Empfang möglich"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Abrufen' überprüft dieses Konto auf neue Nachrichten"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Kopfzeile"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Message-ID erzeugen"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Mailadresse des Kontos in Message-ID senden"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Kopfzeile für \"User Agent\" einfügen"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Benutzerdefinierte Kopfzeile einfügen"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Authentifizierung (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14488,182 +14429,182 @@ msgstr ""
 "Wenn diese Felder leer bleiben, werden die selbe User-ID und das selbe "
 "Kennwort wie beim Empfang verwendet."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Vor dem Senden mit POP3 authentifizieren"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "Zeitlimit für POP-Authentifizierung:"
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "Minuten"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Signatur automatisch einfügen"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Signatur-Trenner"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Befehlsausgabe"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Automatisch folgende Adressen eintragen"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Wörterbücher für Rechtschreibung"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Standard-Wörterbuch"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Alternatives Standard-Wörterbuch"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Standard-Datenschutzssystem"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Nachrichten immer signieren"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Nachrichten immer verschlüsseln"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 "Nachrichten stets signieren, wenn eine signierte Nachricht beantwortet wird"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Nachrichten stets verschlüsseln, wenn eine verschlüsselte Nachricht "
 "beantwortet wird"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Nachrichten zusätzlich zum fremden mit eigenem Schlüssel verschlüsseln"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Verschlüsselt versandte Nachrichten im Klartext speichern"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Kein SSL verwenden"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "SSL für POP3-Verbindung verwenden"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Mittels STARTTLS-Befehl eine SSL-Sitzung einleiten"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL für IMAP-Verbindung verwenden"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "SSL für NNTP-Verbindung verwenden"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Kein SSL verwenden (aber nötigenfalls STARTTLS)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "SSL für SMTP-Verbindung verwenden"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Benutzerzertifikate"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Zertifikat zum Empfangen"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Benutzerzertifikat als PKCS12 oder PEM-Datei"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Zertifikat zum Senden"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Gültige SSL-Zertifikate automatisch akzeptieren"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Nicht-blockierendes SSL verwenden"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Diese Option bei SSL-Verbindungsproblemen deaktivieren."
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "SMTP-Port"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "POP3-Port"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "IMAP-Port"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "NNTP-Port"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Domain-Name"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14671,15 +14612,15 @@ msgstr ""
 "Der Domain-Name wird in der erzeugten Message-ID und beim Verbinden mit SMTP-"
 "Servern verwendet"
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Befehl zur Kommunikation mit dem Server verwenden"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Gelöschte Mails in den Papierkorb schieben und sofort löschen."
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14687,108 +14628,108 @@ msgstr ""
 "Verschiebt gelöschte Mails in den Papierkorb, statt die \\Gelöscht-Merker zu "
 "setzen, ohne zu löschen."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Crosspostings als gelesen und farblich markieren:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten ablegen in"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Nachrichten vorspeichern in"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Entwürfe ablegen in"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Gelöschte Nachrichten ablegen in"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Kein Kontoname eingetragen."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse eingetragen."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "Kein SMTP-Server angegeben."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID eingetragen."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "Kein POP3-Server eingetragen."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "Der Standard-Eingangsordner existiert nicht."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "Kein IMAP4-Server angegeben."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "Kein NNTP-Server eingetragen."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "Name der lokalen Mailbox-Datei fehlt."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "Kein Mail-Befehl eingetragen."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Datenschutz"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Einstellungen für neues Konto"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Kontoeinstellungen"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Fehlgeschlagen (falsche Adresse)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Signatur-Datei auswählen"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Zertifikat auswählen"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (Plugin nicht geladen)"
@@ -15827,7 +15768,7 @@ msgstr "Anzeige"
 msgid "Fonts"
 msgstr "Schriften"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -15979,7 +15920,7 @@ msgstr "Fehlermeldungen"
 msgid "Status messages for filtering/processing log"
 msgstr "Statusmeldungen für Filter-/Verarbeitungsprotokoll"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Sonstiges"
 
@@ -16610,15 +16551,15 @@ msgstr "Farbe für Ordner mit neuen Nachrichten wählen"
 msgid "Colors"
 msgstr "Farben"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Voreingestellte Tastenkombinationen wählen"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Voreinstellung wählen:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16626,35 +16567,35 @@ msgstr ""
 "Die Kürzel in jedem Menü lassen sich ändern, indem man eine oder mehrere\n"
 "Taste(n) drückt, während sich der Mauszeiger über dem Eintrag befindet."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Adresse mit Doppelklick ins Zielfeld übernehmen"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Beenden"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Bei Beenden nachfragen"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Bei Beenden Papierkorb leeren"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Warnen, wenn Nachrichten vorgespeichert sind"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Tastenkürzel"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Benutzerdefinierte Tastenkürzel möglich"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16665,48 +16606,47 @@ msgstr ""
 "Diese Option muss deaktiviert sein, um alle bestehenden Tastenkürzel zu "
 "schützen."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr " Voreingestellte Tastenkürzel wählen..."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Metadaten-Behandlung"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
 msgstr ""
 "Im sicheren Modus speichert das Betriebssystem die Metadaten direkt.\n"
-"Dies verhindert Datenverluste nach einem Absturz, kann aber etwas mehr Zeit "
-"benötigen."
+"Dies verhindert Datenverluste nach einem Absturz, kann aber etwas mehr Zeit benötigen."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Sicher"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Schnell"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Socket I/O-Zeitüberschreitung"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Leeren des Papierkorbs bestätigen"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "Nach kontobezogenen Filterregeln fragen, wenn manuell gefiltert wird."
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Sichere Dateilöschung verwenden, wenn möglich"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16714,7 +16654,7 @@ msgstr ""
 "Sichere Dateilöschung verwenden, wenn möglich\n"
 "(Das Programm 'shred' ist nicht verfügbar)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16723,32 +16663,11 @@ msgstr ""
 "zu überschreiben. Dies verlangsamt den Vorgang. Sie sollten die "
 "Handbuchseite von 'shred' lesen."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Offline-Ordner baldmöglichst synchronisieren"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Enter password"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Enter password"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Enter password"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Vermischtes"
 
@@ -17005,8 +16924,8 @@ msgstr ""
 "Übertragungskodierung auswählen, die verwendet wird, wenn der "
 "Nachrichtenkörper Nicht-ASCII-Zeichen enthält."
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Senden"
 
@@ -17743,28 +17662,28 @@ msgstr "Keine Informationen verfügbar"
 msgid "No recipient keys defined."
 msgstr "Kein Empfängerschlüssel definiert."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fehler beim BASE64-Entschlüsseln]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "es wird bereits versucht zu Senden."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Datei %s konnte nicht geöffnet werden."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "Defekte Kopfzeile in vorgespeicherter Nachricht."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "Während der SMTP-Sitzung ist ein Fehler aufgetreten."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -17772,7 +17691,7 @@ msgstr ""
 "Kein Konto zum Senden gefunden; und während der SMTP-Sitzung trat ein Fehler "
 "auf."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17780,20 +17699,20 @@ msgstr ""
 "Es fehlen Informationen zum Senden. Möglicherweise wurde diese E-Mail nicht "
 "mit Claws Mail erstellt."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "Temporäre Datei für das Senden der News nicht erstellbar."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "Fehler beim Schreiben der temporären Datei zum Senden der News."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Beim Senden der Nachricht an %s ist ein Fehler aufgetreten."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Nachrichten werden gefiltert...\n"
 
@@ -18100,88 +18019,88 @@ msgstr "Text eingeben, um '%s' zu ersetzen"
 msgid "Enter variable"
 msgstr "Variable eingeben"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Senden der Nachricht mit dem Befehl: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Befehl konnte nicht ausgeführt werden: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fehler beim Ausführen des Befehls: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Verbinden"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Es erfolgt POP vor SMTP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP vor SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Konto: '%s': Verbinde mit SMTP-Server: %s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "E-Mail erfolgreich gesendet."
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Sende HELO..."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Authentifizierung wird durchgeführt"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Nachricht wird gesendet..."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "EHLO wird gesendet..."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM wird gesendet..."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO wird gesendet..."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "DATA wird gesendet..."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Beenden..."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Nachricht wird gesendet (%d / %d bytes)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Nachricht wird gesendet"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Fehler beim Senden der Nachricht."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19067,12 +18986,12 @@ msgstr "Bitte eine URL zum Öffnen wählen"
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Willkommen zu Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -19165,47 +19084,47 @@ msgstr ""
 "das unter <%s> tun.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Bitte den Namen der Mailbox eingeben."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Bitten geben Sie Ihren Namen und Ihre E-Mail-Adresse ein."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Bitte geben Sie Posteingangsserver und Benutzernamen an."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Bitte geben Sie Ihren Benutzernamen ein."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Bitte geben Sie Ihren Postausgangsserver (SMTP) ein."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Bitte geben Sie Ihren SMTP-Benutzernamen ein."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Ihr name:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Ihre E-Mail-Adresse:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Ihre Organisation: "
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Mailboxname"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19213,7 +19132,7 @@ msgstr ""
 "Sie können auch einen absoluten Pfad angeben, z.B.: \"/home/white/Documents/"
 "Mail\""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19221,55 +19140,55 @@ msgstr ""
 "Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z."
 "B.: \"mail.example.com:25\""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "SMTP-Serveradresse"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Benutze Authentifizierung"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(leer lassen, um den selben wie beim Empfang zu verwenden)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "SMTP-Benutzername:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "SMTP-Kennwort:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "SSL für Verbindung zum SMTP-Server verwenden"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "SSL über STARTTLS benutzen"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "SSL-Benutzerzertifikat (optional)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Serveradresse:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Lokale Mailbox:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Servertyp:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19277,19 +19196,19 @@ msgstr ""
 "Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z."
 "B.: \"mail.example.com:110\""
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "SSL für Verbindung zum empfangenden Server verwenden"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "IMAP-Serververzeichnis:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Nur abonnierte Ordner anzeigen"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19297,15 +19216,15 @@ msgstr ""
 "Achtung: diese Version von Claws Mail\n"
 "wurde ohne IMAP Support kompiliert."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail Setup-Assistent"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Willkommen zu Claws Mail"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19321,31 +19240,31 @@ msgstr ""
 "Sie Claws Mail in weniger als fünf Minuten\n"
 "benutzen können."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Über Sie"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Felder in Fettschrift müssen ausgefüllt werden."
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "E-Mail empfangen"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "E-Mail versenden"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Abspeichern der Mail"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Konfiguration beendet"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19353,9 +19272,6 @@ msgstr ""
 "Claws Mail ist jetzt bereit.\n"
 "Zum Starten 'Speichern' klicken."
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Die Signatur kann nicht geprüft werden - %s."
-
 #~ msgid "+_Insert"
 #~ msgstr "+Einfügen"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 881c24f..c7ce4af 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.13.1\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-20 11:11+0000\n"
 "PO-Revision-Date: 2008-09-28 08:00+0000\n"
 "Last-Translator: Paul Mangan <paul at claws-mail.org>\n"
 "Language-Team: Paul Mangan <paul at claws-mail.org>\n"
@@ -19,64 +19,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
 msgstr ""
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr ""
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr ""
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
 "indicates the default account."
 msgstr ""
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr ""
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr ""
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr ""
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr ""
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr ""
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr ""
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -89,11 +89,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr ""
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr ""
 
@@ -139,10 +139,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr ""
 
@@ -392,18 +392,18 @@ msgid "_Book"
 msgstr ""
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr ""
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr ""
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr ""
 
@@ -442,13 +442,13 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr ""
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr ""
 
@@ -457,7 +457,7 @@ msgid "C_ut"
 msgstr ""
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr ""
@@ -507,8 +507,8 @@ msgstr ""
 msgid "Edit custom attributes..."
 msgstr ""
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr ""
 
@@ -624,7 +624,7 @@ msgstr ""
 msgid "Sources"
 msgstr ""
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr ""
@@ -671,7 +671,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr ""
 
@@ -772,7 +772,7 @@ msgid "Person"
 msgstr ""
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr ""
 
@@ -907,18 +907,18 @@ msgstr ""
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9473
 msgid "Notice"
 msgstr ""
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
+#: src/alertpanel.c:159 src/compose.c:5680 src/compose.c:6203
+#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868 src/plugins/pgpcore/sgpgme.c:746
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
 msgid "Warning"
 msgstr ""
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5621 src/inc.c:669
 #: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
 msgid "Error"
 msgstr ""
@@ -936,11 +936,11 @@ msgid "Browse Directory Entry"
 msgstr ""
 
 #: src/browseldap.c:237
-msgid "Server Name:"
+msgid "Server Name :"
 msgstr ""
 
 #: src/browseldap.c:247
-msgid "Distinguished Name (dn):"
+msgid "Distinguished Name (dn) :"
 msgstr ""
 
 #: src/browseldap.c:270
@@ -951,87 +951,87 @@ msgstr ""
 msgid "Attribute Value"
 msgstr ""
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr ""
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr ""
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr ""
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr ""
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr ""
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr ""
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr ""
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr ""
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr ""
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr ""
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr ""
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr ""
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr ""
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr ""
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr ""
 
@@ -1420,7 +1420,7 @@ msgstr ""
 msgid "_Properties..."
 msgstr ""
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr ""
 
@@ -1488,7 +1488,7 @@ msgstr ""
 msgid "_Unwrapped"
 msgstr ""
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr ""
@@ -1553,7 +1553,7 @@ msgstr ""
 msgid "Delete to end of line"
 msgstr ""
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr ""
@@ -1598,47 +1598,47 @@ msgstr ""
 msgid "_Priority"
 msgstr ""
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr ""
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr ""
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr ""
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr ""
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr ""
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr ""
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr ""
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr ""
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr ""
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr ""
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr ""
 
@@ -1646,7 +1646,7 @@ msgstr ""
 msgid "_Template"
 msgstr ""
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr ""
 
@@ -1682,11 +1682,11 @@ msgstr ""
 msgid "_Normal"
 msgstr ""
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr ""
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr ""
 
@@ -1710,27 +1710,27 @@ msgstr ""
 msgid "_Lowest"
 msgstr ""
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr ""
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr ""
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr ""
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr ""
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr ""
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr ""
 
@@ -1777,46 +1777,46 @@ msgstr ""
 msgid "Fw: multiple emails"
 msgstr ""
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr ""
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr ""
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr ""
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4935 src/compose.c:4937
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr ""
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr ""
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr ""
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4932 src/compose.c:4940
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr ""
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1827,137 +1827,137 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr ""
 
-#: src/compose.c:3605
+#: src/compose.c:3602
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3613
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr ""
 
-#: src/compose.c:3619
+#: src/compose.c:3616
 msgid "Are you sure?"
 msgstr ""
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3617 src/compose.c:10529 src/compose.c:11390
 msgid "_Insert"
 msgstr ""
 
-#: src/compose.c:3744
+#: src/compose.c:3741
 #, c-format
 msgid "File %s is empty."
 msgstr ""
 
-#: src/compose.c:3745
+#: src/compose.c:3742
 msgid "Empty file"
 msgstr ""
 
-#: src/compose.c:3746
+#: src/compose.c:3743
 msgid "_Attach anyway"
 msgstr ""
 
-#: src/compose.c:3755
+#: src/compose.c:3752
 #, c-format
 msgid "Can't read %s."
 msgstr ""
 
-#: src/compose.c:3782
+#: src/compose.c:3779
 #, c-format
 msgid "Message: %s"
 msgstr ""
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4772 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr ""
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4779 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4782 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4784 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr ""
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4811 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5031 src/compose.c:5063 src/compose.c:5105
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr ""
 
-#: src/compose.c:5035
+#: src/compose.c:5032
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5033 src/compose.c:5065 src/compose.c:5098 src/compose.c:5622
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr ""
 
-#: src/compose.c:5067
+#: src/compose.c:5064
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 
-#: src/compose.c:5084
+#: src/compose.c:5081
 msgid "Recipient is not specified."
 msgstr ""
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5100 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr ""
 
-#: src/compose.c:5104
+#: src/compose.c:5101
 #, c-format
 msgid "Subject is empty. %s"
 msgstr ""
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5102 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr ""
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5105 src/toolbar.c:425
 msgid "Send later"
 msgstr ""
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5158 src/compose.c:9993
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5161 src/compose.c:9996
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5167 src/compose.c:9990
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1965,7 +1965,7 @@ msgid ""
 "Signature failed: %s"
 msgstr ""
 
-#: src/compose.c:5173
+#: src/compose.c:5170
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1973,24 +1973,24 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/compose.c:5175
+#: src/compose.c:5172
 msgid "Could not queue message for sending."
 msgstr ""
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5187 src/compose.c:5247
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
-#: src/compose.c:5246
+#: src/compose.c:5243
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
-#: src/compose.c:5621
+#: src/compose.c:5618
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -1998,7 +1998,7 @@ msgid ""
 "Send it as %s?"
 msgstr ""
 
-#: src/compose.c:5679
+#: src/compose.c:5676
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2007,72 +2007,72 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5790
+#: src/compose.c:5787
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr ""
 
-#: src/compose.c:5911
+#: src/compose.c:5908
 msgid "Encryption warning"
 msgstr ""
 
-#: src/compose.c:5912
+#: src/compose.c:5909
 msgid "C_ontinue"
 msgstr ""
 
-#: src/compose.c:5961
+#: src/compose.c:5958
 msgid "No account for sending mails available!"
 msgstr ""
 
-#: src/compose.c:5970
+#: src/compose.c:5967
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 
-#: src/compose.c:6205
+#: src/compose.c:6202
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6203 src/mainwindow.c:651 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr ""
 
-#: src/compose.c:6206
+#: src/compose.c:6203
 msgid "Ignore attachment"
 msgstr ""
 
-#: src/compose.c:6246
+#: src/compose.c:6243
 #, c-format
 msgid "Original %s part"
 msgstr ""
 
-#: src/compose.c:6824
+#: src/compose.c:6825
 msgid "Add to address _book"
 msgstr ""
 
-#: src/compose.c:6985
+#: src/compose.c:6986
 msgid "Delete entry contents"
 msgstr ""
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6990 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 
-#: src/compose.c:7204
+#: src/compose.c:7212
 msgid "Mime type"
 msgstr ""
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr ""
 
-#: src/compose.c:7273
+#: src/compose.c:7281
 msgid "Save Message to "
 msgstr ""
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7318 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2083,110 +2083,110 @@ msgstr ""
 msgid "_Browse"
 msgstr ""
 
-#: src/compose.c:7783
+#: src/compose.c:7791
 msgid "Hea_der"
 msgstr ""
 
-#: src/compose.c:7788
+#: src/compose.c:7796
 msgid "_Attachments"
 msgstr ""
 
-#: src/compose.c:7802
+#: src/compose.c:7810
 msgid "Othe_rs"
 msgstr ""
 
-#: src/compose.c:7817
+#: src/compose.c:7825
 msgid "S_ubject:"
 msgstr ""
 
-#: src/compose.c:8041
+#: src/compose.c:8049
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
 msgstr ""
 
-#: src/compose.c:8180
+#: src/compose.c:8188
 msgid "_From:"
 msgstr ""
 
-#: src/compose.c:8197
+#: src/compose.c:8205
 msgid "Account to use for this email"
 msgstr ""
 
-#: src/compose.c:8199
+#: src/compose.c:8207
 msgid "Sender address to be used"
 msgstr ""
 
-#: src/compose.c:8365
+#: src/compose.c:8373
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr ""
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr ""
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8575 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:8683
+#: src/compose.c:8691
 msgid "Template From format error."
 msgstr ""
 
-#: src/compose.c:8701
+#: src/compose.c:8709
 msgid "Template To format error."
 msgstr ""
 
-#: src/compose.c:8719
+#: src/compose.c:8727
 msgid "Template Cc format error."
 msgstr ""
 
-#: src/compose.c:8737
+#: src/compose.c:8745
 msgid "Template Bcc format error."
 msgstr ""
 
-#: src/compose.c:8755
+#: src/compose.c:8763
 msgid "Template Reply-To format error."
 msgstr ""
 
-#: src/compose.c:8774
+#: src/compose.c:8782
 msgid "Template subject format error."
 msgstr ""
 
-#: src/compose.c:9043
+#: src/compose.c:9051
 msgid "Invalid MIME type."
 msgstr ""
 
-#: src/compose.c:9058
+#: src/compose.c:9066
 msgid "File doesn't exist or is empty."
 msgstr ""
 
-#: src/compose.c:9132
+#: src/compose.c:9140
 msgid "Properties"
 msgstr ""
 
-#: src/compose.c:9149
+#: src/compose.c:9157
 msgid "MIME type"
 msgstr ""
 
-#: src/compose.c:9190
+#: src/compose.c:9198
 msgid "Encoding"
 msgstr ""
 
-#: src/compose.c:9210
+#: src/compose.c:9218
 msgid "Path"
 msgstr ""
 
-#: src/compose.c:9211
+#: src/compose.c:9219
 msgid "File name"
 msgstr ""
 
-#: src/compose.c:9462
+#: src/compose.c:9470
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2194,15 +2194,15 @@ msgid ""
 "process group id: %d"
 msgstr ""
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9959 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 
-#: src/compose.c:9977
+#: src/compose.c:9985
 msgid "Could not queue message."
 msgstr ""
 
-#: src/compose.c:9979
+#: src/compose.c:9987
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2210,107 +2210,107 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/compose.c:10157
+#: src/compose.c:10165
 msgid "Could not save draft."
 msgstr ""
 
-#: src/compose.c:10161
+#: src/compose.c:10169
 msgid "Could not save draft"
 msgstr ""
 
-#: src/compose.c:10162
+#: src/compose.c:10170
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
 msgstr ""
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Cancel exit"
 msgstr ""
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Discard email"
 msgstr ""
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10332 src/compose.c:10346
 msgid "Select file"
 msgstr ""
 
-#: src/compose.c:10352
+#: src/compose.c:10360
 #, c-format
 msgid "File '%s' could not be read."
 msgstr ""
 
-#: src/compose.c:10354
+#: src/compose.c:10362
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 
-#: src/compose.c:10441
+#: src/compose.c:10449
 msgid "Discard message"
 msgstr ""
 
-#: src/compose.c:10442
+#: src/compose.c:10450
 msgid "This message has been modified. Discard it?"
 msgstr ""
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr ""
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10451 src/compose.c:10455
 msgid "_Save to Drafts"
 msgstr ""
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr ""
 
-#: src/compose.c:10446
+#: src/compose.c:10454
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 
-#: src/compose.c:10447
+#: src/compose.c:10455
 msgid "_Don't save"
 msgstr ""
 
-#: src/compose.c:10518
+#: src/compose.c:10526
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr ""
 
-#: src/compose.c:10520
+#: src/compose.c:10528
 msgid "Apply template"
 msgstr ""
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10529 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr ""
 
-#: src/compose.c:11379
+#: src/compose.c:11387
 msgid "Insert or attach?"
 msgstr ""
 
-#: src/compose.c:11380
+#: src/compose.c:11388
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 
-#: src/compose.c:11382
+#: src/compose.c:11390
 msgid "_Attach"
 msgstr ""
 
-#: src/compose.c:11599
+#: src/compose.c:11607
 #, c-format
 msgid "Quote format error at line %d."
 msgstr ""
 
-#: src/compose.c:11894
+#: src/compose.c:11902
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2499,8 +2499,8 @@ msgid " Check File "
 msgstr ""
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr ""
 
@@ -2647,7 +2647,7 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr ""
 
@@ -2795,7 +2795,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr ""
 
@@ -2925,15 +2925,15 @@ msgid "Stylesheet"
 msgstr ""
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr ""
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr ""
 
@@ -2983,11 +2983,11 @@ msgid "Format User Attributes"
 msgstr ""
 
 #: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
-msgid "Address Book:"
+msgid "Address Book :"
 msgstr ""
 
 #: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
-msgid "File Name:"
+msgid "File Name :"
 msgstr ""
 
 #: src/exphtmldlg.c:559
@@ -3393,27 +3393,27 @@ msgstr "Wastebin"
 msgid "Drafts"
 msgstr ""
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr ""
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr ""
 
@@ -3439,7 +3439,7 @@ msgstr ""
 #: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
 #: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr ""
@@ -3447,7 +3447,7 @@ msgstr ""
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr ""
@@ -3471,7 +3471,7 @@ msgstr ""
 msgid "R_un processing rules"
 msgstr ""
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr ""
 
@@ -3527,12 +3527,12 @@ msgstr ""
 msgid "Mark all as read"
 msgstr ""
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr ""
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr ""
@@ -3577,7 +3577,7 @@ msgstr ""
 msgid "Folder could not be opened."
 msgstr ""
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Empty wastebin"
 
@@ -3758,7 +3758,7 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 " and Hiroyuki Yamamoto"
 msgstr ""
@@ -3791,7 +3791,7 @@ msgid ""
 "Operating System: unknown"
 msgstr ""
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr ""
 
@@ -3945,7 +3945,7 @@ msgstr ""
 
 #: src/gtk/about.c:831
 msgid ""
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
@@ -4721,7 +4721,7 @@ msgstr ""
 #: src/gtk/pluginwindow.c:215
 #, c-format
 msgid ""
-"The following error occurred while loading %s:\n"
+"The following error occurred while loading %s :\n"
 "\n"
 "%s\n"
 msgstr ""
@@ -4747,9 +4747,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr ""
 
@@ -4786,14 +4786,14 @@ msgstr ""
 msgid "Page Index"
 msgstr ""
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr ""
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5219,193 +5219,193 @@ msgstr ""
 msgid "Load Image"
 msgstr ""
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr ""
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr ""
 
-#: src/imap.c:622
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr ""
 
-#: src/imap.c:625
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr ""
 
-#: src/imap.c:628
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr ""
 
-#: src/imap.c:631
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr ""
 
-#: src/imap.c:634
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 
-#: src/imap.c:638
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr ""
 
-#: src/imap.c:641
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr ""
 
-#: src/imap.c:644
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr ""
 
-#: src/imap.c:647
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 
-#: src/imap.c:651
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr ""
 
-#: src/imap.c:654
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr ""
 
-#: src/imap.c:657
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr ""
 
-#: src/imap.c:660
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr ""
 
-#: src/imap.c:663
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr ""
 
-#: src/imap.c:666
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr ""
 
-#: src/imap.c:669
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr ""
 
-#: src/imap.c:672
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr ""
 
-#: src/imap.c:675
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr ""
 
-#: src/imap.c:678
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr ""
 
-#: src/imap.c:681
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr ""
 
-#: src/imap.c:684
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr ""
 
-#: src/imap.c:687
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr ""
 
-#: src/imap.c:690
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr ""
 
-#: src/imap.c:693
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr ""
 
-#: src/imap.c:696
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr ""
 
-#: src/imap.c:699
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr ""
 
-#: src/imap.c:702
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr ""
 
-#: src/imap.c:705
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr ""
 
-#: src/imap.c:708
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr ""
 
-#: src/imap.c:711
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr ""
 
-#: src/imap.c:714
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr ""
 
-#: src/imap.c:717
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr ""
 
-#: src/imap.c:720
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr ""
 
-#: src/imap.c:723
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr ""
 
-#: src/imap.c:726
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr ""
 
-#: src/imap.c:729
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr ""
 
-#: src/imap.c:732
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr ""
 
-#: src/imap.c:735
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr ""
 
-#: src/imap.c:738
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr ""
 
-#: src/imap.c:741
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr ""
 
-#: src/imap.c:745
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr ""
 
-#: src/imap.c:749
+#: src/imap.c:748
 #, c-format
-msgid "Unknown error [%d]"
+msgid " Unknown error [%d]\n"
 msgstr ""
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5413,7 +5413,7 @@ msgid ""
 "and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5421,7 +5421,7 @@ msgid ""
 "and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5429,44 +5429,36 @@ msgid ""
 "and the SCRAM SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:971
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr ""
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr ""
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5475,124 +5467,124 @@ msgid ""
 "not be secure."
 msgstr ""
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr ""
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr ""
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr ""
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr ""
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr ""
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr ""
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr ""
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr ""
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr ""
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr ""
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr ""
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr ""
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr ""
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr ""
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr ""
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr ""
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr ""
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr ""
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5639,7 +5631,7 @@ msgstr ""
 msgid "_Subscribe..."
 msgstr ""
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr ""
 
@@ -5673,20 +5665,20 @@ msgstr ""
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr ""
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr ""
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -5703,7 +5695,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr ""
@@ -5730,7 +5722,7 @@ msgstr ""
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr ""
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr ""
 
@@ -5904,7 +5896,7 @@ msgid "This button will update the list above with the data supplied."
 msgstr ""
 
 #: src/importldif.c:911
-msgid "Records Imported:"
+msgid "Records Imported :"
 msgstr ""
 
 #: src/importldif.c:943
@@ -5943,56 +5935,56 @@ msgstr ""
 msgid "Import Pine file into Address Book"
 msgstr ""
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr ""
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr ""
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr ""
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr ""
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr ""
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr ""
 
@@ -6028,7 +6020,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr ""
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr ""
 
@@ -6053,7 +6045,7 @@ msgstr ""
 msgid "Getting the size of messages (LIST)..."
 msgstr ""
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr ""
 
@@ -6102,7 +6094,7 @@ msgstr ""
 msgid "Socket error on connection to %s:%d."
 msgstr ""
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -6122,18 +6114,18 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr ""
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6434,906 +6426,902 @@ msgstr ""
 msgid "NetworkManager: network is offline.\n"
 msgstr ""
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr ""
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr ""
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr ""
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr ""
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Empty all Was_tebin folders"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr ""
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr ""
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr ""
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr ""
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr ""
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr ""
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr ""
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr ""
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr ""
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr ""
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr ""
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr ""
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr ""
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr ""
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr ""
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr ""
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr ""
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr ""
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr ""
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr ""
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr ""
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr ""
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr ""
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr ""
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr ""
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr ""
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr ""
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr ""
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Previous _labelled message"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Next la_belled message"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr ""
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr ""
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr ""
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr ""
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr ""
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr ""
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr ""
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr ""
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr ""
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr ""
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr ""
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr ""
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr ""
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr ""
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr ""
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr ""
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr ""
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr ""
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr ""
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr ""
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr ""
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr ""
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr ""
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr ""
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr ""
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr ""
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr ""
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr ""
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr ""
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr ""
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr ""
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr ""
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr ""
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr ""
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr ""
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr ""
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr ""
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr ""
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr ""
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr ""
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr ""
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr ""
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Move to was_tebin"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr ""
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Move thread to was_tebin"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr ""
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr ""
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr ""
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr ""
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr ""
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr ""
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr ""
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr ""
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr ""
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr ""
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr ""
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr ""
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr ""
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr ""
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr ""
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "Colour la_bel"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr ""
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr ""
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr ""
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr ""
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr ""
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr ""
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr ""
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr ""
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr ""
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr ""
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr ""
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr ""
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr ""
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr ""
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr ""
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr ""
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr ""
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr ""
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr ""
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr ""
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr ""
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr ""
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr ""
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr ""
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr ""
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr ""
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr ""
 
-#: src/mainwindow.c:784
-msgid "Forget _master password"
-msgstr ""
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr ""
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr ""
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr ""
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr ""
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr ""
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr ""
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr ""
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr ""
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr ""
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr ""
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr ""
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr ""
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr ""
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr ""
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr ""
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr ""
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr ""
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr ""
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr ""
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr ""
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr ""
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr ""
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr ""
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr ""
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr ""
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr ""
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr ""
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr ""
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr ""
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr ""
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr ""
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr ""
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr ""
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr ""
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr ""
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr ""
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr ""
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr ""
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr ""
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr ""
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr ""
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr ""
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr ""
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr ""
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "By _colour label"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr ""
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr ""
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr ""
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr ""
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr ""
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr ""
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr ""
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr ""
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr ""
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr ""
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr ""
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr ""
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr ""
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr ""
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr ""
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr ""
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr ""
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr ""
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Delete all messages in wastebin folders?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr ""
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr ""
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr ""
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr ""
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr ""
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr ""
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr ""
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr ""
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr ""
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr ""
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr ""
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr ""
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr ""
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7411,7 +7399,7 @@ msgstr ""
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr ""
@@ -7455,19 +7443,19 @@ msgstr ""
 msgid "Search finished"
 msgstr ""
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr ""
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr ""
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr ""
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7477,11 +7465,11 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr ""
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7489,108 +7477,108 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr ""
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr ""
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr ""
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr ""
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr ""
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr ""
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr ""
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
-"You got a return receipt for this message: it has been displayed by the "
+"You got a return receipt for this message : it has been displayed by the "
 "recipient."
 msgstr ""
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr ""
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr ""
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr ""
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
 msgstr ""
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr ""
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr ""
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
 msgstr ""
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr ""
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
 msgstr ""
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr ""
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -7598,46 +7586,46 @@ msgid ""
 "notification:"
 msgstr ""
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr ""
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr ""
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr ""
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
 msgstr ""
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
 msgstr ""
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
 msgstr ""
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr ""
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr ""
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr ""
 
@@ -7730,7 +7718,7 @@ msgid "Go back to email"
 msgstr ""
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
@@ -7799,77 +7787,77 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr ""
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr ""
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr ""
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr ""
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr ""
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr ""
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr ""
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr ""
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr ""
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr ""
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr ""
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr ""
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9161,7 +9149,7 @@ msgstr ""
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr ""
@@ -9170,93 +9158,93 @@ msgstr ""
 msgid "Select stylesheet"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9338,11 +9326,11 @@ msgid ""
 "RFC822 format"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -9353,29 +9341,29 @@ msgid ""
 "list."
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr ""
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -9383,73 +9371,73 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr ""
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr ""
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr ""
 
@@ -9485,7 +9473,7 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr ""
 
@@ -9682,7 +9670,7 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr ""
@@ -9962,28 +9950,28 @@ msgid "Specify authentication"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr ""
 
@@ -11420,9 +11408,9 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr ""
 
@@ -11671,7 +11659,7 @@ msgid ""
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr ""
 
@@ -11826,17 +11814,17 @@ msgid "Updating comments for '%s'..."
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr ""
 
@@ -11943,21 +11931,21 @@ msgid ""
 "MIME system."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -11967,19 +11955,19 @@ msgid ""
 " * lists.debian.org nomination system"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr ""
 
@@ -12250,7 +12238,7 @@ msgid "Next month"
 msgstr ""
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr ""
 
@@ -12271,7 +12259,7 @@ msgid ""
 "information from others."
 msgstr ""
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr ""
 
@@ -12449,80 +12437,80 @@ msgstr ""
 msgid "Action:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
 "These are the events planned %s:\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -12531,7 +12519,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -12540,7 +12528,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -12548,7 +12536,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -12556,42 +12544,42 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr ""
 
@@ -12940,88 +12928,88 @@ msgstr ""
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
 "left part of the email address, %d for the domain"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr ""
 
@@ -13076,12 +13064,12 @@ msgstr ""
 msgid "TOP command unsupported\n"
 msgstr ""
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr ""
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr ""
 
@@ -13089,7 +13077,7 @@ msgstr ""
 msgid "News (NNTP)"
 msgstr ""
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr ""
 
@@ -13117,11 +13105,11 @@ msgstr ""
 msgid "Mail address"
 msgstr ""
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr ""
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr ""
 
@@ -13207,7 +13195,7 @@ msgid ""
 "you will be able to download them fully or delete them."
 msgstr ""
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr ""
 
@@ -13219,260 +13207,256 @@ msgstr ""
 msgid "unlimited if 0 is specified"
 msgstr ""
 
-#: src/prefs_account.c:1581
-msgid "Plain text"
-msgstr ""
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr ""
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr ""
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr ""
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr ""
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr ""
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr ""
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr ""
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr ""
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr ""
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr ""
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr ""
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr ""
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr ""
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr ""
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr ""
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr ""
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr ""
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr ""
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr ""
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr ""
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr ""
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr ""
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr ""
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr ""
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr ""
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr ""
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr ""
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr ""
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr ""
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr ""
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr ""
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr ""
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr ""
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr ""
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr ""
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr ""
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr ""
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr ""
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr ""
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr ""
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr ""
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr ""
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr ""
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Move deleted mails to wastebin and expunge immediately"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -13480,108 +13464,108 @@ msgstr ""
 "Moves deleted mails to wastebin instead of using the \\Deleted flag without "
 "expunging."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mark cross-posted messages as read and colour:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr ""
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr ""
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr ""
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr ""
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr ""
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr ""
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr ""
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr ""
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr ""
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr ""
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr ""
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr ""
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr ""
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr ""
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr ""
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr ""
@@ -14583,7 +14567,7 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr ""
 
@@ -14715,7 +14699,7 @@ msgstr ""
 msgid "Status messages for filtering/processing log"
 msgstr ""
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr ""
 
@@ -15332,128 +15316,110 @@ msgstr "Pick colour for folder"
 msgid "Colors"
 msgstr "Colours"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr ""
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr ""
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr ""
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr ""
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Empty wastebin on exit"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr ""
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 msgid ""
 "If checked, you can change the keyboard shortcuts of most of the menu items "
 "by focusing on the menu item and pressing a key combination.\n"
 "Uncheck this option if you want to lock all existing keyboard shortcuts."
 msgstr ""
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr ""
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr ""
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
 msgstr ""
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr ""
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr ""
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr ""
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Ask before emptying wastebin"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr ""
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
 msgstr ""
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
 msgstr ""
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr ""
 
-#: src/prefs_other.c:607
-msgid "Master password"
-msgstr ""
-
-#: src/prefs_other.c:610
-msgid "Use a master password"
-msgstr ""
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-msgid "Change master password"
-msgstr ""
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr ""
 
@@ -15704,8 +15670,8 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr ""
 
@@ -16414,53 +16380,53 @@ msgstr ""
 msgid "No recipient keys defined."
 msgstr ""
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr ""
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr ""
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr ""
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr ""
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr ""
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr ""
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr ""
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr ""
 
@@ -16729,88 +16695,88 @@ msgstr ""
 msgid "Enter variable"
 msgstr ""
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr ""
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr ""
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr ""
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr ""
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr ""
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr ""
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr ""
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr ""
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr ""
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr ""
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr ""
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr ""
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr ""
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr ""
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr ""
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr ""
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr ""
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr ""
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr ""
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -17669,12 +17635,12 @@ msgstr ""
 msgid "Select All"
 msgstr ""
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr ""
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -17723,139 +17689,139 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr ""
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr ""
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr ""
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr ""
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr ""
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr ""
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr ""
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr ""
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Your organisation:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr ""
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr ""
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr ""
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr ""
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr ""
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr ""
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr ""
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr ""
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr ""
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr ""
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr ""
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr ""
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr ""
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr ""
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr ""
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
 msgstr ""
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr ""
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr ""
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -17864,31 +17830,31 @@ msgid ""
 "five minutes."
 msgstr ""
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr ""
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr ""
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr ""
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr ""
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr ""
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr ""
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
diff --git a/po/es.po b/po/es.po
index 7df3bfb..3433fd5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.14.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-20 02:28+0100\n"
 "PO-Revision-Date: 2015-12-20 03:34+0100\n"
 "Last-Translator: Ricardo Mones <ricardo at mones.org>\n"
 "Language-Team: Spanish\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 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:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "No se puede crear la carpeta."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Editar cuentas"
 
-#: src/account.c:744
+#: src/account.c:741
 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,43 +46,43 @@ msgstr ""
 "orden dado, la casilla indica que cuentas se incluirán. El texto en negrita "
 "indica la cuenta por defecto."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " _Establecer como primaria "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Las cuentas con carpetas remotas no se pueden copiar."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Realmente quiere borrar la cuenta «%s»?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Borrar cuenta"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -95,11 +95,11 @@ msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Servidor"
 
@@ -152,10 +152,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -416,18 +416,18 @@ msgid "_Book"
 msgstr "_Agenda"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Ayuda"
 
@@ -466,13 +466,13 @@ msgstr "_Borrar agenda"
 msgid "_Save"
 msgstr "_Guardar..."
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "_Seleccionar todo"
 
@@ -481,7 +481,7 @@ msgid "C_ut"
 msgstr "C_ortar"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copiar"
@@ -531,8 +531,8 @@ msgstr "Buscar duplicados..."
 msgid "Edit custom attributes..."
 msgstr "Editar atributos de usuario..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_Acerca de"
 
@@ -648,7 +648,7 @@ msgstr "Se necesita autenticación (más) fuerte"
 msgid "Sources"
 msgstr "Fuentes"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Agenda de direcciones"
@@ -699,7 +699,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -812,7 +812,7 @@ msgid "Person"
 msgstr "Persona"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -948,18 +948,19 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Falló la actualización. No se escribieron los cambios en el directorio."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9473
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5680 src/compose.c:6203
+#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:746 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4892
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5621 src/inc.c:669
 #: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
 msgid "Error"
 msgstr "Error"
@@ -992,66 +993,66 @@ msgstr "Nombre LDAP"
 msgid "Attribute Value"
 msgstr "Valor del atributo"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Nada"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "un visor"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "un parser MIME"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "carpetas"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "filtrado"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "un interfaz de privacidad"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "un notificador"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "una utilidad"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "cosas"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, 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:434
 msgid "Plugin already loaded"
 msgstr "El módulo ya está cargado"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Falló la petición de memoria para el Módulo"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 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:494
+#: src/common/plugin.c:488
 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:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1060,7 +1061,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:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1068,16 +1069,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:800
+#: 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:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Su versión de Claws Mail es demasiado antigua para el módulo."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "Negociación SSL fallida\n"
 
@@ -1466,7 +1467,7 @@ msgstr "Elimina_r"
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_Mensaje"
 
@@ -1534,7 +1535,7 @@ msgstr "_Recortado"
 msgid "_Unwrapped"
 msgstr "_Sin recortar"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Seleccionar todo"
@@ -1599,7 +1600,7 @@ msgstr "Borrar línea"
 msgid "Delete to end of line"
 msgstr "Borrar hasta el final de la línea"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Buscar"
@@ -1644,47 +1645,47 @@ msgstr "_Sistema de privacidad"
 msgid "_Priority"
 msgstr "_Prioridad"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Codificación de caract_eres"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Chino"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Tailandés"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Agenda de direcciones"
 
@@ -1692,7 +1693,7 @@ msgstr "_Agenda de direcciones"
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Accio_nes"
 
@@ -1728,11 +1729,11 @@ msgstr "Mostrar _regleta"
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Todo"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_Remitente"
 
@@ -1756,27 +1757,27 @@ msgstr "_Baja"
 msgid "_Lowest"
 msgstr "M_uy baja"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automático"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Griego (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
@@ -1827,46 +1828,46 @@ msgstr "Error en el cuerpo de la plantilla de «Reenviar» en la línea %d."
 msgid "Fw: multiple emails"
 msgstr "Rv: múltiples correos"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, 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:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Responder a:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4935 src/compose.c:4937
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grupos de noticias:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Enviar a:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En-Respuesta-A:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4932 src/compose.c:4940
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 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:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1881,16 +1882,16 @@ msgstr[1] ""
 "Se han adjuntado los siguientes ficheros: \n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "La «marca de cita» de la plantilla no es válida."
 
-#: src/compose.c:3605
+#: src/compose.c:3602
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "No se puede obtener el tamaño del fichero «%s»."
 
-#: src/compose.c:3616
+#: src/compose.c:3613
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1899,57 +1900,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:3619
+#: src/compose.c:3616
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3617 src/compose.c:10529 src/compose.c:11390
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: src/compose.c:3744
+#: src/compose.c:3741
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:3745
+#: src/compose.c:3742
 msgid "Empty file"
 msgstr "Fichero vacío"
 
-#: src/compose.c:3746
+#: src/compose.c:3743
 msgid "_Attach anyway"
 msgstr "_Adjuntar igualmente"
 
-#: src/compose.c:3755
+#: src/compose.c:3752
 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3779
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4772 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4779 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4782 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sin asunto] - Componer mensaje%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4784 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Componer un mensaje nuevo"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4811 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1957,55 +1958,55 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5031 src/compose.c:5063 src/compose.c:5105
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:5035
+#: src/compose.c:5032
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección CC por omisión. ¿Enviar de todas "
 "formas?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5033 src/compose.c:5065 src/compose.c:5098 src/compose.c:5622
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:5067
+#: src/compose.c:5064
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección BCC por omisión. ¿Enviar de todas "
 "formas?"
 
-#: src/compose.c:5084
+#: src/compose.c:5081
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5100 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_A la cola"
 
-#: src/compose.c:5104
+#: src/compose.c:5101
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "El asunto esta vacío. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5102 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "¿Enviarlo igualmente?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "¿Ponerlo en la cola igualmente?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5105 src/toolbar.c:425
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5158 src/compose.c:9993
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2015,7 +2016,7 @@ msgstr ""
 "\n"
 "Falló la conversión del conjunto caracteres."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5161 src/compose.c:9996
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2025,7 +2026,7 @@ msgstr ""
 "\n"
 "No se pudo obtener la clave de cifrado del destinatario."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5167 src/compose.c:9990
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2036,7 +2037,7 @@ msgstr ""
 "\n"
 "Falló la firma: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5170
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2047,11 +2048,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5172
 msgid "Could not queue message for sending."
 msgstr "No se puede poner en la cola el mensaje para enviar."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5187 src/compose.c:5247
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2059,7 +2060,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:5246
+#: src/compose.c:5243
 #, c-format
 msgid ""
 "%s\n"
@@ -2068,7 +2069,7 @@ msgstr ""
 "%s\n"
 "Utilice «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
 
-#: src/compose.c:5621
+#: src/compose.c:5618
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2079,7 +2080,7 @@ msgstr ""
 "al conjunto de caracteres %s especificado.\n"
 "¿Enviarlo como %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5676
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2092,72 +2093,73 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:5790
+#: src/compose.c:5787
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "No se puede cifrar el correo: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5908
 msgid "Encryption warning"
 msgstr "Aviso de cifrado"
 
-#: src/compose.c:5912
+#: src/compose.c:5909
 msgid "C_ontinue"
 msgstr "C_ontinuar"
 
-#: src/compose.c:5961
+#: src/compose.c:5958
 msgid "No account for sending mails available!"
 msgstr "¡No hay ninguna cuenta disponible para enviar correos!"
 
-#: src/compose.c:5970
+#: src/compose.c:5967
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "La cuenta seleccionada no es NNTP: es imposible enviar el post."
 
-#: src/compose.c:6205
+#: src/compose.c:6202
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "El adjunto %s ya no existe. ¿Ignorar?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6203 src/mainwindow.c:651 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Cancelar envío"
 
-#: src/compose.c:6206
+#: src/compose.c:6203
 msgid "Ignore attachment"
 msgstr "Ignorar adjunto"
 
-#: src/compose.c:6246
+#: src/compose.c:6243
 #, c-format
 msgid "Original %s part"
 msgstr "Parte original %s"
 
-#: src/compose.c:6824
+#: src/compose.c:6825
 msgid "Add to address _book"
 msgstr "Añadir a la agen_da"
 
-#: src/compose.c:6985
+#: src/compose.c:6986
 msgid "Delete entry contents"
 msgstr "Borrar contenidos de la cuenta"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6990 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar «tab» para autocompletar con la agenda"
 
-#: src/compose.c:7204
+#: src/compose.c:7212
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:7273
+#: src/compose.c:7281
 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7318 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2168,23 +2170,23 @@ msgstr "Guardar mensaje en "
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: src/compose.c:7783
+#: src/compose.c:7791
 msgid "Hea_der"
 msgstr "_Cabecera"
 
-#: src/compose.c:7788
+#: src/compose.c:7796
 msgid "_Attachments"
 msgstr "_Adjuntos"
 
-#: src/compose.c:7802
+#: src/compose.c:7810
 msgid "Othe_rs"
 msgstr "Ot_ros"
 
-#: src/compose.c:7817
+#: src/compose.c:7825
 msgid "S_ubject:"
 msgstr "As_unto:"
 
-#: src/compose.c:8041
+#: src/compose.c:8049
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2193,19 +2195,19 @@ msgstr ""
 "No se puede iniciar el corrector ortográfico.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8188
 msgid "_From:"
 msgstr "_Desde:"
 
-#: src/compose.c:8197
+#: src/compose.c:8205
 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 
-#: src/compose.c:8199
+#: src/compose.c:8207
 msgid "Sender address to be used"
 msgstr "Dirección del remitente a usar"
 
-#: src/compose.c:8365
+#: src/compose.c:8373
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2214,68 +2216,68 @@ msgstr ""
 "No se ha podido cargar el sistema de privacidad «%s». No será posible firmar "
 "o cifrar este mensaje."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8575 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla en la línea %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8691
 msgid "Template From format error."
 msgstr "Error de formato en el Desde de la plantilla."
 
-#: src/compose.c:8701
+#: src/compose.c:8709
 msgid "Template To format error."
 msgstr "Error de formato en el Para de la plantilla."
 
-#: src/compose.c:8719
+#: src/compose.c:8727
 msgid "Template Cc format error."
 msgstr "Error de formato en el Cc de la plantilla."
 
-#: src/compose.c:8737
+#: src/compose.c:8745
 msgid "Template Bcc format error."
 msgstr "Error de formato en el Bcc de la plantilla."
 
-#: src/compose.c:8755
+#: src/compose.c:8763
 msgid "Template Reply-To format error."
 msgstr "Error de formato en el Reply-To de la plantilla."
 
-#: src/compose.c:8774
+#: src/compose.c:8782
 msgid "Template subject format error."
 msgstr "Error de formato en el asunto de la plantilla."
 
-#: src/compose.c:9043
+#: src/compose.c:9051
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:9058
+#: src/compose.c:9066
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:9132
+#: src/compose.c:9140
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:9149
+#: src/compose.c:9157
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:9190
+#: src/compose.c:9198
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:9210
+#: src/compose.c:9218
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:9211
+#: src/compose.c:9219
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:9462
+#: src/compose.c:9470
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2286,15 +2288,15 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9959 src/messageview.c:1097
 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:9977
+#: src/compose.c:9985
 msgid "Could not queue message."
 msgstr "El mensaje no se pudo poner en la cola."
 
-#: src/compose.c:9979
+#: src/compose.c:9987
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2305,15 +2307,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10165
 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 
-#: src/compose.c:10161
+#: src/compose.c:10169
 msgid "Could not save draft"
 msgstr "No se puede guardar el borrador"
 
-#: src/compose.c:10162
+#: src/compose.c:10170
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2321,24 +2323,24 @@ msgstr ""
 "No se ha podido guardar el borrador.\n"
 "¿Desea cancelar la salida o descartar este correo?"
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Cancel exit"
 msgstr "_Cancelar salida"
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Discard email"
 msgstr "_Descartar correo"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10332 src/compose.c:10346
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:10352
+#: src/compose.c:10360
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero «%s»."
 
-#: src/compose.c:10354
+#: src/compose.c:10362
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2347,54 +2349,54 @@ msgstr ""
 "El fichero «%s» contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 
-#: src/compose.c:10441
+#: src/compose.c:10449
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:10442
+#: src/compose.c:10450
 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10451 src/compose.c:10455
 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: src/compose.c:10446
+#: src/compose.c:10454
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Este mensaje se ha modificado. ¿Guardar los últimos cambios?"
 
-#: src/compose.c:10447
+#: src/compose.c:10455
 msgid "_Don't save"
 msgstr "_No guardar"
 
-#: src/compose.c:10518
+#: src/compose.c:10526
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:10520
+#: src/compose.c:10528
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10529 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:11379
+#: src/compose.c:11387
 msgid "Insert or attach?"
 msgstr "¿Insertar o adjuntar?"
 
-#: src/compose.c:11380
+#: src/compose.c:11388
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2402,16 +2404,16 @@ msgstr ""
 "¿Quiere insertar el contenido de este/os fichero/s en el cuerpo del correo o "
 "prefiere adjuntarlo/s al mismo?"
 
-#: src/compose.c:11382
+#: src/compose.c:11390
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: src/compose.c:11599
+#: src/compose.c:11607
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de formato de cita en la línea %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11902
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2628,8 +2630,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:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Fichero"
 
@@ -2777,7 +2779,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2961,7 +2963,7 @@ msgstr ""
 "El número máximo de entradas que deberían retornarse en los resultados de la "
 "búsqueda."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Básicas"
 
@@ -3096,15 +3098,15 @@ msgid "Stylesheet"
 msgstr "Hoja de estilos"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Ninguno"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Por omisión"
 
@@ -3614,27 +3616,27 @@ msgstr "Papelera"
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Procesando (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s a %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Moviendo %s a %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualizando caché para %s..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Procesando mensajes..."
 
@@ -3656,11 +3658,11 @@ msgstr "Seleccionar carpeta"
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215
+#: src/imap_gtk.c:271 src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:424 src/plugins/rssyl/rssyl_cb_menu.c:206
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "No se puede usar «%c» en el nombre de la carpeta."
@@ -3668,7 +3670,7 @@ msgstr "No se puede usar «%c» en el nombre de la carpeta."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta «%s» ya existe."
@@ -3692,7 +3694,7 @@ msgstr "Marcar todos como leídos recursi_vamente"
 msgid "R_un processing rules"
 msgstr "Ejec_utar reglas de procesamiento"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_Buscar en carpeta..."
 
@@ -3750,12 +3752,12 @@ msgstr "¿Quiere realmente marcar todos los correos en la carpeta como leídos?"
 msgid "Mark all as read"
 msgstr "Marcar todo como leído"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Revisando carpeta %s%c%s..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Revisando carpeta %s..."
@@ -3801,7 +3803,7 @@ msgstr "Abriendo carpeta %s..."
 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
@@ -4041,7 +4043,7 @@ msgstr ""
 "Localización: %s (caracteres: %s)\n"
 "Sistema operativo: desconocido"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "El equipo de Claws Mail"
 
@@ -4930,8 +4932,8 @@ msgstr "Leyenda de iconos"
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr ""
-"Los siguientes iconos se usan para mostrar el estado de los mensajes y las "
-"carpetas:"
+"Los siguientes iconos se usan para mostrar el estado de los mensajes y "
+"las carpetas:"
 
 #: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
@@ -5033,9 +5035,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Módulos"
 
@@ -5073,14 +5075,14 @@ msgstr "Módulos cargados"
 msgid "Page Index"
 msgstr "Página índice"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Ocultar"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5519,236 +5521,193 @@ msgstr "Tamaño:"
 msgid "Load Image"
 msgstr "Cargar imagen"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "La conexión IMAP4 se rompió\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Error IMAP en %s:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr " autenticado\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr " sin autenticación\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr " estado incorrecto\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr " error del canal\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
-msgstr ""
-" error interpretando (seguramente el servidor no es conforme a los RFC)\n"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
+msgstr " error interpretando (seguramente el servidor no es conforme a los RFC)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr " conexión rehusada\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr " error de memoria\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr " error fatal\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
-msgstr ""
-"  error de protocolo (seguramente el servidor no es conforme a los RFC)\n"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
+msgstr "  error de protocolo (seguramente el servidor no es conforme a los RFC)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr " la conexión no fue aceptada\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " error de APPEND\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " error de NOOP\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " error de LOGOUT\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " error de CAPABILITY\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " error de CHECK\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " error de CLOSE\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " error de EXPUNGE\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " error de COPY\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " error de UID COPY\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " error de CREATE\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " error de DELETE\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " error de EXAMINE\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " error de FETCH\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " error de UID FETCH\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " error de LIST\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " error de LOGIN\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr " error de LSUB\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " error de RENAME\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " error de SEARCH\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " error de UID SEARCH\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " error de SELECT\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " error de STATUS\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " error de STORE\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " error de UID STORE\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " error de SUBSCRIBE\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " error de UNSUBSCRIBE\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " error de STARTTLS\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " error de INVAL\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " error de EXTENSION\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " error de SASL\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " error de SSL\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr " Error desconocido [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5760,7 +5719,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:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5772,7 +5731,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:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5784,50 +5743,37 @@ 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:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"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:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Falló la conexión con %s: login rechazado.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Falló la conexión con %s: login rechazado.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Falló la conexión con %s"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP4 con %s se ha desconectado. Reconectando...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 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:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Conexión insegura"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5840,104 +5786,104 @@ msgstr ""
 "\n"
 "¿Quiere seguir conectando con este servidor? La comunicación no sería segura."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "Seguir conec_tando"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor IMAP4: %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "No se puede iniciar la sesión TLS.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No se puede entrar al servidor IMAP %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No se puede entrar al servidor IMAP %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Añadiendo mensajes..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags «borrado»\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, 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:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buzón\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST falló\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Etiquetando mensajes..."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor necesita TLS para acceder a él.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5946,20 +5892,20 @@ msgstr ""
 "La conexión con %s falló: el servidor necesita TLS, pero Claws Mail ha sido "
 "compilado sin soporte TLS.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor están deshabilitados.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no se pueden establecer los flags 'borrado': %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6011,7 +5957,7 @@ msgstr "S_uscripciones"
 msgid "_Subscribe..."
 msgstr "_Suscribir..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "Des_uscribir..."
 
@@ -6048,20 +5994,20 @@ msgstr "Heredar las propiedades de la carpeta padre"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Introduzca el nuevo nombre para «%s»:"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6084,7 +6030,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
@@ -6111,7 +6057,7 @@ msgstr "_Buscar"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Elija una subcarpeta de %s a la que suscribirse: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Suscribir"
 
@@ -6144,8 +6090,8 @@ msgstr "suscribir"
 msgid "unsubscribe"
 msgstr "desuscribir"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428
+#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Aplicar a subcarpetas"
 
@@ -6339,56 +6285,56 @@ msgstr "Seleccionar fichero Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importar fichero Pine a la agenda"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 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:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s falló\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, 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:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Tiempo límite"
 
@@ -6424,7 +6370,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
@@ -6449,7 +6395,7 @@ msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de los mensajes (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Saliendo"
 
@@ -6500,7 +6446,7 @@ msgstr "Error de conector."
 msgid "Socket error on connection to %s:%d."
 msgstr "Error de conector conectando con %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
@@ -6522,11 +6468,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "La autenticación falló."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6535,7 +6481,7 @@ msgstr ""
 "La autenticación falló:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6888,814 +6834,809 @@ msgstr "NetworkManager: la red está conectada.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la red está desconectada.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Fichero"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "_Ver"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Configuración"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "_Añadir buzón"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Reorganizar buzones..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "_Importar fichero mbox..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "_Exportar a fichero mbox..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "_Exportar la selección a un fichero mbox..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Vaciar _todas las papeleras"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Guardar mensaje como..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_Guardar parte como..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Configurar página..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "Sincronizar carpetas"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "_Salir"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "Seleccionar _hilo"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_Buscar en el mensaje actual..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "Búsqueda _rápida"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "Mostrar u o_cultar"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "_Barra de herramientas"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "Establecer _columnas visibles"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "En la lista de _carpetas..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "En la lista de _mensajes..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "_Aspecto"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "_Atraer por asunto"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "E_xpandir todos los hilos"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Ir a"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "Mensaje _anterior"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "Mensaje _siguiente"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Mensaje a_nterior no leído"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Mensaje s_iguiente no leído"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Mensaje nuev_o siguiente"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Mensaje _marcado anterior"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Mensaje m_arcado siguiente"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Mensaje _etiquetado anterior"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Mensaje e_tiquetado siguiente"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Mensaje abierto anterior"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Mensaje abierto siguiente"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Mensaje padre"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Siguiente _carpeta sin leer"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Otra carpeta..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Parte siguiente"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Parte anterior"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Desplazamiento del mensaje"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Línea anterior"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Línea siguiente"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Página siguiente"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Decodificar"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "Abrir en ventana _nueva"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Fuente del mens_aje"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Parte del mensaje"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Mostrar como texto"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Abrir"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Abrir con..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Citas"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "_Actualizar resumen"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "Reci_bir"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "De la cuenta _actual"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "De _todas las cuentas"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "Cancelar re_cepción"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "_Enviar mensajes en la cola"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "Compo_ner un mensaje de correo"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Componer un mensaje de noticias"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Respon_der a"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_Lista-Correo"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Seguir y responder a"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Reen_viar como adjunto"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Redirigi_r"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "Lista-Correo"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Postear"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "_Ayuda"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Desuscribir"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Ver archivo"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "Contactar proprietario"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "M_over..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Mover a la p_apelera"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "_Borrar..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Mover hilo a la p_apelera"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "Borrar _hilo"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Cancelar una noticia"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_Marcar"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_Desmarcar"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Marcar como _no leído"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Marcar como _leído"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Marcar todos como leídos"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorar hilo"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Dejar de ignorar hilo"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Observar hilo"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Dejar de observar hilo"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Marcar como ba_sura"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Marcar como _bueno"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "Etiqueta de co_lor"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Eti_quetas"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "Re_editar"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Verificar firma"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Añadir _remitente a la agenda"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "Rec_olectar direcciones"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "De la _carpeta actual..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "De los _mensajes seleccionados..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "_Filtrar todos los mensajes en la carpeta"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Ejecutar reglas de procesamiento de la carpeta"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Crear regla de f_iltrado"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automático"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "Por el _Desde"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Por el _Para"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "Por el A_sunto"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Crear regla de procesamiento"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Listar _URLs..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "Comprobar m_ensajes nuevos en todas las carpetas"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "En la carpeta seleccionada"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "En todas las carpetas"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "E_jecutar"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "P_urgar"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "Cer_tificados SSL"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "Traza de f_iltrado"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "Tra_za de red"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "_Olvidar todas las contraseñas de sesión"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "_Olvidar todas las contraseñas de sesión"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "_Cambiar cuenta actual"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Crear _nueva cuenta..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "_Editar cuentas..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "P_referencias..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "Pre-pr_ocesamiento..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "Post-pro_cesamiento..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Filtrado..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "_Plantillas..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Acciones..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "Etiqueta_s..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "_Módulos..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "P_F de usuarios en línea (FAQ)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "_Leyenda de iconos"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Establecer como cliente por defecto"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "_Modo sin conexión"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Barra de men_u"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "Vista de _mensaje"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "_Barra de estado"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Cabeceras de columna"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "_Vista jerárquica"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Esconder los hilos leídos"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "_Esconder los mensajes leídos"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Ocultar mensajes borrados"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "Pantalla _completa"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Mostrar todas las ca_beceras"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Co_lapsar todos"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Colapsar desde el nivel _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Colapsar desde el nivel _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Texto _bajo los iconos"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Texto _junto a los iconos"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Sólo _iconos"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "Sólo _texto"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Estándar"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Tres columnas"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "Mensaje _ancho"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "L_ista de mensajes ancha"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "_Pantalla pequeña"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "Por _número"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "Por _tamaño"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "Por _fecha"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Por fecha del hilo"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "Por el as_unto"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "Por el _color"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Por la etiqueta"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "Por _marca"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "Por e_stado"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "Por adjun_to"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Por puntuación"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Por bloqueado"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "N_o ordenar"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Descendente"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_Auto detectar"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Aplicar etiquetas..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 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:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Esta conectado. Pulse en el icono para desconectarse"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "Esta desconectado. Pulse en el icono para conectarse"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Seleccionar cuenta"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Traza del protocolo"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Traza de depuración de filtrado/procesamiento"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "traza de filtrado activada\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "traza de filtrado desactivada\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "¿Borrar todos los mensajes de las papeleras?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "No salir"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7705,18 +7646,18 @@ msgstr ""
 "Si especifica un buzón existente será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 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:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7726,79 +7667,79 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "No esta permitido enviar"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "La importación de mbox ha fallado."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "La exportación a mbox ha fallado."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "¿Salir de Claws Mail?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Sincronización de carpeta"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "¿Quiere sincronizar sus carpetas ahora?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Sincronizar"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, 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:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Configuración de filtrado"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "No se puede registrar como cliente por defecto: imposible obtener la ruta al "
 "ejecutable."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Se ha registrado Claws Mail como cliente por defecto."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "No se puede registrar como cliente por defecto: imposible escribir en el "
 "registro."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7878,7 +7819,7 @@ msgstr "Sobreescribir fichero mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Este fichero ya existe. ¿Desea sobreescribir su contenido?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Sobreescribir"
@@ -7924,19 +7865,19 @@ msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Componer un mensaje _nuevo"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista de mensaje"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<No se encontró Return-Path>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7951,11 +7892,11 @@ msgstr ""
 "Dirección de retorno: %s\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_No enviar"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7967,47 +7908,47 @@ msgstr ""
 "oficialmente dirigido a usted.\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Recuperando mensaje (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No se puede descifrar: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 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:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Guardar como"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir el fichero existente?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No se pudo guardar el fichero «%s»."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Mostrar todo %s."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Mostrar sólo el primer megabyte de texto."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8015,19 +7956,19 @@ msgstr ""
 "Recibió un acuse de recibo en este mensaje: éste ha sido visualizado por el "
 "destinatario."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Usted solicitó acuse de recibo en este mensaje."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Este mensaje solicita acuse de recibo."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8035,7 +7976,7 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente,\n"
 "y ha sido eliminado del servidor."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8044,15 +7985,15 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Marcar para descargar"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Marcar para eliminar"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8061,12 +8002,12 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será descargado."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Desmarca"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8075,11 +8016,11 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será eliminado."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Notificación de acuse de recibo"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8091,19 +8032,19 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Enviar notificación"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No se puede imprimir: el mensaje no contiene texto."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8111,7 +8052,7 @@ msgstr ""
 "\n"
 "  No hay mensajes en esta carpeta"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8119,7 +8060,7 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8127,16 +8068,16 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado o movido a otra carpeta"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "Ocurrió un error mientras se aprendía.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Moviendo mensajes..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Borrando mensajes..."
 
@@ -8237,7 +8178,8 @@ msgid "Go back to email"
 msgstr "Volver al correo"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190
+#: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No se pudo guardar la parte del mensaje multipartes: %s"
@@ -8315,80 +8257,80 @@ msgstr "Tamaño:"
 msgid "Description:"
 msgstr "Descripción:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "La conexión NNTP con %s:%d se ha desconectado.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Cuenta «%s»: Conectando al servidor NNTP: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Error entrando en %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan no soporta el código de retorno 480 por ahora, escogemos continuar\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Falló el modo «reader», se continúa sin embargo\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Error creando sesión con %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Error autenticándose en %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder acceder al servidor de "
 "noticias."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "no se pudo seleccionar el grupo: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "no se pudo establecer el grupo: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos inválido: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "no se pudo obtener xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "no se pudo obtener xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "línea xover inválida\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9166,7 +9108,8 @@ msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr "No comprueba si faltan adjuntos al reenviar o redirigir mensajes"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Firmas"
 
@@ -9277,12 +9220,14 @@ msgstr ""
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/"
 "Bogofilter»"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Detección de correo basura"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Aprendizaje de correo basura"
@@ -9883,7 +9828,7 @@ msgstr "Las CSS en este fichero se aplicarán a todas las partes HTML"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "E_xplorar"
@@ -9892,93 +9837,93 @@ msgstr "E_xplorar"
 msgid "Select stylesheet"
 msgstr "Seleccionar estilos"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Carga de contenidos remotos desactivada."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Cargar imágenes"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Activar contenidos remotos"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Activar Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Activar módulos"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Activar Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Abrir enlaces con el navegador externo"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocurrió un error: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s es un canal mal formado o no soportado"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Buscar en la web"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Abrir en el visor"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Abrir en el visor (activar contenidos remotos)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Abrir con el navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Abrir imagen"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Copiar enlace"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Descargar enlace"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Descargar imagen como"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Copiar imagen"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Importar canal"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Visor HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10072,11 +10017,11 @@ msgstr ""
 "Agrega la cabecera X-FETCH-TIME con la fecha y hora de la recuperación del "
 "mensaje en formato RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "Módulo GData: Autorización necesaria"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10094,30 +10039,30 @@ msgstr ""
 "Introduzca dicho código en el siguiente campo para conceder acceso a Claws "
 "Mail a su lista de contactos de Google."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Paso 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 "Haga clic aquí para abrir la página de autorización de Google en el navegador"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Paso 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Introducir código:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Módulo GData: error solicitando contactos: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10125,50 +10070,50 @@ msgstr[0] "Añadido %d de"
 msgstr[1] "Añadidos %d de"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 contacto al almacenamiento temporal"
 msgstr[1] "%d contactos al almacenamiento temporal"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Módulo GData: comenzando solicitud asíncrona de contactos\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Módulo GData: error solicitando grupos: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "Módulo GData: grupos recibidos\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Módulo GData: comenzando solicitud asíncrona de grupos\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Módulo GData: Error de autorización: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "Módulo GData: Autorización realizada con éxito\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Módulo GData: Iniciando la autorización interactiva\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 "Módulo GData: Consiguió el código de autorización, solicitando la "
 "autorización\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10176,26 +10121,26 @@ msgstr ""
 "Módulo GData: No se recibió el código de autorización, cancelada la "
 "solicitud de la autorización\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Módulo GData: Error de actualización de autorización: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Módulo GData: Actualización de autorización correcta\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 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:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autenticación"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Usuario:"
 
@@ -10238,7 +10183,7 @@ msgstr ""
 "\n"
 "Sugerencias para <berndth at gmx.de> serán bienvenidas."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "Integración con GData"
 
@@ -10465,7 +10410,7 @@ msgstr "Tiempo límite de la petición"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "segundo(s)"
@@ -10757,28 +10702,28 @@ msgid "Specify authentication"
 msgstr "Especificar autenticación"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Usuario"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Contraseña"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automático"
 
@@ -11425,7 +11370,8 @@ msgstr "Introducir contraseña"
 #: src/plugins/pdf_viewer/poppler_viewer.c:1330
 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."
+msgstr ""
+"Este documento está bloqueado y necesita una contraseña para abrirlo."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1345
 #, c-format
@@ -11707,7 +11653,8 @@ msgstr "Caduca después de"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Estableciéndolo a '0' guarda la contraseña durante toda la sesión"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minuto(s)"
@@ -12335,9 +12282,9 @@ msgstr "Mostrar la consola de Python..."
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Explorar"
 
@@ -12645,7 +12592,7 @@ msgstr ""
 "del canal cambia el título del mismo."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Verificar la validez del certificado SSL"
 
@@ -12805,17 +12752,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Actualizando comentarios para «%s»..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Se requiere autorización)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (No autorizado)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (No encontrado)"
 
@@ -12953,21 +12900,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:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Informando de correo basura..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Informar de correo basura en línea..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "Informe de correo basura"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12983,19 +12930,19 @@ msgstr ""
 " * spamcop.net\n"
 " * sistema de nominación de lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Informe de correo basura"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Reenviar a:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -13201,7 +13148,8 @@ msgid "Show"
 msgstr "Mostrar"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "días"
 
@@ -13294,7 +13242,7 @@ msgid "Next month"
 msgstr "Mes siguiente"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13328,7 +13276,7 @@ msgstr ""
 "y calendarios, publicar su información de libre/ocupado y recuperar esa "
 "información de otras personas."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -13510,63 +13458,63 @@ msgstr "Convocados:"
 msgid "Action:"
 msgstr "Acción:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Nueva reunión..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Exportar calendario..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_Suscribirse a webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "A_ctualizar suscripciones"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "Vista en _lista"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "Vista _semanal"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "Vista _mensual"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Reuniones"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "en el pasado"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "hoy"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "mañana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "esta semana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "más tarde"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13575,17 +13523,17 @@ msgstr ""
 "\n"
 "Estos son los eventos planificados %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, 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:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Error %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13598,7 +13546,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13611,7 +13559,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13622,7 +13570,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13633,45 +13581,45 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "No se puede crear el directorio %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 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:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Recuperando calendario para %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "nueva suscripción"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 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:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Suscribirse a un calendario web"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Introduzca la URL del calendario web:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "No se pudo procesar la URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "¿Desea realmente desuscribirse?"
 
@@ -14044,83 +13992,83 @@ msgstr "No se puede exportar la información de libre/ocupado."
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "No se puede exportar la información de libre/ocupado a «%s»\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Avisarme"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "minutos antes de un evento"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Exportación de calendario"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Exportar automáticamente el calendario a"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Puede exportarlo a un fichero local o URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Especifique un fichero local o URL (http://servidor/ruta/fichero.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Incluir las suscripciones webcal en la exportación"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Orden a ejecutar tras la exportación del calendario"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registrar el calendario de Claws en el reloj Orage de XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Permite a Orage (versión 4.4 o mayor) ver el calendario de Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Exportar como servidor de calendario del shell de GNOME"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Registrar el interfaz D-Bus del servidor de calendario para exportar el "
 "calendario de Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Información libre/ocupado"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Exportar automáticamente el estado de libre/ocupado a"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Especifique un fichero local o URL (http://servidor/ruta/fichero.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Orden a ejecutar tras la exportación del estado de libre/ocupado"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Obtener el estado de libre/ocupado de otros desde"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14129,7 +14077,7 @@ msgstr ""
 "Especifique un fichero local o URL (http://servidor/ruta/fichero.ifb). Use "
 "%u para la parte izquierda de la dirección de correo, %d para el dominio"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "Opciones SSL"
 
@@ -14184,12 +14132,12 @@ msgstr "hubo un error en la sesión POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "orden TOP no soportada\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14197,7 +14145,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Fichero mbox local"
 
@@ -14225,11 +14173,11 @@ msgstr "Nombre completo"
 msgid "Mail address"
 msgstr "Dirección de correo"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Configuración automática"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -14319,7 +14267,7 @@ msgstr ""
 "Los mensajes que sobrepasen este límite serán recuperados parcialmente. Al "
 "seleccionarlos podrá descargarlos por completo o borrarlos."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14331,72 +14279,67 @@ msgstr "Número máximo de artículos a descargar"
 msgid "unlimited if 0 is specified"
 msgstr "sin límite si se especifica 0"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Buscar texto:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(vacío habitualmente)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Mostrar sólo carpetas suscritas"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Modo de ancho de banda eficiente (evita recuperar las etiquetas remotas)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 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:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permitir el filtrado usando módulos al recibir"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 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:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Cabecera"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Generar identificador de mensaje"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 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:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Añadir cabecera de agente de usuario"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticación SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14404,181 +14347,181 @@ 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:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticación con POP3 antes de enviar"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "Tiempo límite para autenticación POP: "
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "minutos"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Insertar la firma automáticamente"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Separador de la firma"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Diccionarios de corrección ortográfica"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Diccionario por omisión"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Diccionario alternativo predeterminado"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Componer"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Sistema de privacidad por omisión"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Firmar siempre los mensajes"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Cifrar siempre los mensajes"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 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:2279
+#: src/prefs_account.c:2277
 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:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Cifrar los mensajes enviados con la clave propia además de las del "
 "destinatario"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Guardar en claro los mensajes enviados cifrados"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar la orden STARTTLS para abrir la sesión SSL"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL (pero usar STARTTLS si es necesario)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Certificados de cliente"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Certificado para recepción"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado de cliente como fichero PKCS12 o PEM"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Certificado para envío"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Aceptar automáticamente los certificados SSL válidos"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL no-bloqueante"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desactive esto si tiene problemas de conexión con SSL"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "Puerto POP3"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "Puerto IMAP4"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Nombre de dominio"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14586,15 +14529,15 @@ 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:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Usar orden para comunicarse con el servidor"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Mover los correos borrados a la papelera y purgarlos inmediatamente"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14602,108 +14545,108 @@ msgstr ""
 "Mueve los correos borrados a la papelera en lugar de usar la marca "
 "«\\Deleted» sin purgarlos."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar los mensajes cruzados como leídos y de color:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de la cuenta."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "No se especificó el servidor POP3."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "La carpeta de entrada por omisión no existe."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "No se especificó el servidor IMAP4."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "no se especificó el nombre de fichero del buzón local."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "no se especificó el mandato de correo."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Plantillas"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Preferencias para una nueva cuenta"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferencias de la cuenta"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Falló (dirección errónea)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Seleccionar fichero de firma"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Seleccionar fichero del certificado"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (módulo no cargado)"
@@ -14825,20 +14768,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "¿Realmente quiere borrar todas las acciones?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
+#: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Seguir editando"
 
@@ -15553,14 +15497,15 @@ msgstr " Usar configuración inicial "
 
 #: src/prefs_folder_item.c:262 src/prefs_folder_item.c:864
 #: src/prefs_folder_item.c:1390
+#, suzzy
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder. "
 "However, you can set them for the whole mailbox tree by using \"Apply to "
 "subfolders\"."
 msgstr ""
-"Estas preferencias no se guardarán ya que esta carpeta es un buzón raíz. Sin "
-"embargo puede usarlas para establecerlas en todo el árbol de carpetas del "
-"buzón usando «Aplicar a subcarpetas»."
+"Estas preferencias no se guardarán ya que esta carpeta es un buzón raíz. "
+"Sin embargo puede usarlas para establecerlas en todo el árbol de carpetas "
+"del buzón usando «Aplicar a subcarpetas»."
 
 #: src/prefs_folder_item.c:274 src/prefs_folder_item.c:876
 msgid ""
@@ -15736,7 +15681,7 @@ msgstr "Ver"
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -15881,7 +15826,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:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Otras"
 
@@ -16509,15 +16454,15 @@ msgstr "Elegir color para «color %d»"
 msgid "Colors"
 msgstr "Colores"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Elegir configuración de atajos de teclado"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Seleccionar combinación:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16525,35 +16470,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:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Añadir la dirección al destino con doble clic"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Al salir"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Vaciar la papelera al salir"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Habilitar los atajos de teclado configurables"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16564,15 +16509,15 @@ msgstr ""
 "de teclas.\n"
 "Desmarque esta opción si quiere bloquear todos los atajos existentes."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Seleccionar configuración de atajos de teclado..."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Gestión de metadatos"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16581,33 +16526,33 @@ msgstr ""
 "metadatos;\n"
 "Evita la pérdida de datos en caso de caídas pero puede llevar cierto tiempo."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Más seguro"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Más rápido"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Tiempo límite de E/S del conector"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Preguntar antes de vaciar la papelera"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Preguntar sobre las reglas de filtrado específicas de la cuenta al filtrar "
 "manualmente"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Usar borrado de ficheros seguro si es posible"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16615,7 +16560,7 @@ msgstr ""
 "Usar borrado de ficheros seguro si es posible\n"
 "(el programa «shred» no está disponible)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16624,32 +16569,11 @@ msgstr ""
 "aleatorios antes de borrarlos. Esto ralentiza el borrado. Asegúrese de leer "
 "las implicaciones en la página del manual de shred."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronizar carpetas sin conexión tan pronto como sea posible"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Introducir contraseña"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Introducir contraseña"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Introducir contraseña"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
@@ -16906,8 +16830,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:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Enviando"
 
@@ -17643,28 +17567,28 @@ msgstr "No hay información disponible"
 msgid "No recipient keys defined."
 msgstr "No se definió ninguna clave para el destinatario."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Error decodificando BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Ya se está intentando enviar."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "No se puede abrir el fichero %s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "La cabecera del mensaje en cola está corrupta."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "Hubo algún error durante la sesión SMTP."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -17672,7 +17596,7 @@ msgstr ""
 "No se encontró una cuenta específica para enviar, y hubo un error durante la "
 "sesión SMTP."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17680,20 +17604,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:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "No se pudo crear el fichero temporal para enviar noticias."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "Error al escribir el fichero temporal para enviar noticias."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, 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:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Filtrando mensajes...\n"
 
@@ -18001,88 +17925,88 @@ msgstr "Introducir texto para sustituir «%s»"
 msgid "Enter variable"
 msgstr "Introducir variable"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, 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:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "No se pudo ejecutar la orden: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, 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:351
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Haciendo POP antes de SMTP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP antes de SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Cuenta «%s»: Conectando al servidor SMTP: %s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "Correo enviado con éxito."
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Autenticándose"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Enviando mensaje..."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Saliendo..."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Ocurrió un error enviando los mensajes."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18962,12 +18886,12 @@ msgstr "Por favor seleccione la URL a abrir."
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenido a Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -19061,47 +18985,47 @@ msgstr ""
 "hacerlo en «%s».\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Por favor introduzca el nombre del buzón."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 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:658
 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:668
 msgid "Please enter your username."
 msgstr "Por favor introduzca su nombre de usuario."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Por favor introduzca su servidor SMTP."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Por favor introduzca su nombre de usuario SMTP."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Su nombre:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Su dirección de correo:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Su organización:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Nombre del buzón:"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19109,7 +19033,7 @@ msgstr ""
 "Puede especificar también una ruta absoluta, por ejemplo: «/home/usuario/"
 "Documentos/Correo»"
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19117,55 +19041,55 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:25»"
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "Dirección del servidor SMTP:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Usar autenticación"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(vacío para usar el mismo que en la recepción)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "Usuario SMTP:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "Contraseña SMTP:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Usar SSL para conectar al servidor SMTP"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Usar SSL a través de STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Certificado SSL de cliente (opcional)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Dirección del servidor:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Buzón local:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19173,19 +19097,19 @@ msgstr ""
 "Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
 "com:110»"
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Usar SSL para conectar al servidor de recepción"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "Directorio del servidor IMAP:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Mostrar sólo las carpetas suscritas"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19193,15 +19117,15 @@ msgstr ""
 "Aviso: esta versión de Claws Mail\n"
 "se construyó sin soporte IMAP."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Ayudante de configuración de Claws Mail"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenido a Claws Mail "
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19215,31 +19139,31 @@ msgstr ""
 "correo más comunes de manera que pueda comenzar a usar Claws Mail en menos "
 "de cinco minutos."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Sobre usted"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Los campos en etiquetados en negrilla deben ser completados"
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Recibiendo correo"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Enviando correo"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Guardando el correo en el disco"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Configuración finalizada."
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
diff --git a/po/fi.po b/po/fi.po
index 3b32566..4d407f4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.13.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 11:20+0000\n"
 "PO-Revision-Date: 2015-12-13 18:34+0000\n"
 "Last-Translator: Flammie Pirinen <flammie at iki.fi>\n"
 "Language-Team: Finnish <laatu at lokalisointi.org>\n"
@@ -43,7 +43,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -51,15 +51,15 @@ msgstr ""
 "Viestinmuokkausikkunoita on vielä auki.\n"
 "Ne pitää sulkea ennen kuin tilejä voidaan muokata."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Kansiota ei voi luoda."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Muokkaa tilejä"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -68,43 +68,43 @@ msgstr ""
 "Hae viestit hakee järjestyksessä viestit tileiltä. Rastiruutu kertoo "
 "haettavat tilit ja lihavoitu teksti oletustilin."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " _Valitse oletustiliksi "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Tilejä, joissa on etäkansioita, ei voi kopioida."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kentän %s kopio"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Poistetaanko tili %s?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Nimetön)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Poista tili"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "H"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Hae viestit hakee viestit merkityiltä tileiltä"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -117,11 +117,11 @@ msgstr "Hae viestit hakee viestit merkityiltä tileiltä"
 msgid "Name"
 msgstr "Nimi"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Käytäntö"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Palvelin"
 
@@ -173,10 +173,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -434,18 +434,18 @@ msgid "_Book"
 msgstr "_Osoitekirja"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "_Työkalut"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "O_hje"
 
@@ -484,13 +484,13 @@ msgstr "_Poista kirja"
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Sulje"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "Valitse _kaikki"
 
@@ -499,7 +499,7 @@ msgid "C_ut"
 msgstr "_Leikkaa"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopioi"
@@ -549,8 +549,8 @@ msgstr "Hae kaksoiskappaleita…"
 msgid "Edit custom attributes..."
 msgstr "Muokkaa attribuutteja…"
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_Tietoja"
 
@@ -666,7 +666,7 @@ msgstr "Vahvempi todennus vaaditaan"
 msgid "Sources"
 msgstr "Lähteet"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Osoitekirja"
@@ -717,7 +717,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Poista kansio"
 
@@ -830,7 +830,7 @@ msgid "Person"
 msgstr "Henkilö"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Kansio"
 
@@ -965,19 +965,20 @@ msgstr "Osoitteiden päivitys"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Päivitys epäonnistui. Muutoksia ei kirjoitettu hakemistoon."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "Huomautus"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:750 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4892
 msgid "Warning"
 msgstr "Varoitus"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "Virhe"
 
@@ -1009,87 +1010,87 @@ msgstr "LDAP-nimi"
 msgid "Attribute Value"
 msgstr "Attribuutin arvo"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Ei mitään"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "näytin"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "MIME-tulkitsin"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "kansiot"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "suodatus"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "yksityisyysrajapinta"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "ilmoitin"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "toiminto"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "juttuja"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Tämä liitännäinen on %s (%s),samoin kuin olemassaoleva %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "Liitännäinen on jo ladattu"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Muistin varaaminen liitännäiselle epäonnistui"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr "Tämä moduuli ei ole GPL v3 tai myöhempi -yhteensopivasti lisensoitu."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Tämä moduuli on Claws Mailin GTK+1-versiolle."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr "Claws Mail on uudempi kuin mille liitännäinen %s on käännetty"
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "Claws Mail on uudempi kuin mille liitännäinen on käännetty"
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Claws Mail on liian vanha liitännäiselle %s"
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Claws Mail on liian vanha liitännäiselle"
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "SSL-kättely epäonnistui\n"
 
@@ -1478,7 +1479,7 @@ msgstr "_Poista"
 msgid "_Properties..."
 msgstr "_Asetukset"
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_Viesti"
 
@@ -1546,7 +1547,7 @@ msgstr "_rivitettynä"
 msgid "_Unwrapped"
 msgstr "_rivittämättä"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Valitse _kaikki"
@@ -1611,7 +1612,7 @@ msgstr "Poista sääntö"
 msgid "Delete to end of line"
 msgstr "Poista rivin loppuun"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Hae"
@@ -1656,47 +1657,47 @@ msgstr "Suojaus- ja _salaus-järjestelmä"
 msgid "_Priority"
 msgstr "_Tärkeysarvo"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Merkistökoodaus"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Länsieurooppalainen"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Balttilainen"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Heprealainen"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabialainen"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Kyrillinen"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japanilainen"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Kiinalainen"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Korealainen"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Thailainen"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Osoitekirja"
 
@@ -1704,7 +1705,7 @@ msgstr "_Osoitekirja"
 msgid "_Template"
 msgstr "_Malline"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "_Toiminnot"
 
@@ -1740,11 +1741,11 @@ msgstr "Näytä _viivain"
 msgid "_Normal"
 msgstr "_Normaali"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Kaikille"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_Välittäjä"
 
@@ -1768,27 +1769,27 @@ msgstr "_Matala"
 msgid "_Lowest"
 msgstr "Mata_lin"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automaattinen"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7‐bittinen ASCII (US‐ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF‐8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Keskieurooppalainen (ISO‐8859‐_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Kreikkalainen (ISO‐8859‐_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turkkilainen (ISO‐8859‐_9)"
 
@@ -1835,47 +1836,47 @@ msgstr "Edelleenlähetys-mallineen sisällön muotovirhe rivillä %d."
 msgid "Fw: multiple emails"
 msgstr "Ed: useita sähköposteja"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Uudelleenohjaus-mallineen sisällön muodon virhe rivillä %d."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopio:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Piilokopio:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Uutisryhmät:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Keskustelunsiirto:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Vastauksena viestiin:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Liitetiedoston liittäminen epäonnistui (merkistön muunnos epäonnistui)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1890,74 +1891,74 @@ msgstr[1] ""
 "Tiedostot liitettiin: \n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Lainausmerkinnät mallineessa ovat väärin"
 
-#: src/compose.c:3605
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Ei voitu lukea viestitiedoston %s kokoa"
 
-#: src/compose.c:3616
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Olet lisäämässä tiedostoa %s viestiin. Jatketaanko?"
 
-#: src/compose.c:3619
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "Toteutetaanko?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: src/compose.c:3744
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "Tiedosto %s on tyhjä."
 
-#: src/compose.c:3745
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "Tyhjä tiedosto"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "_Liitä kuitenkin"
 
-#: src/compose.c:3755
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "Tiedostoa %s ei voitu lukea."
 
-#: src/compose.c:3782
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "Viesti: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Muokattu]"
 
 # "sylpheed-claws - Muokataan viestiä (MUOKATTU)"
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s — Muokataan viestiä%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[ei aihetta] — Muokataan viestiä%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Muokkaa viestiä"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4820 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1965,51 +1966,51 @@ msgstr ""
 "Postin lähetykseen ei ole määritelty tiliä.\n"
 "Valitse postitili ennen lähettämistä."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Lähetä"
 
-#: src/compose.c:5035
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Ainoa vastaanottaja on oletuskopio-osoite. Lähetetäänkö silti?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: src/compose.c:5067
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Ainoa vastaanottaja on oletuspiilokopio-osoite. Lähetetäänkö silti?"
 
-#: src/compose.c:5084
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "Vastaanottajaa ei ole määritelty."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Jonoon"
 
-#: src/compose.c:5104
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Aihe puuttuu. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Lähetetäänkö?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Lisätäänkö jonoon?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "Lähetä myöhemmin"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2019,7 +2020,7 @@ msgstr ""
 "\n"
 "Merkistön muunnos epäonnistui."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2029,7 +2030,7 @@ msgstr ""
 "\n"
 "Vastaanottajan salausavainta ei saatu."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2040,7 +2041,7 @@ msgstr ""
 "\n"
 "Allekirjoitus epäonnistui: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2051,11 +2052,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "Viestin lisääminen jonoon lähettämistä varten ei onnistunut."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5196 src/compose.c:5256
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2064,7 +2065,7 @@ msgstr ""
 "Käytä pääikkunan Lähetä jonottavat viestit -painiketta yrittääksesi "
 "uudelleen."
 
-#: src/compose.c:5246
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2074,7 +2075,7 @@ msgstr ""
 "Käytä pääikkunan Lähetä jonottavat viestit -painiketta yrittääksesi "
 "uudelleen."
 
-#: src/compose.c:5621
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2084,7 +2085,7 @@ msgstr ""
 "Viestin merkistön muutos merkistöstä merkistölle %s\n"
 "ei onnistu, lähetetäänkö se joka merkistöllä %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2097,72 +2098,73 @@ msgstr ""
 "\n"
 "Lähetetäänkö joka tapauksessa?"
 
-#: src/compose.c:5790
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Ei voitu salata viesti': %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "Salausvaroitus"
 
-#: src/compose.c:5912
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "_Jatka"
 
-#: src/compose.c:5961
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "Sähköpostin lähettämiseen tarkoitettu tiliä ei ole saatavilla!"
 
-#: src/compose.c:5970
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Tili ei ole NNTP:lle joten lähetys ei onnistu."
 
-#: src/compose.c:6205
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Liitetiedostoa %s ei enää ole, ohitetaanko?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Peruuta lähetys"
 
-#: src/compose.c:6206
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "Ohita liite"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "Alkuperäinen osa %s"
 
-#: src/compose.c:6824
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "Lisää osoitekirj_aan"
 
-#: src/compose.c:6985
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "Poista kohteen sisältö"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Käytä tabulaattoria automaattiseen täydennykseen osoitekirjasta"
 
-#: src/compose.c:7204
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "MIME-tyyppi"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Koko"
 
-#: src/compose.c:7273
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "Tallenna viesti kohteeseen "
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7327 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2173,23 +2175,23 @@ msgstr "Tallenna viesti kohteeseen "
 msgid "_Browse"
 msgstr "_Selaa"
 
-#: src/compose.c:7783
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "_Otsake"
 
-#: src/compose.c:7788
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "_Liitteet"
 
-#: src/compose.c:7802
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "_Muut"
 
-#: src/compose.c:7817
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
-#: src/compose.c:8041
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2198,19 +2200,19 @@ msgstr ""
 "Oikolukua ei voitu käynnistää.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "_Lähettäjä:"
 
-#: src/compose.c:8197
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "Viestissä käytettävä tili"
 
-#: src/compose.c:8199
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "Käytettävä lähettäjäosoite"
 
-#: src/compose.c:8365
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2219,68 +2221,68 @@ msgstr ""
 "Salausjärjestelmää %s ei voi ladata. Viestien salaus tai allekirjoitus tälle "
 "viestille ei onnistu."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Ei mitään"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8584 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Mallineen sisällön muotovirhe rivillä %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "Mallineen lähettäjän muodon virhe."
 
-#: src/compose.c:8701
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "Mallineen vastaanottajan muodon virhe."
 
-#: src/compose.c:8719
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "Mallineen kopioiden muodon virhe."
 
-#: src/compose.c:8737
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "Mallineen piilokopioiden muodon virhe."
 
-#: src/compose.c:8755
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "Mallineen paluuosoitteen muodon virhe."
 
-#: src/compose.c:8774
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "Viestin aiheen muodon virhe."
 
-#: src/compose.c:9043
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "Virheellinen MIME-tyyppi."
 
-#: src/compose.c:9058
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "Tiedostoa ei ole tai se on tyhjä"
 
-#: src/compose.c:9132
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "Asetukset"
 
-#: src/compose.c:9149
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "MIME-tyyppi"
 
-#: src/compose.c:9190
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: src/compose.c:9210
+#: src/compose.c:9227
 msgid "Path"
 msgstr "Polku"
 
-#: src/compose.c:9211
+#: src/compose.c:9228
 msgid "File name"
 msgstr "Tiedostonimi"
 
-#: src/compose.c:9462
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2291,15 +2293,15 @@ msgstr ""
 "Suljetaanko se väkisin?\n"
 "prosessiryhmän id: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9968 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Sähköpostin lähettämiseen tarvitaan verkkoyhteyttä."
 
-#: src/compose.c:9977
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "Viestin lisääminen jonoon ei onnistunut."
 
-#: src/compose.c:9979
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2310,15 +2312,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "Ei voitu tallentaa luonnosta."
 
-#: src/compose.c:10161
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "Ei voitu tallentaa luonnosta"
 
-#: src/compose.c:10162
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2326,24 +2328,24 @@ msgstr ""
 "Luonnosta ei voitu tallentaa.\n"
 "Perutaanko lopetus vai poistetaanko viestin?"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "_Peru lopetus"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "_Poista viesti"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "Valitse tiedosto"
 
-#: src/compose.c:10352
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Tiedostoa ”%s” ei voitu lukea."
 
-#: src/compose.c:10354
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2352,70 +2354,70 @@ msgstr ""
 "Tiedosto ”%s” sisältää nykyiseen koodaukseen\n"
 "sopimattomia merkkejä, lisäykset saattavat olla virheellisiä."
 
-#: src/compose.c:10441
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "Poista viesti"
 
-#: src/compose.c:10442
+#: src/compose.c:10459
 msgid "This message has been modified. Discard it?"
 msgstr "Tätä viestiä on muokattu, poistetaanko se?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Poista"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "_Pane luonnoksiin"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Tallenna muutokset"
 
-#: src/compose.c:10446
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Tätä viestiä on muokattu, tallennetaanko muutokset?"
 
-#: src/compose.c:10447
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "_Älä tallenna"
 
-#: src/compose.c:10518
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Haluatko käyttää mallinetta ”%s”?"
 
-#: src/compose.c:10520
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "Käytä mallinetta"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10538 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: src/compose.c:11379
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "Liitä vai sisällytä?"
 
-#: src/compose.c:11380
+#: src/compose.c:11397
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 "Haluatko sisällyttää tiedostot viestin sisältöön vai liitetiedostoiksi?"
 
-#: src/compose.c:11382
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "_Liitä"
 
-#: src/compose.c:11599
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Lainausten merkintöjen muotovirhe rivillä %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2632,8 +2634,8 @@ msgid " Check File "
 msgstr " Tarkasta tiedosto "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Tiedosto"
 
@@ -2780,7 +2782,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2956,7 +2958,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Yläraja haussa palautettavien kenttien määrälle."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Perus"
 
@@ -3091,15 +3093,15 @@ msgid "Stylesheet"
 msgstr "Tyylisivu"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Ei mitään"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Oletus"
 
@@ -3594,27 +3596,27 @@ msgstr "Roskis"
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Käsitellään (%s)…\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopioidaan kohteesta %s kohteeseen %s…\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Siirretään kohteesta %s kohteeseen %s…\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Päivitetään välimuistia kohteelle %s…"
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Käsitellään viestejä…"
 
@@ -3636,11 +3638,11 @@ msgstr "Valitse hakemisto"
 msgid "NewFolder"
 msgstr "UusiKansio"
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215
+#: src/imap_gtk.c:271 src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:424 src/plugins/rssyl/rssyl_cb_menu.c:206
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "merkkiä ’%c’ ei voi sisällyttää kansion nimeen."
@@ -3648,7 +3650,7 @@ msgstr "merkkiä ’%c’ ei voi sisällyttää kansion nimeen."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Kansio ”%s” on jo olemassa."
@@ -3672,7 +3674,7 @@ msgstr "Merkitse kaikki luetuiksi rekursii_visesti"
 msgid "R_un processing rules"
 msgstr "S_uorita käsittelysäännöt"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_Hae hakemistosta…"
 
@@ -3728,12 +3730,12 @@ msgstr "Merkitäänkö kaikki kansion viestit luetuiksi?"
 msgid "Mark all as read"
 msgstr "Merkitse kaikki luetuksi"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Luetaan hakemistoa %s%c%s..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Luetaan hakemistoa %s..."
@@ -3778,7 +3780,7 @@ msgstr "Avataan kansiota %s..."
 msgid "Folder could not be opened."
 msgstr "Kansiota ei voitu avata."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Tyhjä roskis"
 
@@ -4018,7 +4020,7 @@ msgstr ""
 "Locale: %s (merkistö: %s)\n"
 "Käyttöjärjestelmä: tuntematon"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "Claws Mail -tiimi"
 
@@ -4903,7 +4905,9 @@ msgstr "Kuvakkeiden merkitykset"
 #: src/gtk/icon_legend.c:140
 msgid ""
 "The following icons are used to show the status of messages and folders:"
-msgstr "Seuraavat kuvakkeet kertovat viestien ja kansioiden tilan:"
+msgstr ""
+"Seuraavat kuvakkeet kertovat viestien ja kansioiden "
+"tilan:"
 
 #: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
@@ -5005,9 +5009,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Liitännäiset"
 
@@ -5026,7 +5030,9 @@ msgstr "Kuvaus"
 #: src/gtk/pluginwindow.c:374
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
-msgstr "Lisätietoja liitännäisistä saa %sClaws Mailin sivustolta%s."
+msgstr ""
+"Lisätietoja liitännäisistä saa %sClaws "
+"Mailin sivustolta%s."
 
 #: src/gtk/pluginwindow.c:415
 msgid "Click here to load one or more plugins"
@@ -5044,14 +5050,14 @@ msgstr "Ladatut liitännäiset"
 msgid "Page Index"
 msgstr "Hakemisto"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Piilota"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5489,234 +5495,195 @@ msgstr "Tiedoston koko:"
 msgid "Load Image"
 msgstr "Lataa kuva"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4-yhteys rikki\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP-virhe kohteelle %s: "
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr " todennetti\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr " ei todennusta\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr " huono tila\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr " virtavirhe\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
-msgstr " jäsennysvirhe (tod.näk. RFC-epäyhteensopiva palvelin)\n"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
+msgstr ""
+" jäsennysvirhe (tod.näk. RFC-epäyhteensopiva palvelin)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr " yhdistäminen estetty\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr " muistivirhe\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr " sisäinen virhe\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
-msgstr " protokollavirhe (tod.näk. RFC-epäyhteensopiva palvelin)\n"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
+msgstr ""
+" protokollavirhe (tod.näk. RFC-epäyhteensopiva palvelin)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr " yhteyttä ei hyväksytty\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " APPEND-virhe\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " NOOP-virhe\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " LOGOUT-virhe\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " CAPABILITY-virhe\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " CHECK-virhe\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " CLOSE-virhe\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " EXPUNGE-virhe\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " COPY-virhe\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " UID COPY -virhe\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " CREATE-virhe\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " DELETE-virhe\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " EXAMINE-virhe\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " FETCH-virhe\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " UID FETCH -virhe\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " LIST-virhe\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " LOGIN-virhe\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr " LSUB-virhe\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " RENAME-virhe\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " SEARCH-virhe\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " UID SEARCH -virhe\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " SELECT-virhe\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " STATUS-virhe\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " STORE-virhe\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " UID STORE -virhe\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " SUBSCRIBE-virhe\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " UNSUBSCRIBE-virhe\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " STARTTLS-virhe\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " INVAL-virhe\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " EXTENSION-virhe\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " SASL-virhe\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " SSL-virhe\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr "Tuntematon virhe [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5728,7 +5695,7 @@ msgstr ""
 "CRAM-MD5-kirjautumiset toimivat vain jos libetpanissa on SASL-tuki ja CRAM-"
 "MD5 SASL-liitännäinen on on asennettu."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5740,7 +5707,7 @@ msgstr ""
 "DIGEST-MD5-kirjautumiset toimivat vain jos libetpanissa on SASL-tuki "
 "jaDIGEST-MD5 SASL -liitännäinen on on asennettu."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5752,51 +5719,38 @@ msgstr ""
 "SCRAM-SHA-1-kirjautumiset toimivat vain jos libetpanissa on SASL-tuki ja "
 "SCRAM SASL -liitännäinen on on asennettu."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"CRAM-MD5-kirjautumiset toimivat vain jos libetpanissa on SASL-tuki ja CRAM-"
-"MD5 SASL-liitännäinen on on asennettu."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 "Yhdistäminen kohteeseen %s epäonnistui: kirjautuminen sisään ei toiminut.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 "Yhdistäminen kohteeseen %s epäonnistui: kirjautuminen sisään ei toiminut.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Yhteydenotto kohteeseen %s epäonnistui"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-yhteys kohteeseen %s on katkennut, yhdistetään uudelleen…\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "IMAP-palvelimeen ei saada yhteyttä ilman verkkoyhteyttä."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Suojaamaton yhteys"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5809,104 +5763,104 @@ msgstr ""
 "\n"
 "Haluatko silti yhdistää palvelimelle? Yhteys ei ole silloin suojattua."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "_Yhdistä joka tapauksessa"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Tili %s: Yhdistetään IMAP4-palvelimeen: %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "TLS-session aloitus ei onnistu.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Yhdistetään IMAP-palvelimeen: %s…\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Yhdistetään IMAP-palvelimeen: %s…"
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Lisätään viestejä…"
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Kopioidaan viestejä…"
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "poistomerkkejä ei voitu asettaa\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "ei voida hävittää\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Haetaan tilaamattomia kansioita kohteesta %s…"
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Haetaan kansion %s alikansioita…"
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei voitu luoda postilaatikkoa: LIST epäonnistui\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "ei voitu luoda postilaatikkoa\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ei voida uudelleennimetä postilaatikkoa %s %s:ksi\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "ei voida poistaa postilaatikkoa\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST epäonnistui\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Merkitään viestejä…"
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "hakemistoa %s ei voida valita\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "Palvelin vaatii TLS:ää kirjautumiseen\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Ominaisuuksia ei voida päivittää.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5915,20 +5869,20 @@ msgstr ""
 "Yhteydenotto palvelimelle %s epäonnistui: palvelin vaatii TLS:ää, mutta "
 "Claws Mail on käännetty ilman TLS-tukea.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Palvelimelle kirjautuminen on poissa käytöstä.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Haetaan viestiä…"
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "poistomerkkejä ei voitu asettaa: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5979,7 +5933,7 @@ msgstr "Tila_ukset"
 msgid "_Subscribe..."
 msgstr "_Tilaa..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "_Poista ryhmän tilaus..."
 
@@ -6016,20 +5970,20 @@ msgstr "Peri ylemmän kansion asetukset"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Anna uusi nimi kansiolle ”%s”:"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Uudelleennimeä kansio"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6052,7 +6006,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei voi poistaa kansiota ”%s”."
@@ -6079,7 +6033,7 @@ msgstr "_Hae"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Valitse tilattava kansion %s alikansio: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Tilaa"
 
@@ -6112,8 +6066,8 @@ msgstr "tilata"
 msgid "unsubscribe"
 msgstr "epätilata"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428
+#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Pätee myös alikansioihin"
 
@@ -6304,56 +6258,56 @@ msgstr "Valitse Pine-tiedosto"
 msgid "Import Pine file into Address Book"
 msgstr "Tuo Pine-tiedosto osoitekirjaksi"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Verkkoyhteyttä tarvitaan viestien hakemiseksi."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s epäonnistui\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Haetaan uusia viestejä"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Odotetaan"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Peruutettu"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Haetaan"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Valmista (%d viesti (%s) haettu)"
 msgstr[1] "Valmista (%d viestiä (%s) haettu)"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Valmista (ei uusia viestejä)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Yhdistäminen epäonnistui"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Autentikointi epäonnistui"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Lukittu"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Aikakatkaisu"
 
@@ -6389,7 +6343,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3-palvelimelle  %s:%d ei voitu yhdistää:\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Varmennetaan…"
 
@@ -6414,7 +6368,7 @@ msgstr "Haetaan uusien viestien määrää (UIDL)…"
 msgid "Getting the size of messages (LIST)..."
 msgstr "Haetaan viestien kokoja (LIST)…"
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Lopetetaan"
 
@@ -6465,7 +6419,7 @@ msgstr "Sokettivirhe."
 msgid "Socket error on connection to %s:%d."
 msgstr "Sokettivirhe yhteydessä %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Etäpalvelin katkaisi yhteyden."
 
@@ -6487,11 +6441,11 @@ msgstr ""
 "Postilaatikko on lukittu:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Autentikointi epäonnistui."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6500,7 +6454,7 @@ msgstr ""
 "Autentikointi epäonnistui:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6849,814 +6803,809 @@ msgstr "NetworkManager: verkko on yhdistetty.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: verkko on yhdistämättä.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "_Näytä"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Asetukset"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "_Lisää postilaatikko"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH…"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Vaihda viestilaatikoiden järjestystä..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "_Tuo mbox-tiedostosta..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "_Vie mbox-tiedostoon..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "_Vie valitut mbox-tiedostoon…"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Tyhjennä _roskat"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Tallenna viesti nimellä..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_Tallenna osa nimellä..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Sivun asetukset…"
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "T_ulosta…"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "Ajantasaista kansiot"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "Poistu"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "Valitse _säie"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_Etsi nykyisestä viestistä..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_Pikahaku"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "Näytä tai _piilota"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "_Työkalupalkki"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "Valitse _näytettävät tiedot"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "_Kansioluettelossa..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "_Viestiluettelossa..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "_Asettelu"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "Järjestä"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "Otsikonmukainen järjestely"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "_Avaa kaikki säikeet"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "_Sulje kaikki säikeet"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Siirry"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Edellinen sivu"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "Seuraava viesti"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "_Mene edelliseen lukemattomaan viestiin"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Mene _seuraavaan lukemattomaan viestiin"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Edelliseen _uuteen viestiin"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Seuraavaan uuteen _viestiin"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Edelliseen merk_ittyyn viestiin"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Seuraavaan mekrittyyn viestiin"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Edelliseen nim_ettyyn viestiin"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Seuraavaan nimettyyn _viestiin"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Edelliseen avattuun viestiin"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Seuraavaan avattuun viestiin"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Yläviesti"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Se_uraavaan lukemattomaan kansioon"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Muu kansio…"
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Seuraava osa"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Edellinen osa"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Viestin vieritys"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Edellinen rivi"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Uusi rivi"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Edellinen sivu"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Seuraava sivu"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Pura"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "_Avaa uudessa ikkunassa"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Viestin _raakamuoto"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Viestin osa"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Näytä tekstinä"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Avaa"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Avaa ohjelmalla…"
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Lainaus"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "Päivitä _yhteenveto"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "_Hae"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Hae nykyiseltä tililt_ä"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Hae kaikilta _tileiltä"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "_Peruuta haku"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "_Lähetä jonottavat viestit"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "_Kirjoita sähköpostiviesti"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "_Kirjoita keskusteluryhmäviesti"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "_Vastaa kohteeseen"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_Postituslista"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Vastaukset ja keskustelunsiirto"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Edelleenlähetä"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "_Edelleenlähetä liitteenä"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "_Uudelleenohjaa"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "_Postituslista"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Posti"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "Ohje"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Poista ryhmän tilaus"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Katso arkisto"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "Omistajan yhteystieto"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "S_iirrä…"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Kopioi…"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Siirrä _roskiin"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "_Poista…"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Siirrä _säie roskiin"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "Poista s_äie"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Peruuta keskusteluryhmäviesti"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_Merkitse"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_Poista merkintä"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Merkitse luk_emattomaksi"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Merkitse _luetuksi"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Merkitse kaikki luetuiksi"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ohita säie"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Poista säikeen ohitus"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Tarkkaile säiettä"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Poista säikeen tarkkailu"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Merkitse ro_skapostiksi"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Merkitse _ei‐roskapostiksi"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Lukitse"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Poista lukitus"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "_Värimerkintä"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Tä_git"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "Uudelleen_muokkaa"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Lisää allekirjoitus"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Lisää lähettäjä _osoitekirjaan"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "Kerää _osoitteita"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "_Nykyisestä kansiosta..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "_Valituista viesteistä..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "_Suodata kaikki kansion viestit"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Suodata _valitut viestit"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Suorita _käsittelysäännöt"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Luo suoda_tussääntö"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automaattinen"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "_Lähettäjän mukaan"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Vas_taanottajan mukaan"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "_Aiheen mukaan"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Luo käsittelysääntö"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Luettele _URLit…"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "Tarkasta _uudet viestit kaikissa kansioissa"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Poista _kaksoiskappaleet"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "Valitussa kansiossa"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "Kaikissa kansioissa"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "_Suorita"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "_Poista lopullisesti"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "_SSL-varmenteet"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "_Suodatusloki"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "_Verkkoloki"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "_Unohda istunnon salasanat"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "_Unohda istunnon salasanat"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "_Vaihda nykyistä tiliä"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "_Asetukset tälle tilille…"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Luo _uusi tili…"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "Muokkaa tilejä"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "Asetukset"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "_Esikäsittely…"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "_Jälkikäsittely…"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Suodatus…"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "_Mallineet"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Toiminnot"
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "_Tägit"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "_Liitännäiset..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Ohjekirja"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "_Käyttäjien tekemä VUKK verkossa"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "_Kuvakkeiden merkitykset"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Aseta oletusohjelmaksi"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "Pois verkosta"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Men_uvalikko"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "_Viestinäkymä"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "_Tilapalkki"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Sarakkeiden otsikot"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "_Säikeistä viestiketjut"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Piilota luetut säikeet"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "_Piilota luetut viestit"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Piilota poistetu viestit"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "_Kokonäyttö"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Näytä kaikki _otsakkeet"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "_Sulje kaikki säikeet"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Taittele tasolta _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Taittele tasolta _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Teksti kuvien _alla"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Teksti kuvien _sivulla"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Vain _kuvat"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "Vain _teksti"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Standardi"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Kolmisarakkeinen"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "Leveä _viesti"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "Leveä viesti_luettelo"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "_Pieni näyttö"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "_Määrän mukaan"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "Koon mukaan"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "_Päiväyksen mukaan"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Säikeen päiväyksen mukaan"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "_Aiheen mukaan"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "_Värin mukaan"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Tägin mukaan"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "_Merkintöjen mukaan"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "_Tilan mukaan"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "_Liitteiden mukaan"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Pisteiden mukaan"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Lukittuuden mukaan"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "Älä järjestele"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Nousevaan"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Laskevaan"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "Tunnista _automaattisesti"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Toteuta tägit…"
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Virheitä havaittiin. Avaa loki tästä."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Yhteystila päällä. Paina kuvaketta siirtyäksesi pois yhteystilasta."
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "Yhteystila pois päältä. Paina kuvaketta yhteystilaan."
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Valitse tili"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Verkkoloki"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Suodatus- ja käsittelyloki"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "suodatusloki päällä\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "suodatusloki pois päältä.\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "ei mitään"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Poistetaanko kaikki viestit roskiksesta?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Älä lopeta"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Lisää postilaatikko"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7666,18 +7615,18 @@ msgstr ""
 "Jos se on olemassaoleva postilaatikko,\n"
 "se skannataan automaattisesti."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Postilaatikko ”%s” on jo olemassa."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Postilaatikko"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7687,78 +7636,78 @@ msgstr ""
 "Jotkin tiedostot saattavat jo olla olemassa, tai sinulta puuttuu "
 "kirjoitusoikeus."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "Viestien lähetys kielletty"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Virhe tuotaessa mbox-tiedostoa."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "Mbox-vienti epäonnistui"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Poistu"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Poistutaanko Claws Mailista?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Kansion ajantasaistus"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Ajantasaistentaanko kansiot?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Ajantasaista"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Poistetaan kaksoiskappaleet…"
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Poistettiin %d kaksoiskappale %d kansiosta.\n"
 msgstr[1] "Poistettiin %d kappaletta %d kansiosta.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Käsittelysäännöt, jotka merkitsevät ennen kansion sääntöjä"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Käsittelysäännöt, jotka merkitsevät kansion sääntöjen jälkeen"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Suodatusasetukset"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Ei voitu rekisteröidä oletusohjelmaksi. Suorituspolun selvittäminen ei "
 "onnistu."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail on rekisteröity oletusohjelmaksi."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Ei voitu rekisteröidä oletusohjelmaksi, koska rekisteriin ei voi kirjoittaa."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7838,7 +7787,7 @@ msgstr "Korvaa olemassaoleva mbox-tiedosto"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tiedosto on jo olemassa, korvataanko?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Korvaa"
@@ -7884,19 +7833,19 @@ msgstr "Viestin loppu tuli vastaan, jatketaanko alusta?"
 msgid "Search finished"
 msgstr "Haku päättyi"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Kirjoita _uusi viesti"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail — Viestinäkymä"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<Ei paluu-polku-otsaketta>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7910,11 +7859,11 @@ msgstr ""
 "Paluupolku: %s\n"
 "On suositeltavaa jättää saapumisilmoitus lähettämättä."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Älä lähetä"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7926,65 +7875,65 @@ msgstr ""
 "lähetetty suoraan sinulle.\n"
 "Saapumisilmoitus kannattaa peruuttaa."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Haetaan viestiä (%s)…"
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Ei voitu salata: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Viesti ei noudata MIME-standardia ja saattaa hajota."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Tallenna nimellä"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Korvataanko olemassaoleva tiedosto?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Tiedostoa ”%s” ei voida tallentaa."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Näytä koko %s."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Vain ensimmäinen megatavu näytetään."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr ""
 "Sait saapumisilmoituksen tälle viestille: se on näytetty vastaanottajalle."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Pyysit saapumisilmoituspyyntöä tässä viestissä."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Viestissä on saapumisilmoituspyyntö."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Lähetä ilmoitus."
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7992,7 +7941,7 @@ msgstr ""
 "Tämä viesti on osittain haettu,\n"
 "ja poistettu jo palvelimelta."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8001,15 +7950,15 @@ msgstr ""
 "Tämä viesti on osittain haettu;\n"
 "se on %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Merkitse ladattavaksi"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Merkitse poistettavaksi"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8018,12 +7967,12 @@ msgstr ""
 "Tämä viesti on osittain ladattu;\n"
 "se on %s ja ladataan kokonaan."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Poista merkintä"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8032,11 +7981,11 @@ msgstr ""
 "Tämä viesti on osittain ladattu;\n"
 "se on %s ja poistetaan."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Saapumisilmoituspyyntö"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8046,19 +7995,19 @@ msgstr ""
 "Viesti on lähetetty useille tileistäsi.\n"
 "Valitse mitä niistä käytät saapumisilmoituksen lähettämiseen:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Lähetä ilmoitus"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Tulostus ei onnistu: viestissä ei ole sisältötekstiä"
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8066,7 +8015,7 @@ msgstr ""
 "\n"
 "  Kansiossa ei ole viestejä"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8074,7 +8023,7 @@ msgstr ""
 "\n"
 "  Viesti on poistettu"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8082,16 +8031,16 @@ msgstr ""
 "\n"
 "  Viesti on poistettu tai siirretty toiseen kansioon"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "Virhe luokiteltaessa roskapostia muistiin.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Siirretään viestejä…"
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Poistetaan viestiä…"
 
@@ -8193,7 +8142,8 @@ msgid "Go back to email"
 msgstr "Palaa sähköpostiin"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190
+#: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Ei voida tallentaa osaa moniosaviestistä: %s"
@@ -8236,6 +8186,7 @@ msgstr ""
 "\n"
 "%s"
 
+
 #: src/mimeview.c:2236
 msgid "Execute untrusted binary?"
 msgstr "Suoritetaanko ei-luotettu vieras ohjelma?"
@@ -8271,77 +8222,77 @@ msgstr "Koko:"
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "NNTP-yhteys %s:%d on katkennut, yhdistetään uudestaan...\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Tili %s: Yhdistetään NNTP‐palvelimeen: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Virhe kirjautuessa palvelimelle %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr "Libetpan ei tue vastauskoodia 480, joten yritetään jatkamista\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Tila luenta ei onnistu, jatketaan silti\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Virhe istunnon avaamisessa %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Virhe varmennettaessa palvelimelle %s:%d…\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Ilman verkkoytheyttä ei voi yhdistää nyyssipalvelimelle."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "ei voida valita ryhmää: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "ei voida asettaa ryhmää: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "virheellinen viestiväli: %d—%d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "ei voida hakea xhdr:ää\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "haetaan xover %d—%d kohteesta %s…\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "ei voida hakea xoveria\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "virheellinen xover-rivi\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9105,7 +9056,8 @@ msgstr ""
 "Älä tarkasta puuttuvia liitetiedostoja kun edelleenlähetetään tai "
 "uudelleenohjataan"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
@@ -9215,12 +9167,14 @@ msgstr ""
 "\n"
 "Asetukset ovat valikossa Asetukset→Asetukset→Liitännäiset→BogoFilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Roskapostin tunnistus"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Roskapostin oppiminen"
@@ -9807,7 +9761,7 @@ msgstr "CSS tässä tiedostossa sovelletaan kaikkiin HTML-osiin"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "_Selaa"
@@ -9816,93 +9770,93 @@ msgstr "_Selaa"
 msgid "Select stylesheet"
 msgstr "Valitse tyylisivu"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Etäsisällön haku on pois päältä."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Lataa kuvat"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Näytä etäsisällöt"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Salli javaskriptit"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Salli liitännäiset"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Salli Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Avaa linkit ulkoisessa selaimessa"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Virhe: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s on rikkinäinen tai sitä ei tueta"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Etsi verkosta"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Avaa selaimessa"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Avaa selaimessa (salli etäsisältö)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Avaa selaimessa"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Avaa kuva"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Kopioi linkki"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Hae linkistä"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Tallenna kuva nimellä"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Kopioi kuva"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Hae syöte"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML-selain"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9993,11 +9947,11 @@ msgid ""
 "RFC822 format"
 msgstr "Lisää hakuaika RFC822-muodossa X-FETCH-TIME-otsakkeeksi"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "Gdata-liitännäinen: Varmennus puuttuu"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10013,29 +9967,29 @@ msgstr ""
 "saat tunnistekoodin. Tällä koodilla voi antaa Claws-mailille luvan Googlen "
 "yhteystietoihisi."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Askel 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr "Piana tästä avataksesi Googlen lupasivut selaimessa"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Askel 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Anna koodi"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Gdata-liitännäinen: Virhe yhteystietohaussa: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10043,74 +9997,74 @@ msgstr[0] "Lisätty %d/"
 msgstr[1] "Lisätty %d/"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "%d yhteystiedosta välimuistiin"
 msgstr[1] "%d yhteystiedosta välimuistiin"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Gdata-liitännäinen: Aloitetaan epäsynkroninen yhteystietohaku\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Gdata-liitännäinen: Virhe ryhmien haussa: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "Gdata-liitännäinen: Ryhmät haettu\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Gdata-liitännäinen: Aloitetaan epäsynkroninen ryhmähaku\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Gdata-liitännäinen: Varmennusvirhe: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "Gdata-liitännäinen: Varmennus onnistui\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Gdata-liitännäinen: Aloitetaan interaktiivinen varmennus\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "Gdata-liitännäinen: Saatiin varmennuskoodi, varmistetaan\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
 "GData-liitännäinen: Varmistuskoodi puuttuu, joten varmistus on peruutettu\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Gdata-liitännäinen: Varmennuspäivitysvirhe: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Gdata-liitännäinen: Varmennuspäivitys onnistui\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Gdata-liitännäinen: Aloitetaan varmennuksen päivitys\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Todennus"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
@@ -10153,7 +10107,7 @@ msgstr ""
 "\n"
 "Palautteet englanniksi osoitteeseen <berndth at gmx.de>."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "Gdata-yhteys"
 
@@ -10214,7 +10168,8 @@ msgstr "Virhe väliaikaistilastoja luettaessa"
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
-msgstr "Käytössä %s %d tiedostossa, %d hakemistossa, %d muussa ja %d virheessä"
+msgstr "Käytössä %s %d tiedostossa, %d hakemistossa, %d muussa "
+"ja %d virheessä"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
@@ -10373,7 +10328,7 @@ msgstr "Aikakatkaisu"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "sekuntia"
@@ -10662,28 +10617,28 @@ msgid "Specify authentication"
 msgstr "Määritä todennus"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Käyttäjätunnus"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Salasana"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Varmennuskeino"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automaattinen"
 
@@ -11310,7 +11265,8 @@ msgstr "Anna salasana"
 #: src/plugins/pdf_viewer/poppler_viewer.c:1330
 msgid ""
 "This document is locked and requires a password before it can be opened."
-msgstr "Tämä on lukittu asiakirja ja sen avaamiseksi tarvitaan salasana."
+msgstr ""
+"Tämä on lukittu asiakirja ja sen avaamiseksi tarvitaan salasana."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1345
 #, c-format
@@ -11435,7 +11391,8 @@ msgstr "[ei käyttäjätunnistetta]"
 
 #: src/plugins/pgpcore/passphrase.c:261
 msgid "Please enter the passphrase for the new key:"
-msgstr "Anna salasana uudelle avaimelle:"
+msgstr ""
+"Anna salasana uudelle avaimelle:"
 
 #: src/plugins/pgpcore/passphrase.c:264
 msgid "Passphrases did not match.\n"
@@ -11443,7 +11400,9 @@ msgstr "Salasanat eivät täsmää.\n"
 
 #: src/plugins/pgpcore/passphrase.c:268
 msgid "Please re-enter the passphrase for the new key:"
-msgstr "Anna uudestaan salasana uudelle avaimelle:"
+msgstr ""
+"Anna uudestaan salasana uudelle avaimelle:"
+
 
 #: src/plugins/pgpcore/passphrase.c:273
 msgid "Please enter the passphrase for:"
@@ -11591,7 +11550,8 @@ msgstr "Vanhenee"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Asettamalla nollaksi salasana muistetaan session ajan"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minuutissa"
@@ -11748,61 +11708,66 @@ msgstr "Allekirjoitusta ei ole tarkastettu."
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP-ydin: Avainta ei saatu — gpg-agent ei ole käynnissä."
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "Allekirjoitusta ei voida tarkastaa – %s."
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Toimiva allekirjoitus käyttäjälle %s [äärimmäinen]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Toimiva allekirjoitus käyttäjälle %s [täysi]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Toimiva allekirjoitus käyttäjälle %s [rajallinen]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Toimiva allekirjoitus käyttäjälle %s"
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "Avain 0x%s tämän allekirjoituksen varmentamiseen puuttuu"
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus käyttäjälle %s"
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Toimiva allekirjoitus käyttäjälle %s, mutta avain on vanhentunut"
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr ""
 "Toimiva allekirjoitus käyttäjälle %s, mutta avain on poistettu käytöstä"
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Virheellinen allekirjoitus käyttäjälle %s"
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "Avain 0x%s tämän allekirjoituksen varmentamiseen puuttuu"
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "Allekirjoitusta ei ole tarkastettu"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "Allekirjoituksen tarkastuksessa virhe: ei tilaa\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Allekirjoituksen tarkastuksessa virhe: %s\n"
@@ -11810,99 +11775,99 @@ msgstr "Allekirjoituksen tarkastuksessa virhe: %s\n"
 # eg:
 # Allekirjoitus on tehty su 27. maaliskuuta 2005 01:56:28
 # avaimen ... tunnisteelle 1234567890ABCDEF
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Allekirjoitus on tehty %s avaimen %s tunnisteelle %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Oikea allekirjoitus käyttäjälle %s (Oikeellisuus: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Vanhentunut avain käyttäjälle %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Vanhentunut allekirjoitus käyttäjälle ”%s” (Oikeellisuus: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Avain on poistettu käytöstä, tunniste %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Virheellinen allekirjoitus käyttäjälle ”%s”\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "tunniste %s (Oikeellisuus: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "Poistettu käytöstä"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Käyttäjän luotto: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "Avain puuttuu."
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "Ensiöavaimen sormenjälki:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "VAROITUS: Allekirjoittajan osoite %s ja DNS-osoite eivät täsmää\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Allekirjoittajan varmistettu osoite on %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Ei voitu hakea dataa viestille %s"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Ei voitu alustaa dataa %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "Salaisen avaimen määritelmä on moniselitteinen"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Salaista avainta ei löydetty (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Virhe salaista avainta haettaessa: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme-käytäntö %s on käyttökelvoton: sovellutusta %s ei ole asennettu oikein"
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -11911,12 +11876,12 @@ msgstr ""
 "Gpgme-käytäntö %s on käyttökelvoton: sovellutuksen %s versio %s on "
 "asennettu, mutta %s on vaatimuksena.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme-käytäntö %s on käyttökelvoton (tuntemattomasta syystä)"
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11924,17 +11889,17 @@ msgstr ""
 "GnuPG:tä ei ole asennettu oikein, tai se pitää päivittää.\n"
 "OpenPGP-tuki otettu pois päältä."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr "Tilin tiedot pitää tallentaa napista OK ennen avainparin luontia.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "PGP-avaimia ei löytynyt"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -11944,22 +11909,22 @@ msgstr ""
 "viestejä voi allekirjoittaa tai vastaanottaa salattuja viestejä.\n"
 "Luodaanko uusi avainpari?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Avainparia ei voitu luoda: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr "Avainparia luodaan... Heiluttele hiirtä entropian aikaansaamiseksi..."
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Avainparia ei voitu luoda: tuntematon virhe"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -11972,19 +11937,19 @@ msgstr ""
 "\n"
 "Lähetetäänkö se avainpalvelimelle?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "Avain luotu"
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "Avain tuotu."
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "Ei voi tuoda avainta."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "Avaimen hakua ei tueta Windows-järjestelmissä."
 
@@ -12211,9 +12176,9 @@ msgstr "Näytä Pythonin konsoli..."
 msgid "Refresh"
 msgstr "Päivitä"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Selaa"
 
@@ -12511,7 +12476,7 @@ msgstr ""
 "sen."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Varmista SSL-varmenteen validius"
 
@@ -12549,7 +12514,9 @@ msgstr "Päivitysvuoroväli"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:476
 msgid "Set to 0 to disable automatic refreshing for this feed"
-msgstr "Aseta nollaksi poistaaksesi tämän syötteen automaattisen päivityksen"
+msgstr ""
+"Aseta nollaksi poistaaksesi tämän syötteen automaattisen "
+"päivityksen"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:528
 msgid "_OK"
@@ -12668,17 +12635,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Päivitetään kommentteja kohteelle %s..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Tunnistautuminen vaaditaan)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (Ei käyttöoikeutta)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (Ei löydy)"
 
@@ -12729,7 +12696,7 @@ msgstr "Päivitetään syötettä %s..."
 msgid ""
 "Couldn't process feed at\n"
 "<b>%s</b>\n"
-"\n"
+"\n" 
 "Please contact developers, this should not happen."
 msgstr ""
 "Syötettä ei voitu käsitellä\n"
@@ -12810,21 +12777,21 @@ msgid ""
 msgstr ""
 "Huomaa, että otsakkeita kuten aihetta, ei ole salattu S/MIME-menetelmässä."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Roskapostin ilmoitus…"
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Ilmoita roskapostista verkossa"
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "SpamReport"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12840,19 +12807,19 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Roskaposti‐ilmoitus"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Edelleenlähetä:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Salasana:"
 
@@ -13056,7 +13023,8 @@ msgid "Show"
 msgstr "Näytä"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "päivän jälkeen"
 
@@ -13149,7 +13117,7 @@ msgid "Next month"
 msgstr "Seuraava kuukausi"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vKalenteri"
 
@@ -13183,7 +13151,7 @@ msgstr ""
 "Myös webCal‐syötteisiin voi kirjautua ja hakea sieltä tapaamiset tai "
 "kalenterit, julkaista vapaanaolotiedot ja hakea muiden tietoja."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Kalenteri"
 
@@ -13365,63 +13333,63 @@ msgstr "Osanottajat:"
 msgid "Action:"
 msgstr "Toiminto:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Uusi tapaaminen…"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "Tuo kal_enteri…"
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_Tilaa webCal…"
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "_Nimeä uudelleen…"
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "P_äivitä tilaukset"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "_Luettelonäkymä"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "_Viikkonäkymä"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "Kuukausinäky_mä"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Tapaamiset"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "menneisyydessä"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "tänään"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "huomenna"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "tällä viikolla"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "myöhemmin"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13430,17 +13398,17 @@ msgstr ""
 "\n"
 "Nämä tapahtumat ovat aikataulussa %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Aikakatkaistu (%d sekuntia) yhdistettäessä osoitteeseen %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Virhe %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13453,7 +13421,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13466,7 +13434,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13477,7 +13445,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13488,42 +13456,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Kohdehakemiston %s luonti epäonnistui."
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Verkkoyhteys tarvitaan Webcal‐syötteen päivittämiseen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Haetaan kalenteria kohteelle %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "uusi tilaus"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Verkkoyhteys tarvitaan tilausten päivittämiseen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Tilaa WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Anna WebCal‐URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Ei voitu jäsentää URLia."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Perutaanko tilaus?"
 
@@ -13892,83 +13860,83 @@ msgstr "Ei voitu viedä vapaanaolotietoja."
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Ei voitu viedä vapaanaolotietoja kohteeseen %s\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Ilmoita minulle"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr " minuuttia ennen tapahtuman alkua"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Kalenterin vienti"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Automaattisesti vie kalenteri"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Voit viedä tiedoston tai URL‐osoitteen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Anna tiedostonimi tai URL (kuten http://palvelin/polku/tiedosto.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Sisällyt webcal‐ajat vientiin"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Kalenterin viennin jälkeen ajettava komento"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Tallena Clawsin kalenteritiedot XFCE:n Oragen kelloon"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Salli Oragen (4.4 tai uudempi) lukea Clawsin kalenteria"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Vie Gnome shellin kalenteripalveluun"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Rekisteröi D-Bus-kalenteripalvelinrajapinnalla Claws Mailin kalenterin "
 "viemiseksi"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Vapaanaolotiedot"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Automaattisesti vie vapaanaolotiedot kohteeseen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Anna tiedostonimi tai URL (kuten http://palvelin/polku/tiedosto.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Vapaanaolotiedon viennin jälkeen ajettava komento"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Hae muiden vapaanaolotiedot"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -13977,7 +13945,7 @@ msgstr ""
 "Anna tiedostonimi tai URL (kuten http://palvelin/polku/tiedosto.ifb). Käytä "
 "lukua %u sähköpostiosoitteen vasempana osana ja lukua %d verkkotunnuksena"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "SSL-asetukset"
 
@@ -14032,12 +14000,12 @@ msgstr "virhe POP3‐session aikana\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP‐komentoa ei tueta\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14045,7 +14013,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "USENET‐keskusteluryhmät (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Paikallinen mbox‐tiedosto"
 
@@ -14073,11 +14041,11 @@ msgstr "Koko nimi"
 msgid "Mail address"
 msgstr "Postiosoite"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Automaattiset asetukset"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Peru"
 
@@ -14167,7 +14135,7 @@ msgstr ""
 "Tätä suuremmat viestit ladataan vain osittain. Kun ne valitaan ne voi ladata "
 "kokonaan tai poistaa."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14179,71 +14147,66 @@ msgstr "Ladattavien viestien määrän yläraja"
 msgid "unlimited if 0 is specified"
 msgstr "rajoittamaton, jos luku on nolla"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Etsi teksti:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "IMAP-palvelimen hakemisto"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(yleensä tyhjä)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Näytä vain tilatut kansiot"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Kaistaa säästävä tila (ei hae etätägejä)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Tässä tilassa käytetään vähemmän kaistaa, mutta se saattaa ollahitaampi "
 "joillain palvelimilla."
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Suodata viestit haettaessa"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Mahdollista liitännäissuodatus viesteille haettaessa"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "”Hae kaikki” tarkastaa tämän tilin uudet viestit"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Otsake"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Luo viestin tunniste"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Lähetä tilin osoite Message-Id:ssä"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Lisää sovellusotsake (User-Agent)"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Lisää mukautettu otsakekenttä"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-todennus (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14251,181 +14214,181 @@ msgstr ""
 "Jos nämä kentät jätetään tyhjiksi, käytetään samaa käyttäjätunnusta ja "
 "salasanaa kuin viestejä haettaessa."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Todenna POP3:lla ennen lähetystä"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "POP-todennuksen aikakatkaisu: "
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "minuuttia"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Allekirjoitus"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Lisää allekirjoitus automaattisesti"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Allekirjoituksen erotin"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Komennon tuloste"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Aseta seuraavat osoitteet automaattisesti"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Oikeinkirjoitussanakirjat"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Oletussanakirja"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Oletusvaihtoehtosanakirja"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Viestin kirjoitus"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Vastaa"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Edelleenlähetä"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Oletusarvoinen yksityisyysturvajärjestelmä"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Allekirjoita viestit aina"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Salaa viestit aina"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 "Allekirjoita viestit oletusarvoisesti vastattaessa allekirjoitettuun "
 "viestiin."
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Salaa viestit oletusarvoisesti vastattaessa salattuun viestiin."
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Salaa viestit omalla avaimella vastaanottajan lisäksi"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Tallenna lähetetyt salatut viestit salaamattomina"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Älä käytä SSL:ää"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Käytä SSL:ää POP3-yhteydelle"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Aloita SSL-sessio STARTTLS-komennolla"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Käytä SSL:ää IMAP4-yhteydelle"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Käytä SSL:ää NNTP-yhteydelle"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Lähetys (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Älä käytä SSL:ää (mutta käytä STARTTLS:ää tarvittaessa)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Käytä SSL:ää SMTP-yhteydelle"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Asiakasvarmenteet"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Vastaanottovarmenne"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Asiakassertifikaatti PKCS12- tai PEM-tiedostona"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Lähetysvarmenne"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Hyväksy automaattisesti tuntemattomat mutta validit SSL-sertifikaatit"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Käytä blokkaamatonta SSL:ää"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Aseta tämä pois päältä jos SSL-yhteydessä on ongelmia"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "SMTP-portti"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "POP3-portti"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "IMAP4-portti"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "NNTP-portti"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Verkkotunnus"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14433,15 +14396,15 @@ msgstr ""
 "Verkkotunnusta käytetään Message-Id:n osana ja SMTP-palvelimille "
 "yhdistettäessä."
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Käytä palvelimen kanssa kommunikointiin komentoa"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Siirrä poistetut viestit roskiin ja poista lopullisesti heti"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14449,108 +14412,108 @@ msgstr ""
 "Siirtää poistetut viestit roskiin käyttämättä \\Deleted-merkintää ja "
 "poistamatta lopullisesti."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Merkitse yhteislähetetyt viestit luetuiksi ja värillä:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Pane lähetetyt viestit kansioon"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Pane poistetut viestit kansioon"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Pane luonnokset kansioon"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Pane poistetut viestit kansioon"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Tilin nimeä ei syötetty."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "Postiosoitetta ei syötetty."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "SMTP-palvelinta ei syötetty."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Käyttäjän tunnistetta ei syötetty."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "POP3-palvelinta ei syötetty."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "Oletusarvoinen saapuneet-kansio puuttuu."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-palvelinta ei syötetty."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "NNTP-palvelinta ei syötetty."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "paikallisen postilaatikon tiedostonimeä ei syötetty."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "lähetyskomentoa ei syötetty."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Haku"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Mallineet"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Uuden tilin asetukset"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s — Tilin asetukset"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Epäonnistui (väärä osoite)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Valitse allekirjoitustiedosto"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Valitse varmennetiedosto"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Käytäntö:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (liitännäistä lataamatta)"
@@ -14672,20 +14635,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Poistetaanko kaikki toiminnot?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
+#: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Kenttää on tallentamatta"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Kenttää ei ole tallennettu, suljetaanko joka tapauksessa?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Jatka muokkausta"
 
@@ -15404,9 +15368,9 @@ msgid ""
 "However, you can set them for the whole mailbox tree by using \"Apply to "
 "subfolders\"."
 msgstr ""
-"Näitä asetuksia ei tallenneta tallenneta kansioasetuksiksi, koska kyseessä "
-"on juurikansio. Voit kuitenkin käyttää niitä koko postilaatikon asetuksina "
-"ruksimalla Pätee myös alikansioihin ‐valinnan."
+"Näitä asetuksia ei tallenneta tallenneta kansioasetuksiksi, koska "
+"kyseessä on juurikansio. Voit kuitenkin käyttää niitä koko postilaatikon "
+"asetuksina ruksimalla Pätee myös alikansioihin ‐valinnan."
 
 #: src/prefs_folder_item.c:274 src/prefs_folder_item.c:876
 msgid ""
@@ -15581,7 +15545,7 @@ msgstr "Näyttö"
 msgid "Fonts"
 msgstr "Fontit"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -15725,7 +15689,7 @@ msgstr "Virheviestit"
 msgid "Status messages for filtering/processing log"
 msgstr "Tilaviestit suodatus‐ ja käsittelylokille"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Muu"
 
@@ -16352,15 +16316,15 @@ msgstr "Valitse väri kansiolle"
 msgid "Colors"
 msgstr "Värit"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Valitse valmiit näppäimistöoikopolut"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Valitse asetusto:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16368,35 +16332,35 @@ msgstr ""
 "Jokaista valikko‐oikopolkua voi myös muuttaa painamalla\n"
 "mitä tahansa näppäimiä pohjassa kun asettaa hiiren osoittimen sen päälle."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Lisää osoite kohteeksi kaksoisnapsautettaessa"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Poistuttaessa"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Varmista poistuttaessa"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Poista roskat poistuttaessa"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Varoita, jos jonossa on viestejä"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Näppäimistöoikopolut"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Salli muokattavat valikko‐oikopolut"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16406,15 +16370,15 @@ msgstr ""
 "ja näppäilemällä.\n"
 "Valinnan poistaminen lukitsee nykyiset oikopolut."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr " Valitse näppäimistöoikopolut "
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Metadatan käsittely"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16423,31 +16387,31 @@ msgstr ""
 "suoraan\n"
 "Silloin ei menetetä tietoja ohjelman kaatuessa mutta se on hitaampaa."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Turvallisempi"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Nopeampi"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Pistokkeen tietoliikenteen aikakatkaisu"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Kysy ennen roskien tyhjentämistä"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "Kysy tilikohtaisista suodatuksista käsin suodatettaessa"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Käytä turvallista tiedostopoistoa kun mahdollista"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16455,7 +16419,7 @@ msgstr ""
 "Käytä turvallista poistoa jos mahdollista\n"
 "(komentoa shred ei ole)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16464,32 +16428,11 @@ msgstr ""
 "Tämä hidastaa poistotoimintoja. Lue myös shredin ohjesivu mahdollisista "
 "huonoista puolista."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Ajantasaista offline‐tilan kansiot heti kun mahdollista"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Anna salasana"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Anna salasana"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Anna salasana"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Muut"
 
@@ -16746,8 +16689,8 @@ msgstr ""
 "Määritä käytettävä siirroskoodaus (engl. Content‐Transfer‐Encoding) kun "
 "viestissä on ASCIIn ulkopuolisia merkkejä"
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Lähettäminen"
 
@@ -17473,35 +17416,35 @@ msgstr "Ei tietoja saatavilla"
 msgid "No recipient keys defined."
 msgstr "Vastaanottaja‐avaimia ei ole määritelty"
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Virhe BASE64:n purussa]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Ollaan jo lähettämässä."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Tiedostoa %s ei pysty avaamaan."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "Jonottavan viestin otsake on rikki."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "Virhe SMTP‐istunnossa"
 
 # XXX: Öh?
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr "Mikään tili ei näytä lähettävän, ja virhe tapahtui SMTP‐istunnossa."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17509,24 +17452,24 @@ msgstr ""
 "Lähetystietojen selvitys ei onnistu. Viestiä ei välttämättä ole tehty Claws "
 "Maililla."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr ""
 "Väliaikaistiedoston luonti keskusteluryhmiin lähettämistä varten ei "
 "onnistunut."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Väliaikaistiedostoon kirjoittaminen keskusteluryhmien lähettämiseksi ei "
 "onnistunut."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Tapahtui virhe lähetettäessä viestiä vastaanottajalle %s."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Suodatetaan viestejä…\n"
 
@@ -17829,88 +17772,88 @@ msgstr "Syötä korvaava teksti %s"
 msgid "Enter variable"
 msgstr "Syötä muuttujaa"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Lähetetään viestiä komennolla: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Komentoa %s ei voi käyttää"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Virhe suoritettaessa komentoa: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Aloitetaan POP‐yhteys ennen SMTP:tä…"
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP ennen SMTP:tä"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Tili %s: Yhdistetään SMTP‐palvelimeen: %s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "Postin lähettäminen onnistui"
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Lähetetään HELO…"
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Lähetetään viestiä…"
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "Lähetetään EHLO…"
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "Lähetetään MAIL FROM…"
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "Lähetetään RCPT TO…"
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "Lähetetään DATA…"
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Lopetetaan…"
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Lähetetään viestiä (%d∕%d tavua)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Virhe lähetettäessä viestiä."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18464,7 +18407,8 @@ msgstr "Tägit: "
 
 #: src/textview.c:2894
 msgid "The real URL is different from the displayed URL."
-msgstr "Oikea URL on eri kuin odotuksenmukainen."
+msgstr ""
+"Oikea URL on eri kuin odotuksenmukainen."
 
 #: src/textview.c:2895
 msgid "Displayed URL:"
@@ -18790,12 +18734,12 @@ msgstr "Valitse avattava URL."
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -18887,126 +18831,127 @@ msgstr ""
 "Claws Mail ‐projektia voi auttaa osoitteessa <%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Anna postilaatikon nimi."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Anna nimi ja sähköpostiosoite"
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Anna vastaanottopalvelin ja käyttäjätunnus"
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Anna käyttäjätunnus"
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Anna SMTP‐palvelin"
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Anna SMTP‐käyttäjätunnus"
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Nimi:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Sähköpostiosoite"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Organisaatio: "
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Sähköpostilaatikon nimi"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 "Voit myös antaa täyden hakemistonimen, kuten: /home/flammie/Documents/Mail/"
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr "Porttinumeron voi lisätä loppuun: mail.example.com:25"
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "SMTP‐palvelin:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Käytä todennusta"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
-msgstr "(jätä tyhjäksi käyttääksesi samaa kuin viestien hakemisessa)"
+msgstr ""
+"(jätä tyhjäksi käyttääksesi samaa kuin viestien hakemisessa)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "SMTP-käyttäjätunnus"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "SMTP-Salasana:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Käytä SSL:ää SMTP‐yhteyden ottamiseen"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Käytää SSL:ää STARTTLS:llä"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "SSL-varmenne asiakkaalle (valinnainen)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Palvelimen osoite:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Paikallinen postilaatikko:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Palvelimen tyyppi:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr "Portin numeron voi lisätä loppuun: mail.example.com:110"
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Käytä SSL:ää vastaanottoyhteyden ottamiseen"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "IMAP‐palvelimen hakemisto:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Näytä vain tilatut kansiot"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19014,15 +18959,15 @@ msgstr ""
 "Varoitus: tämä Claws Mail on\n"
 "käännetty ilman IMAP‐tukea"
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail ‐asetusluotsi"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Claws Mail."
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19035,31 +18980,31 @@ msgstr ""
 "Aloita määrittelemällä joitain perustietojaitsestäsi ja "
 "sähköpostiyhteydestäsi.Tämän hoidettuasi pääset käyttämään Claws mailia."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Tietoja käyttäjästä"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Hakemistoa ei voitu avata."
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Viestien vastaanotto"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Viestien lähettäminen"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Viestien tallentaminen levylle"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Asetukset tehty"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19067,9 +19012,6 @@ msgstr ""
 "Claws Mail on valmis\n"
 "Tallenna‐painikkeella aloitetaan."
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Allekirjoitusta ei voida tarkastaa – %s."
-
 #~ msgid "+_Insert"
 #~ msgstr "_Sisällytä"
 
diff --git a/po/fr.po b/po/fr.po
index a363eb0..ea26733 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -643,18 +643,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 11:20+0000\n"
 "PO-Revision-Date: 2015-12-17 13:08+0100\n"
 "Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
 "Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -662,15 +662,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:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Impossible de créer le dossier."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Édition des comptes"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -680,44 +680,43 @@ 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:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr "Définir comme comp_te par défaut"
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Les comptes avec des dossiers distants ne peuvent pas être copiés."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Copie de %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Voulez-vous vraiment supprimer le compte '%s' ?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Supprimer le compte"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
-msgstr ""
-"La fonctionnalité « Relever » récupèrera le courrier des comptes cochés"
+msgstr "La fonctionnalité « Relever » récupèrera le courrier des comptes cochés"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -730,11 +729,11 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protocole"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Serveur"
 
@@ -788,10 +787,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -1060,18 +1059,18 @@ msgid "_Book"
 msgstr "_Carnet"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Édition"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "Ou_tils"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Aide"
 
@@ -1110,13 +1109,13 @@ msgstr "Supp_rimer le carnet"
 msgid "_Save"
 msgstr "Enregi_strer"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "_Sélectionner tout"
 
@@ -1125,7 +1124,7 @@ msgid "C_ut"
 msgstr "Co_uper"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copier"
@@ -1175,8 +1174,8 @@ msgstr "_Chercher les contacts en double.."
 msgid "Edit custom attributes..."
 msgstr "Personnaliser les _attributs.."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "À _propos"
 
@@ -1293,7 +1292,7 @@ msgstr "Forte authentification obligatoire"
 msgid "Sources"
 msgstr "Sources"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Carnet d'adresses"
@@ -1349,7 +1348,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
@@ -1463,7 +1462,7 @@ msgid "Person"
 msgstr "Contact"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Dossier"
 
@@ -1601,19 +1600,20 @@ msgstr ""
 "La mise à jour a échoué. Les modifications ne seront pas appliquées au "
 "répertoire."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:750 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4892
 msgid "Warning"
 msgstr "Alerte"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "Erreur"
 
@@ -1645,67 +1645,67 @@ msgstr "Nom LDAP"
 msgid "Attribute Value"
 msgstr "Valeur de l'attribut"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "« Rien »"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "un visualiseur"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "un parser MIME"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "des dossiers"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "un outil de filtrage"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "une interface de confidentialité"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "un notificateur"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "un utilitaire"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "des choses"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, 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:434
 msgid "Plugin already loaded"
 msgstr "Module déjà chargé."
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Échec lors de l'allocation de la mémoire pour le module."
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 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:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Ce module est pour Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1714,7 +1714,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:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1722,20 +1722,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:800
+#: 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:802
+#: 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:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "Échec de la négociation SSL\n"
 
@@ -2124,7 +2124,7 @@ msgstr "Enleve_r"
 msgid "_Properties..."
 msgstr "_Propriétés.."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_Message"
 
@@ -2192,7 +2192,7 @@ msgstr "Texte _justifié"
 msgid "_Unwrapped"
 msgstr "Texte _non justifié"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Sélectionner tout"
@@ -2257,7 +2257,7 @@ msgstr "_Effacer la ligne"
 msgid "Delete to end of line"
 msgstr "Supprimer _jusqu'à la fin de la ligne"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "Chercher dans le _message.."
@@ -2302,47 +2302,47 @@ msgstr "S_ystème de confidentialité"
 msgid "_Priority"
 msgstr "_Priorité"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Jeux de caractères"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Europe de l'Ouest"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltique"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabe"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonais"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Chinois"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Coréen"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Thaïlandais"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Carnet d'adresses"
 
@@ -2350,7 +2350,7 @@ msgstr "_Carnet d'adresses"
 msgid "_Template"
 msgstr "_Modèles"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "_Actions"
 
@@ -2386,11 +2386,11 @@ msgstr "Afficher la _règle"
 msgid "_Normal"
 msgstr "_Normale"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "À _tous"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "À l'_expéditeur"
 
@@ -2414,27 +2414,27 @@ msgstr "Ba_sse"
 msgid "_Lowest"
 msgstr "La plus _basse"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Détection automatique"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASC_II 7 bits (US-ASCII)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "_Unicode (UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europe Centrale (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grec (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turc (ISO-8859-_9)"
 
@@ -2483,48 +2483,48 @@ msgstr "Le corps du modèle « Transfert » a une erreur à la ligne %d."
 msgid "Fw: multiple emails"
 msgstr "Fw: emails multiples"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, 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:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Cci:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Répondre à:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Groupe de discussion:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Donnant suite à:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En réponse à:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "À:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Impossible de joindre le fichier au message (échec de conversion de jeu de "
 "caractères)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2539,16 +2539,16 @@ msgstr[1] ""
 "Les fichiers suivants ont été joints au message :\n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Le « préfixe de citation » du modèle est invalide."
 
-#: src/compose.c:3605
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Impossible de récupérer la taille du fichier '%s'."
 
-#: src/compose.c:3616
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -2557,57 +2557,57 @@ msgstr ""
 "Vous êtes sur le point d'insérer un fichier de %s dans le corps du message. "
 "Êtes-vous sûr de vouloir faire cela ?"
 
-#: src/compose.c:3619
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr ?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "_Insérer"
 
-#: src/compose.c:3744
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:3745
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "Fichier vide"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "_Attacher quand même"
 
-#: src/compose.c:3755
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [modifié]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[Pas de sujet] - Composition d'un message%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Composition d'un message"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4820 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2615,55 +2615,55 @@ 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:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:5035
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
-"Le seul destinataire est l'adresse « Cc: » par défaut. Voulez-vous quand "
-"même envoyer le message ?"
+"Le seul destinataire est l'adresse « Cc: » par défaut. Voulez-vous quand même "
+"envoyer le message ?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/compose.c:5067
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "Le seul destinataire est l'adresse « Cci: » par défaut. Voulez-vous quand "
 "même envoyer le message ?"
 
-#: src/compose.c:5084
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Mettre en file d'attente"
 
-#: src/compose.c:5104
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Le sujet est vide. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Voulez-vous quand même l'envoyer ?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Voulez-vous quand même le mettre en file d'attente d'envoi ?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "Plus tard"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2673,7 +2673,7 @@ msgstr ""
 "\n"
 "La conversion de jeu de caractères a échoué."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2683,7 +2683,7 @@ msgstr ""
 "\n"
 "La clé de chiffrement du destinataire n'est pas disponible."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2694,7 +2694,7 @@ msgstr ""
 "\n"
 "Sa signature a échoué : %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2705,11 +2705,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5196 src/compose.c:5256
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2717,7 +2717,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:5246
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2726,7 +2726,7 @@ msgstr ""
 "%s\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
-#: src/compose.c:5621
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2737,7 +2737,7 @@ msgstr ""
 "message vers le jeu de caractères spécifié (%s).\n"
 "Voulez-vous l'envoyer en %s ?"
 
-#: src/compose.c:5679
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2751,75 +2751,76 @@ msgstr ""
 "\n"
 "Voulez-vous quand même l'envoyer ?"
 
-#: src/compose.c:5790
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Impossible de chiffrer le message : %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "Avertissement concernant le chiffrement"
 
-#: src/compose.c:5912
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "_Poursuivre"
 
-#: src/compose.c:5961
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "Il n'existe pas de compte pour l'envoi de messages."
 
-#: src/compose.c:5970
+#: src/compose.c:5976
 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:6205
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "La pièce jointe %s n'existe plus. Ignorer ?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Interrompre l'envoi"
 
-#: src/compose.c:6206
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "Ignorer cette pièce jointe"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "Partie %s originale"
 
-#: src/compose.c:6824
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "Ajouter au carnet d'_adresses"
 
-#: src/compose.c:6985
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "Effacer le contenu du champ"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Veuillez saisir <tab> pour procéder à la complétion depuis le carnet "
 "d'adresse"
 
-#: src/compose.c:7204
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "Type Mime"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:7273
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "Enregistrer le message dans "
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7327 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2830,23 +2831,23 @@ msgstr "Enregistrer le message dans "
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: src/compose.c:7783
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "E_n-tête"
 
-#: src/compose.c:7788
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "Pièces _jointes"
 
-#: src/compose.c:7802
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "A_utres"
 
-#: src/compose.c:7817
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "S_ujet :"
 
-#: src/compose.c:8041
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2855,19 +2856,19 @@ msgstr ""
 "Le correcteur orthographique n'a pu être lancé.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "_De :"
 
-#: src/compose.c:8197
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "Compte à utiliser pour l'envoi de ce message"
 
-#: src/compose.c:8199
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "Adresse email à utiliser en tant qu'expéditeur"
 
-#: src/compose.c:8365
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2876,68 +2877,68 @@ msgstr ""
 "Le système de confidentialité '%s' ne peut être chargé. Il sera impossible "
 "de signer ou chiffrer ce message."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Aucun"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8584 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Le corps du modèle a une erreur à la ligne %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "Erreur de formatage dans l'en-tête « De: » du modèle."
 
-#: src/compose.c:8701
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "Erreur de formatage dans l'en-tête « À: » du modèle."
 
-#: src/compose.c:8719
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "Erreur de formatage dans l'en-tête « Cc: » du modèle."
 
-#: src/compose.c:8737
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "Erreur de formatage dans l'en-tête « Cci: » du modèle."
 
-#: src/compose.c:8755
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "Erreur de formatage dans l'en-tête « Reply-To: » du modèle."
 
-#: src/compose.c:8774
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "Erreur de formatage dans le sujet du modèle."
 
-#: src/compose.c:9043
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:9058
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:9132
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:9149
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:9190
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:9210
+#: src/compose.c:9227
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:9211
+#: src/compose.c:9228
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:9462
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2948,15 +2949,15 @@ msgstr ""
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9968 src/messageview.c:1097
 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:9977
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:9979
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2967,15 +2968,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
-#: src/compose.c:10161
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "Enregistrement impossible du brouillon"
 
-#: src/compose.c:10162
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2984,24 +2985,24 @@ msgstr ""
 "Souhaitez-vous annuler la fermeture de l'application ou simplement "
 "interrompre l'édition de ce message ?"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "A_nnuler"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "_Interrompre"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "Veuillez sélectionner un fichier"
 
-#: src/compose.c:10352
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Échec lors de la lecture de « %s »."
 
-#: src/compose.c:10354
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -3010,58 +3011,58 @@ msgstr ""
 "Le fichier « %s » contient des caractères n'appartenant pas\n"
 "à l'encodage courant : l'insertion peut être incorrecte."
 
-#: src/compose.c:10441
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:10442
+#: src/compose.c:10459
 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:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Interrompre"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: src/compose.c:10446
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 "Ce message a été modifié. Souhaitez-vous enregistrer les dernières "
 "modifications ?"
 
-#: src/compose.c:10447
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "_Ne pas enregistrer"
 
-#: src/compose.c:10518
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voulez-vous utiliser le modèle « %s » ?"
 
-#: src/compose.c:10520
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "Utiliser le modèle"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10538 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:11379
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "Insérer ou joindre ?"
 
-#: src/compose.c:11380
+#: src/compose.c:11397
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -3069,16 +3070,16 @@ msgstr ""
 "Voulez-vous insérer le contenu du(des) fichier(s) directement dans le corps "
 "du message ou le(s) joindre en tant que pièce(s) jointe(s) ?"
 
-#: src/compose.c:11382
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "_Joindre"
 
-#: src/compose.c:11599
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erreur de formatage de la citation à la ligne %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3296,8 +3297,8 @@ msgid " Check File "
 msgstr " Verifier le fichier "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Fichier"
 
@@ -3437,16 +3438,16 @@ msgid ""
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 msgstr ""
-"Nom du serveur LDAP. Par exemple, « ldap.mondomaine.com » peut être "
-"approprié pour l'organisation « mondomaine.com ». Une adresse IP peut aussi "
-"être utilisée. Si le serveur se trouve sur la même machine exécutant Claws "
-"Mail, « localhost » peut être utilisé."
+"Nom du serveur LDAP. Par exemple, « ldap.mondomaine.com » peut être approprié "
+"pour l'organisation « mondomaine.com ». Une adresse IP peut aussi être "
+"utilisée. Si le serveur se trouve sur la même machine exécutant Claws Mail, « "
+"localhost » peut être utilisé."
 
 #: src/editldap.c:469
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -3580,10 +3581,10 @@ msgid ""
 "searches against other address interfaces."
 msgstr ""
 "La recherche des noms et adresses utilise les critères « begins-with "
-"» (commençant par) ou « contains » (contenant). Veuillez activer cette "
-"option pour utiliser le critère « contains » (contenant). Celui-ci est "
-"généralement plus lent. Pour des raisons de performances, le critère « "
-"begins with » est néanmoins toujours utilisé pour la complétion d'adresse."
+"» (commençant par) ou « contains » (contenant). Veuillez activer cette option "
+"pour utiliser le critère « contains » (contenant). Celui-ci est généralement "
+"plus lent. Pour des raisons de performances, le critère « begins with » est "
+"néanmoins toujours utilisé pour la complétion d'adresse."
 
 #: src/editldap.c:700
 msgid "Bind DN"
@@ -3626,7 +3627,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Le nombre maximal d'entrées à retourner lors d'une recherche."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Général"
 
@@ -3762,15 +3763,15 @@ msgid "Stylesheet"
 msgstr "Feuille de style"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Aucun"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Par défaut"
 
@@ -3963,10 +3964,10 @@ msgid ""
 msgstr ""
 "Le fichier LDIF contient différents enregistrements qui sont habituellement "
 "envoyés vers un serveur LDAP. Chaque enregistrement est identifié de manière "
-"unique par un « nom absolu » (Distinguished Name, DN). Un suffixe est "
-"rajouté au « nom relatif » (Relative Distinguished Name, RDN) pour créer le "
-"DN. Veuillez sélectionner une des options RDN proposées qui sera utilisée "
-"pour la création du DN."
+"unique par un « nom absolu » (Distinguished Name, DN). Un suffixe est rajouté "
+"au « nom relatif » (Relative Distinguished Name, RDN) pour créer le DN. "
+"Veuillez sélectionner une des options RDN proposées qui sera utilisée pour "
+"la création du DN."
 
 #: src/expldifdlg.c:543
 msgid "Use DN attribute if present in data"
@@ -4082,8 +4083,8 @@ msgstr "Impossible de copier %s vers %s"
 #: src/file_checker.c:98
 #, c-format
 msgid ""
-"The file %s is empty or corrupted! Do you want to use the backup file from "
-"%s?"
+"The file %s is empty or corrupted! Do you want to use the backup file from %"
+"s?"
 msgstr ""
 "Le fichier %s est vide ou corrompu ! Voulez-vous utiliser le fichier de "
 "sauvegarde du %s ?"
@@ -4154,8 +4155,8 @@ msgstr "règle basée sur un compte, sautée à la demande de l'utilisateur\n"
 #: src/filtering.c:694
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], not matching current account [id="
-"%d, name='%s']\n"
+"rule is account-based [id=%d, name='%s'], not matching current account [id=%"
+"d, name='%s']\n"
 msgstr ""
 "règle basée sur un compte [id=%d, nom='%s'], sans correspondance avec le "
 "compte courant [id=%d, nom='%s']\n"
@@ -4168,11 +4169,11 @@ msgstr ""
 #: src/filtering.c:712
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], current account [id=%d, "
-"name='%s']\n"
+"rule is account-based [id=%d, name='%s'], current account [id=%d, name='%"
+"s']\n"
 msgstr ""
-"règle basée sur un compte [id=%d, nom='%s'], compte courant [id=%d, "
-"nom='%s']\n"
+"règle basée sur un compte [id=%d, nom='%s'], compte courant [id=%d, nom='%"
+"s']\n"
 
 #: src/filtering.c:752
 #, c-format
@@ -4282,27 +4283,27 @@ msgstr "Corbeille"
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Traitement (%s)..\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copie de %s vers %s..\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Déplacement de %s vers %s..\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Mise à jour du cache pour %s.."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Traitement des messages.."
 
@@ -4324,11 +4325,11 @@ msgstr "Sélection d'un dossier"
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215
+#: src/imap_gtk.c:271 src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:424 src/plugins/rssyl/rssyl_cb_menu.c:206
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, 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."
@@ -4336,7 +4337,7 @@ msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Le dossier '%s' existe déjà."
@@ -4360,7 +4361,7 @@ msgstr "Marquer comme lu récursivement"
 msgid "R_un processing rules"
 msgstr "Exéc_uter les règles de traitement"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "Chercher dans le _dossier.."
 
@@ -4419,12 +4420,12 @@ msgstr ""
 msgid "Mark all as read"
 msgstr "Marquer tous les messages comme lus"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Analyse du dossier %s%c%s.."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Analyse du dossier %s.."
@@ -4471,7 +4472,7 @@ msgstr "Ouverture du dossier %s.."
 msgid "Folder could not be opened."
 msgstr "Le dossier n'a pu être ouvert."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
@@ -4725,7 +4726,7 @@ msgstr ""
 "Localisation : %s (jeu de caractère : %s)\n"
 "Système d'exploitation : (inconnu)"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "L'équipe de Claws Mail"
 
@@ -5717,9 +5718,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Modules"
 
@@ -5758,14 +5759,14 @@ msgstr "Modules chargés"
 msgid "Page Index"
 msgstr "Préférences"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Cacher"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -6209,238 +6210,197 @@ msgstr "Taille du fichier :"
 msgid "Load Image"
 msgstr "Charger l'image"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "Connexion IMAP4 rompue\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Erreur IMAP sur %s :"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr " authentifié\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr " non authentifié\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr " état incorrect\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr " erreur de flux\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 " erreur d'analyse (très probablement due au non-respect des RFC de la part "
 "du serveur)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr " connexion refusée\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr " erreur de mémoire\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr " erreur fatale\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 " erreur de protocole (très probablement due au non-respect des RFC de la "
 "part du serveur)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr " connexion non acceptée\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " erreur de la commande « APPEND »\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " erreur NOOP\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " erreur de la commande « LOGOUT »\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " erreur de la commande « CAPABILITY »\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " erreur de la commande « CHECK »\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " erreur de la commande « CLOSE »\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " erreur de la commande « EXPUNGE »\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " erreur COPY\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " erreur de la commande « UID COPY »\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " erreur de la commande « CREATE »\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " erreur de la commande « DELETE »\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " erreur de la commande « EXAMINE »\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " erreur de la commande « FETCH »\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " erreur de la commande « UID FETCH »\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " erreur LIST\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " erreur de la commande « LOGIN »\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr " erreur LSUB\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " erreur de la commande « RENAME »\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " erreur de la commande « SEARCH »\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " erreur de la commande « UID SEARCH »\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " erreur de la commande « SELECT »\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " erreur de la commande « STATUS »\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " erreur de la commande « STORE »\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " erreur de la commande « UID STORE »\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " erreur de la commande « SUBSCRIBE »\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " erreur de la commande « UNSUBSCRIBE »\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " erreur de la commande « STARTTLS »\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " erreur de la commande « INVAL »\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " erreur de la commande « EXTENSION »\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " erreur SASL\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " erreur SSL\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr " Erreur inconnue [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -6453,7 +6413,7 @@ msgstr ""
 "a été compilée avec le support SASL et si le module CRAM-MD5 SASL est "
 "installé."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -6466,7 +6426,7 @@ msgstr ""
 "'libetpan' a été compilée avec le support SASL et si le module DIGEST-MD5 "
 "SASL est installé."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -6479,50 +6439,36 @@ msgstr ""
 "'libetpan' a été compilée avec le support SASL et si le module SCRAM SASL "
 "est installé."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"L'authentification CRAM-MD5 fonctionne uniquement si la librairie 'libetpan' "
-"a été compilée avec le support SASL et si le module CRAM-MD5 SASL est "
-"installé."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "La connexion vers %s a échoué : nom d'utilisateur refusé.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "La connexion vers %s a échoué : nom d'utilisateur refusé.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "La connexion vers %s a échoué."
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP4 vers %s a été coupée. Reconnexion..\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 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:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Connexion non sécurisée"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -6536,104 +6482,104 @@ msgstr ""
 "Comme la communication ne peut pas être sécurisée, voulez-vous quand même "
 "poursuivre la connexion à ce serveur ?"
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "_Poursuivre la connexion"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Compte '%s' : Connexion au serveur IMAP : %s:%d.."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Connexion impossible au serveur IMAP %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Authentification impossible au serveur IMAP %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Ajout des messages en cours.."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Copie des messages en cours.."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "Impossible de marquer pour la suppression\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "Impossible de purger\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Recherche des dossiers non inscrits dans %s.."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Recherche des sous-dossiers de %s.."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "Impossible de créer la boîte aux lettres\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, 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:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "Impossible de supprimer la boîte aux lettres.\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "commande LIST échouée\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Marquage des messages en cours.."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s.\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "Le serveur nécessite TLS pour s'y connecter.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Impossible de rafraîchir la liste des facilités IMAP.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6642,20 +6588,20 @@ msgstr ""
 "La connection vers %s a échoué : le serveur nécessite TLS, mais Claws Mail a "
 "été compilé sans le support TLS.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Les connections au serveur sont désactivées.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Lecture du message en cours.."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Impossible de marquer pour la suppression : %d.\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6709,7 +6655,7 @@ msgstr "_Inscriptions"
 msgid "_Subscribe..."
 msgstr "S'_inscrire"
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "Se _désinscrire.."
 
@@ -6746,20 +6692,20 @@ msgstr "Hériter des options du dossier parent"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Veuillez saisir le nouveau nom pour '%s' :"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6782,7 +6728,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible de supprimer le dossier '%s'."
@@ -6811,7 +6757,7 @@ msgstr "_Rechercher"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Choisir un sous-dossier de '%s' auquel vous souhaitez vous inscrire : "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "S'inscrire"
 
@@ -6829,8 +6775,8 @@ msgstr ""
 "Vous êtes déjà inscrit à ce dossier et il ne contient aucun sous-dossier "
 "auquel vous n'êtes pas inscrit.S'il y a des nouveaux dossiers, créés et "
 "auxquels vous vous êtes déjà inscrit depuis un autre client, vous pouvez "
-"utiliser «  Examiner pour de nouveaux dossiers » depuis le menu contextuel "
-"du dossier racine de chaque boîte aux lettres."
+"utiliser «  Examiner pour de nouveaux dossiers » depuis le menu contextuel du "
+"dossier racine de chaque boîte aux lettres."
 
 #: src/imap_gtk.c:565
 #, c-format
@@ -6845,8 +6791,8 @@ msgstr "inscrire au"
 msgid "unsubscribe"
 msgstr "désinscrire du"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428
+#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
@@ -6977,12 +6923,12 @@ msgid ""
 msgstr ""
 "Veuillez choisir, dans la liste ci-dessous, le champ LDIF devant être "
 "renommé ou sélectionné pour l'import. Les champs reservés (marqués dans la "
-"colonne « R »), sont automatiquement importés et ne peuvent être renommés. "
-"Un clique dans la colonne de sélection (« S ») permet de sélectionner le "
-"champ pour l'import. Un clique en dehors de cette colonne sélectionne le "
-"champ pour le renommer dans le champ de saisie au-dessous de la liste. Un "
-"double-clique également en dehors de cette colonne permet de sélectionner le "
-"champ pour l'import."
+"colonne « R »), sont automatiquement importés et ne peuvent être renommés. Un "
+"clique dans la colonne de sélection (« S ») permet de sélectionner le champ "
+"pour l'import. Un clique en dehors de cette colonne sélectionne le champ "
+"pour le renommer dans le champ de saisie au-dessous de la liste. Un double-"
+"clique également en dehors de cette colonne permet de sélectionner le champ "
+"pour l'import."
 
 #: src/importldif.c:822
 msgid "The LDIF field can be renamed to the User Attribute name."
@@ -7046,56 +6992,56 @@ 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:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 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:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s a échoué\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, 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:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Terminé (aucun nouveau message)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Délai d'attente dépassé"
 
@@ -7131,7 +7077,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d.\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Authentification.."
 
@@ -7156,7 +7102,7 @@ msgstr "Récupération du nombre de nouveaux messages (UIDL).."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages"
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Fermeture"
 
@@ -7207,7 +7153,7 @@ msgstr "Erreur de « socket »."
 msgid "Socket error on connection to %s:%d."
 msgstr "Erreur de socket lors de la connexion vers %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Connexion fermée par l'hôte distant."
 
@@ -7229,11 +7175,11 @@ msgstr ""
 "La boîte aux lettres est verrouillée :\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "L'authentification a échoué."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -7242,7 +7188,7 @@ msgstr ""
 "L'authentification a échoué\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -7492,8 +7438,7 @@ msgid ""
 msgstr ""
 "  --search dossier type texte [récursif]\n"
 "                         rechercher des messages\n"
-"                         dossier, par ex. : « #mh/Mailbox/inbox » ou « Mail "
-"»\n"
+"                         dossier, par ex. : « #mh/Mailbox/inbox » ou « Mail »\n"
 "                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] ou "
 "g: tag\n"
 "                         texte: chaîne de texte à chercher\n"
@@ -7619,818 +7564,813 @@ msgstr "Gestionnaire réseau : le réseau est activé.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "Gestionnaire réseau : le réseau est désactivé.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "_Vue"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Configuration"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "_Ajouter une boîte aux lettres"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "_MH.."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Changer l'ordre des boîtes aux lettres.."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "I_mporter un fichier mbox.."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "E_xporter vers un fichier mbox.."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "_Exporter la sélection en fichier mbox.."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "_Vider toutes les corbeilles"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "Enregi_strer le message sous.."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "Enregi_strer la partie sous.."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Mise en _page.."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "_Imprimer.."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "S_ynchroniser les dossiers distants"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "Sélectionner la discussi_on"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "Chercher dans le _message.."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_Recherche rapide"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "Afficher _ou cacher"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "Barre d'_outils"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "Sélect_ion des éléments affichés"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "Dans la liste des _dossiers.."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "Dans la liste des _messages.."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "_Disposition"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Trier"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "Attirer par s_ujet"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "Déplo_yer les fils de discussion"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "Com_pacter les fils de discussion"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Aller à"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "Message _précédent"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "Message suiva_nt"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Non l_u précédent"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Non _lu suivant"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Message nouv_eau précédent"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Message nou_veau suivant"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "M_arqué précédent"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "_Marqué suivant"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "C_olorié précédent"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "_Colorié suivant"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Message ouvert précédent"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Message ouvert suivant"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Message paren_t"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Do_ssier non lu suivant"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Chercher dans le dossier.."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Partie suivante"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Partie précédente"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Défilement du message"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Ligne précédente"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Ligne suivante"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Page suivante"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Décoda_ge"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Code _source du message.."
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Message"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Afficher comme du texte"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Ouvrir avec.."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "_Citations"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "Mettre à jo_ur"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "Réce_ption"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Relever le courrier du compte _courant"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Relever le courrier de _tous les comptes"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "_Interrompre la relève du courrier"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "Composer un _nouveau message"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Composer un _article de groupe de discussion"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Rép_ondre à"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_Liste de diffusion"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Donner suite _et répondre à"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Transférer"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Transférer en _pièce jointe"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Rediri_ger"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "_Liste de diffusion"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Écrire à la liste"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "_Aide"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Se _désinscrire"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Voir l'archive"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "Contacter le _propriétaire"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "_Déplacer.."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Copier.."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Déplacer ver_s la corbeille"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "S_upprimer définitivement.."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Déplacer ver_s la corbeille"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "S_upprimer la discussion"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "E_ffacer un article du serveur"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_Marquer"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_Démarquer"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Marquer comme _non lu"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Marquer comme _lu"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Marquer _tous comme lus"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorer du f_il de discussion"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Inclure dans _fil de discussion"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "_Suivre le fil de discussion"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Ne _plus suivre le fil"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Marquer comme _pourriel"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Marquer comme courrier _légitime"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "_Bloquer"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Débloquer"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "C_olorier"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "La_bels"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "Rééd_iter"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Vérifier la signature"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "A_jouter l'expéditeur au carnet d'adresses"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "Récupération des adresses"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "À partir du dossier actuel.."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "À partir des _messages sélectionnés.."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "_Filtrer tous les messages du dossier"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Exéc_uter les règles de traitement du dossier courant"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Créer une _règle de filtrage"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatiquement"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "Par _De"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "A_vec « À: »"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "Par _Sujet"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Créer une règle de traite_ment"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "_Liste d'URLs.."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "Examen de tous les dossiers pour _nouveaux messages"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Supprimer les messages en _double"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "Dans le dossier sélectionné"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "Dans tous les dossiers"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "E_xécuter"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "P_urger"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "C_ertificats SSL"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "Traces de _filtrage"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "Traces _réseaux"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "Oublier tous mots de passe des sessions"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "Oublier tous mots de passe des sessions"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "_Sélectionner un autre compte"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "_Configuration du compte courant.."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Création d'un _nouveau compte.."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "Édition des _comptes.."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "_Préférences.."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "P_ré-traitement.."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "P_ost-traitement.."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Filtrage des messages.."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "_Modèles.."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Actions.."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "_Labels.."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "Mo_dules.."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Manuel"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ en ligne autogérée"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "_Légende des icônes"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Définir comme client par défaut"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "_Travailler hors-ligne"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Barre de Men_u"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "Vue du _message"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "_Barre d'état"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "_En-tête de colonnes"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "Vue par _fil de discussion"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Cacher les fils lus"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "Cacher les messages _lus"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Cacher les messages supprimés"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "Plei_n écran"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Tous les _en-têtes"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Re_plier tout"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Replier à partir du niveau _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Replier à partir du niveau _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Texte _sous les icônes"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Texte _contre les icônes"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "_Icônes seules"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "_Texte seul"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Classique"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Trois colonnes"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "Vue des _messages étendue"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "_Liste des messages étendue"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "_Petit écran"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "Par _numéro"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "Par taille"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "Par da_te"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Par date du _fil"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "Par s_ujet"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "Par _couleur"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Par _label"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "Par _marque"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "Par ét_at"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "Par _pièce jointe"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Par sc_ore"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Par _verrouillés"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "Ne pas tr_ier"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Ascendant"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Descendant"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "Détection _automatique"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Appliquer des labels.."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "Une ou plusieurs erreurs sont survenues. Cliquez-ici pour voir les traces."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 "Vous êtes en ligne. Veuillez cliquer sur l'icône pour aller hors-ligne."
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 "Vous êtes hors-ligne. Veuillez cliquer sur l'icône pour aller en ligne."
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Sélectionner un compte"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Traces réseaux"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Traces de débogage du filtrage/traitement"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "Le traçage du filtrage est activé.\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "Le traçage du filtrage est désactivé.\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "rien"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr ""
 "Voulez-vous vraiment supprimer tous les messages de toutes les corbeilles ?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Ne pas quitter"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8439,18 +8379,18 @@ msgstr ""
 "Veuillez saisir le chemin vers la boîte aux lettres :\n"
 "(Si elle existe déjà, elle sera automatiquement analysée.)"
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 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:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -8460,79 +8400,79 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "Envoi de message non autorisé"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "L'importation mbox a échoué."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "L'exportation mbox a échoué."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Voulez-vous vraiment quitter Claws Mail ?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Synchronisation de dossiers distants"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Voulez-vous vraiment synchroniser vos dossiers distants ?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Synchroniser"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double.."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, 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:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Règles de traitement à appliquer avant le filtrage des dossiers"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Règles de traitement à appliquer après le filtrage des dossiers"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Règles de filtrage"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 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:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail est maintenant le client par défaut."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 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:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8612,7 +8552,7 @@ msgstr "Écrasement du fichier mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Ce fichier existe déjà. Voulez-vous l'écraser ?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Écraser"
@@ -8658,19 +8598,19 @@ msgstr "Fin de message atteint, reprendre depuis le début ?"
 msgid "Search finished"
 msgstr "Recherche terminée"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Message"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "< « Return-Path: » introuvable>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8685,11 +8625,11 @@ msgstr ""
 "Return-Path: %s\n"
 "Il est conseillé de ne pas envoyer cet accusé de réception."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Ne pas envoyer"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -8701,47 +8641,47 @@ msgstr ""
 "destinataire officiel.\n"
 "Il est conseillé de ne pas envoyer cet accusé de réception."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Lecture du message (%s) en cours.."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Déchiffrement impossible : %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 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:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Écraser le fichier existant ?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Afficher l'ensemble des %s."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Seul le premier méga-octet de texte est affiché."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8749,19 +8689,19 @@ msgstr ""
 "Vous avez demandé un accusé de réception pour ce message : cela a été mis en "
 "évidence pour le destinataire."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 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:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Ce message demande l'envoi d'un accusé de réception."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Envoyer"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8769,7 +8709,7 @@ msgstr ""
 "Ce message a été partiellement récupéré,\n"
 "et a été supprimé du serveur."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8778,16 +8718,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:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 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:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Supprimer"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8796,12 +8736,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:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Démarquer"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8810,11 +8750,11 @@ msgstr ""
 "Ce message a été partiellement récupéré ;\n"
 "il fait %s au total et est marqué pour être supprimé ultérieurement."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Accusé de réception."
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8826,19 +8766,19 @@ msgstr ""
 "Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accusé "
 "de réception :"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Envoyer"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossible d'imprimer : le message ne contient pas de texte."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8846,7 +8786,7 @@ msgstr ""
 "\n"
 " Il n'y a pas de messages dans ce dossier"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8854,7 +8794,7 @@ msgstr ""
 "\n"
 " Le message a été supprimé"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8862,16 +8802,16 @@ msgstr ""
 "\n"
 " Le message a été supprimé ou déplacé vers un autre dossier"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 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:530
 msgid "Moving messages..."
 msgstr "Déplacement des messages en cours.."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Suppression des messages en cours.."
 
@@ -8975,7 +8915,8 @@ msgid "Go back to email"
 msgstr "Revenir à l'email"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190
+#: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
@@ -9055,81 +8996,81 @@ msgstr "Taille :"
 msgid "Description:"
 msgstr "Description :"
 
-#: src/news.c:303
+#: src/news.c:302
 #, 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:336
+#: 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:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Erreur de connexion à %s:%d..\n"
 
-#: src/news.c:438
+#: src/news.c:437
 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:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Le mode de lecture a échoué, erreur ignorée\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Erreur de création de session avec %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Erreur d'authentification à %s:%d..\n"
 
-#: src/news.c:491
+#: src/news.c:490
 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:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "Impossible de sélectionner le groupe : %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "Impossible de définir le groupe : %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Intervalle d'articles invalide : %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "Impossible d'obtenir xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Exécution de xover %d - %d sur %s..\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "Impossible de faire un xover.\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "Ligne xover invalide\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9921,7 +9862,8 @@ msgstr ""
 "Les expressions régulières ci-dessus ne seront pas vérifiées dans les "
 "messages transférés ainsi que dans les redirections"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Signature"
 
@@ -10037,12 +9979,14 @@ msgstr ""
 "Ce module est paramétrable via les options situées sous Configuration/"
 "Préférences/Modules/Bogofilter."
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Analyse anti-SPAMs"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Apprentissage de SPAMs"
@@ -10209,8 +10153,8 @@ msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr ""
-"Erreur lors du traitement d'un message par le module Bsfilter. La commande `"
-"%s` n'a pu être exécutée."
+"Erreur lors du traitement d'un message par le module Bsfilter. La commande `%"
+"s` n'a pu être exécutée."
 
 #: src/plugins/bsfilter/bsfilter.c:501
 msgid "Bsfilter: learning from message..."
@@ -10648,7 +10592,7 @@ msgstr "Le CSS de ce fichiers sera appliqué à toutes les parties HTML"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Pa_rcourir"
@@ -10657,93 +10601,93 @@ msgstr "Pa_rcourir"
 msgid "Select stylesheet"
 msgstr "Choix de la feuille de style"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Le chargement de données distantes est désactivé."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Charger les images"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Activer le chargement du contenu distant"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Activer JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Activer les modules"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Activer Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Ouvrir les liens avec le navigateur externe"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Une erreur s'est produite : %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, 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:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Chercher sur le Web"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Ouvrir ici"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Ouvrir ici (activez le contenu distant)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Ouvrir avec le navigateur"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Ouvrir l'image"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Copier le lien"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Télécharger le lien"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Enregistrer l'image sous"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Copier l'image"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Importer le flux"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy - rendu HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10845,11 +10789,11 @@ msgstr ""
 "Ajout de l'en-tête X-FETCH-TIME avec pour valeur la date complète de "
 "réception du message, au format RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "Module GData : authentification requise"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10867,30 +10811,30 @@ msgstr ""
 "d'autorisation. Entrez alors ce code dans le champ ci-dessous afin de donner "
 "l'accès à votre liste de contacts Google à Claws Mail."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Étape 1 :"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 "Cliquer ici pour ouvrir la page d'autorisation Google dans un navigateur"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Étape 2 :"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Saisie du code :"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Module GData : erreur lors de le recherche des contacts : %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10898,75 +10842,75 @@ msgstr[0] "Ajout de %d sur"
 msgstr[1] "Ajout de %d sur"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 contact au cache"
 msgstr[1] "%d contacts au cache"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Module GData : lancement asynchrone de la recherche des contacts\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Module GData : erreur lors de le recherche des groupes : %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "Module GData : identifié\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Module GData : lancement asynchrone de la recherche des contacts\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Module GData : erreur d'authentification : %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "Module GData : authentification réussie\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Module GData : lancement l'authentification interactive\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 "Module GData : code d'authentification reçu, authentification requise\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
 "Module GData : code d'autorisation non reçu, requête d'autorisation annulée\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Module GData : erreur de renouvellement de l'authentification : %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Module GData : succès du renouvellement de l'authentification\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 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:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Authentification"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Utilisateur :"
 
@@ -11012,7 +10956,7 @@ msgstr ""
 "\n"
 "Vos commentaires et retours sont les bienvenus auprès de <berndth at gmx.de>."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "Intégration de GData"
 
@@ -11243,7 +11187,7 @@ msgstr "Délait d'expiration de requête."
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "seconde(s)"
@@ -11538,28 +11482,28 @@ msgid "Specify authentication"
 msgstr "Utiliser l'authentification"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Nom d'utilisateur"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Mot de passe"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Authentification"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automatique"
 
@@ -12491,7 +12435,8 @@ msgstr "Expirer après"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Mettre 0 pour la mémoriser pendant toute la session"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minute(s)"
@@ -12650,159 +12595,164 @@ msgstr "La signature n'a pas été vérifiée."
 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:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, 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
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Signature correcte de « %s » [ultime]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Signature correcte de « %s » [complète]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Signature correcte de « %s » [marginale]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature correcte de « %s »."
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, 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:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expirée de « %s »."
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, 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:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, 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:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Mauvaise signature de « %s »"
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, 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:276
 msgid "The signature has not been checked"
 msgstr "La signature n'a pas été vérifiée"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "Erreur de vérification de la signature : pas de statut\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Erreur de vérification de la signature : %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la clé %s ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Signature correcte de « %s » (Confiance : %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "UID de clé « %s » expiré\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, 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:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "UID de clé « %s » revoqué\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Mauvaise signature de « %s »\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid « %s » (Confiance : %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "Révoqué"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Confiance dans le possesseur : %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "Pas de clé !"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de la clé primaire :"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, 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:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, 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:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, 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:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Échec lors de l'initialisation des données, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "La spécification de la clé privée est ambiguë."
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Clé privée non trouvée (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, 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:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, 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:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12811,12 +12761,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:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, 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:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12824,7 +12774,7 @@ msgstr ""
 "GnuPG n'est pas correctement installé ou doit être mis à jour.\n"
 "Support OpenPGP désactivé."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12832,11 +12782,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:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "Pas de clé PGP trouvée"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -12846,12 +12796,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:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, 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:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12859,11 +12809,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:879
+#: src/plugins/pgpcore/sgpgme.c:883
 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:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12876,19 +12826,19 @@ msgstr ""
 "\n"
 "Voulez-vous l'exporter vers un serveur de clés ?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "Clé générée"
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "Clé exportée."
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "Échec lors de l'exportation de la clé."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "L'exportation de clés n'est pas implémentée sous Windows."
 
@@ -13039,8 +12989,8 @@ msgstr ""
 "messages, la vérification des signatures ou la signature et le chiffrement "
 "de votre propre courrier.\n"
 "\n"
-"Il peut être activé comme Système de confidentialité par défaut via le menu "
-"« Configuration/Configuration du compte courant.. » dans l'onglet « "
+"Il peut être activé comme Système de confidentialité par défaut via le menu « "
+"Configuration/Configuration du compte courant.. » dans l'onglet « "
 "Confidentialité » et par le menu « Options/Système de confidentialité » lors "
 "d'une composition de message.\n"
 "\n"
@@ -13102,8 +13052,8 @@ msgstr ""
 "déchiffrer les messages, vérifier les signatures ou signer et chiffrer vos "
 "propres mails.\n"
 "\n"
-"Il peut être activé comme Système de confidentialité par défaut via le menu "
-"« Configuration/Configuration du compte courant.. » dans l'onglet « "
+"Il peut être activé comme Système de confidentialité par défaut via le menu « "
+"Configuration/Configuration du compte courant.. » dans l'onglet « "
 "Confidentialité » et par le menu « Options/Système de confidentialité » lors "
 "d'une composition de message.\n"
 "\n"
@@ -13125,9 +13075,9 @@ msgstr "Afficher la console Python.."
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Pa_rcourir"
 
@@ -13206,8 +13156,7 @@ msgstr ""
 "\n"
 "Le dossier ~/.claws-mail/python-scripts/auto/ est l'endroit où enregistrer "
 "des scripts à exécuter automatiquement lors de certains évènements. "
-"Actuellement, les fichiers suivants dans le répertoire « auto » sont "
-"gérés :\n"
+"Actuellement, les fichiers suivants dans le répertoire « auto » sont gérés :\n"
 "\n"
 "compose_any\n"
 "Exécuté lorsqu'une fenêtre de composition de message est ouverte (nouveau "
@@ -13442,7 +13391,7 @@ msgstr ""
 "à l'avenir."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Vérifier la validité du certificat SSL"
 
@@ -13605,17 +13554,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Mise à jour des commentaires pour %s.."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Autorisation requise)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (Non autorisé)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (Non trouvé)"
 
@@ -13715,8 +13664,8 @@ msgstr ""
 "système S/MIME. Vous pouvez déchiffrer les messages, vérifier les signatures "
 "ou signer et chiffrer vos propres mails.\n"
 "\n"
-"Il peut être activé comme Système de confidentialité par défaut via le menu "
-"« Configuration/Configuration du compte courant.. » dans l'onglet « "
+"Il peut être activé comme Système de confidentialité par défaut via le menu « "
+"Configuration/Configuration du compte courant.. » dans l'onglet « "
 "Confidentialité » et par le menu « Options/Système de confidentialité » lors "
 "d'une composition de message.\n"
 "\n"
@@ -13754,21 +13703,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:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Soumission du pourriel.."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Soumettre le(s) pourriel(s) en ligne"
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "SpamReport"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13784,19 +13733,19 @@ msgstr ""
 " * spamcop.net\n"
 " * Système de nomination de lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Soumission de pourriel"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Activé"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Transférer à :"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Mot de passe :"
 
@@ -14001,7 +13950,8 @@ msgid "Show"
 msgstr "Montrer"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "jour(s)"
 
@@ -14094,7 +14044,7 @@ msgid "Next month"
 msgstr "Mois suivant"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "Calendrier"
 
@@ -14130,7 +14080,7 @@ msgstr ""
 "d'exporter vos rendez-vous et vos calendrier(s), de partager votre statut de "
 "disponibilité et de récupérer celui d'autres personnes."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Calendrier"
 
@@ -14314,63 +14264,63 @@ msgstr "Invités :"
 msgid "Action:"
 msgstr "Action :"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Nouveau rendez-vous.."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Exporter le calendrier.."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_S'inscrire à un calendrier en ligne.."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "_Renommer.."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "Me_ttre à jour les calendriers"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "Vue en _liste"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "Vue _hebdomadaire"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "Vue _mensuelle"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Rendez-vous"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "dans le passé"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "aujourd'hui"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "demain"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "cette semaine"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "plus tard"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -14379,17 +14329,17 @@ msgstr ""
 "\n"
 "Voici les évènements planifiés %s :\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, 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:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Erreur %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14402,7 +14352,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14415,7 +14365,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -14426,7 +14376,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -14437,43 +14387,43 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Impossible de créer le dossier %s."
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 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:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Récupération du calendrier pour %s.."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "Nouvelle inscription"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 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:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "S'inscrire à un calendrier en ligne (WebCal)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Veuillez saisir l'URL du calendrier en ligne (WebCal) :"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Impossible de comprendre l'URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Voulez-vous vraiment vous désinscrire ?"
 
@@ -14846,89 +14796,89 @@ msgstr "Impossible d'exporter les informations de disponibilité."
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Impossible d'exporter les informations de disponibilité vers '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Rappels"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "M'alerter"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "minutes avant un rendez-vous"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Export de calendrier"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Exporter le calendrier automatiquement vers"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Vous pouvez exporter vers un fichier ou un URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr ""
 "Veuillez saisir le chemin d'un fichier ou d'une URL (http://server/path/file."
 "ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr ""
 "Inclure les inscriptions au(x) calendrier(s) en ligne (WebCal) dans l'export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Commande à exécuter après l'export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Enregistrer le calendrier de Claws dans l'horloge Orage d'XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "Permet à Orage (version supérieure à 4.4) de voir le calendrier de Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Exporter en tant que serveur de calendrier de GNOME Shell"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Se connecter à l'interface D-BUS du serveur calendrier de GNOME Shell afin "
 "d'exporter le calendrier de Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Informations de disponibilité"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Exporter automatiquement l'état de disponibilité vers"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr ""
 "Veuillez saisir le chemin d'un fichier ou d'une URL (http://server/path/file."
 "ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Commande à exécuter après l'export de l'état de disponibilité"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Récupérer les informations de disponibilité des autres sur"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14938,7 +14888,7 @@ msgstr ""
 "ifb). Utilisez %u pour la partie gauche de l'adresse email, %d pour le "
 "domaine"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "Options SSL"
 
@@ -14993,12 +14943,12 @@ msgstr "Erreur pendant la session POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "Commande TOP non supportée\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -15006,7 +14956,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Fichier mbox local"
 
@@ -15034,11 +14984,11 @@ msgstr "Nom complet"
 msgid "Mail address"
 msgstr "Adresse email"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Auto-configurer"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -15130,7 +15080,7 @@ msgstr ""
 "de les marquer pour un téléchargement complet ou une suppression (effectif "
 "qu'à la relève suivante)."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -15142,74 +15092,69 @@ msgstr "Nombre maximum d'articles à récupérer"
 msgid "unlimited if 0 is specified"
 msgstr "pas de limite si 0 est spécifié"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Chercher :"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Répertoire sur le serveur IMAP4"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(généralement nul)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Afficher seulement les dossiers inscrits"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 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:1621
+#: src/prefs_account.c:1619
 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:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages à la réception"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permission aux modules de filtrer les messages à la réception"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 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:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "En-tête"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Génération de l'en-tête « Message-Id: »"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Mettre l'adresse email dans le Message-ID"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Ajouter l'en-tête user agent"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15217,181 +15162,181 @@ msgstr ""
 "Veuillez laisser ces champs vides pour utiliser le nom d'utilisateur et le "
 "mot de passe spécifiés pour la réception."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "S'authentifier sur le POP3 avant l'envoi"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "Délai maximal pour l'authentification POP :"
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "minute(s)"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Signature"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Insérer automatiquement la signature"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Séparateur de signature"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Résultat d'une commande"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Dictionnaires de correction orthographique"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Dictionnaire par défaut"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Dictionnaire alternatif par défaut"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Composition"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Système de confidentialité par défaut"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Toujours signer les messages"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Toujours chiffrer les messages"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "Toujours signer la réponse à un message signé"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Toujours chiffrer la réponse à un message chiffré"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Chiffrer les messages envoyés avec votre propre clé en plus de celle du "
 "destinataire"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Enregistrer les messages chiffrés envoyés en texte clair"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Ne pas utiliser SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Utiliser SSL pour les connexions POP3"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utiliser SSL pour les connexions IMAP4"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Utiliser SSL pour les connexions NNTP"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Ne pas utiliser SSL (mais utiliser STARTTLS si nécessaire)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Utiliser SSL pour les connexions SMTP"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Certificats client"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Certificat pour la réception"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 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:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Certificat pour l'envoi"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Accepter automatiquement les certificats SSL valides"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Utiliser la communication SSL non bloquante"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "À désactiver en cas de problèmes de connexion SSL"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "Port POP3"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "Port IMAP4"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Nom de domaine"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15399,15 +15344,15 @@ 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:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Utiliser une commande externe pour communiquer avec le serveur"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Déplacer les mails supprimés à la corbeille, et purger immédiatement"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -15415,108 +15360,108 @@ msgstr ""
 "Met les messages supprimés à la corbeille au lieu d'utiliser le drapeau "
 "\\Deleted sans purger."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marquer les articles croisés comme lus et les colorier en"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Sauvegarder les messages envoyés dans "
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Sauvegarder les messages à envoyer (file d'attente) dans "
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Sauvegarder les brouillons dans "
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Sauvegarder les messages supprimés dans "
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Le nom du compte est non spécifié."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "L'adresse email est non spécifiée."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "Le serveur d'envoi (SMTP) est non spécifié."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Le nom d'utilisateur est non spécifié."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "Le serveur POP3 est non spécifié."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "Le dossier de réception par défaut n'existe pas."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "Le serveur IMAP4 est non spécifié."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "Le serveur NNTP est non spécifié."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "Le fichier local mbox est non spécifié."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "La commande externe d'envoi est non spécifiée."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modèles"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Configuration du nouveau compte"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Configuration du compte"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Échec (adresse incorrecte)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Sélection du fichier signature"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Choisir le fichier de certificat"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (module non chargé)"
@@ -15638,20 +15583,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Voulez-vous vraiment supprimer toutes les actions ?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
+#: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Règle non ajoutée"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "La règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Poursuivre l'édition"
 
@@ -16220,9 +16166,8 @@ msgid ""
 "program or script.\n"
 "The following symbols can be used:"
 msgstr ""
-"L'action de filtrage « Exécuter » permet à l'utilisateur d'envoyer un "
-"message ou élément d'en-tête de message à un programme ou un script "
-"auxiliaire.\n"
+"L'action de filtrage « Exécuter » permet à l'utilisateur d'envoyer un message "
+"ou élément d'en-tête de message à un programme ou un script auxiliaire.\n"
 "Il est possible d'utiliser les symboles suivants :"
 
 #: src/prefs_filtering_action.c:1422
@@ -16579,7 +16524,7 @@ msgstr "Affichage"
 msgid "Fonts"
 msgstr "Polices"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -16726,7 +16671,7 @@ msgstr "Messages d'erreur"
 msgid "Status messages for filtering/processing log"
 msgstr "Informations de déboguage du filtrage/traitement"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Autres"
 
@@ -16979,8 +16924,8 @@ msgstr "l'(les) adresse(s) de l'en-tête '%s'"
 msgid ""
 "Book/folder path is not set.\n"
 "\n"
-"If you want to match %s against the whole address book, you have to select "
-"'%s' from the book/folder drop-down list."
+"If you want to match %s against the whole address book, you have to select '%"
+"s' from the book/folder drop-down list."
 msgstr ""
 "Le chemin vers un carnet d'adresses/dossier n'est pas renseigné.\n"
 "\n"
@@ -17081,9 +17026,9 @@ msgid ""
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"La condition de filtrage « Test » permet à l'utilisateur de faire un test "
-"sur un message ou élément d'en-tête de message en utilisant un programme ou "
-"un script auxiliaire. Le programme doit retourner 0 ou 1 (0 étant la valeur "
+"La condition de filtrage « Test » permet à l'utilisateur de faire un test sur "
+"un message ou élément d'en-tête de message en utilisant un programme ou un "
+"script auxiliaire. Le programme doit retourner 0 ou 1 (0 étant la valeur "
 "validant la condition de filtrage).\n"
 "\n"
 "Il est possible d'utiliser les symboles suivants :"
@@ -17360,15 +17305,15 @@ msgstr "Sélection de la couleur des dossiers contenant des nouveaux messages"
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Pré-sélections de raccourcis clavier"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Veuillez sélectionner une configuration :"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -17377,35 +17322,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:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Un double-clique sur une adresse l'ajoute à la liste des destinataires"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "En quittant"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Demander une confirmation pour quitter"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Vider la corbeille en quittant"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Avertir s'il y a des messages à envoyer en file d'attente"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Permettre de modifier les raccourcis clavier"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -17417,15 +17362,15 @@ msgstr ""
 "Désactivez cette option si vous souhaitez figer les raccourcis de clavier "
 "existants (et ainsi éviter de les modifier par inadvertance)."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Pré-sélections de raccourcis clavier.."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Gestion des métadonnées"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -17435,33 +17380,33 @@ msgstr ""
 "Ceci évite certaines pertes de données après un crash\n"
 "système, mais peut prendre plus de temps."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Moins risqué"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Plus rapide"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Délai d'attente maximal de communication"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Demander une confirmation pour vider la ou les corbeilles"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 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:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Utiliser la suppression de fichiers sécurisée si possible"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -17469,7 +17414,7 @@ msgstr ""
 "Utiliser la suppression de fichiers sécurisée si possible\n"
 "(le programme 'shred' n'est pas disponible)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -17478,32 +17423,11 @@ 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:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchroniser les dossiers en ligne dès que possible"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Saisie du mot de passe"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Saisie du mot de passe"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Saisie du mot de passe"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Divers"
 
@@ -17763,8 +17687,8 @@ msgstr ""
 "Spécifier le « Content-Transfer-Encoding » utilisé quand le corps du message "
 "contient des caractères non ASCII."
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Envoi"
 
@@ -18031,8 +17955,8 @@ msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr ""
-"L'affichage des en-têtes courants (comme « From: », « Subject: ») sera "
-"traduit dans le language présentement utilisé."
+"L'affichage des en-têtes courants (comme « From: », « Subject: ») sera traduit "
+"dans le language présentement utilisé."
 
 #: src/prefs_summaries.c:732
 msgid "Summaries"
@@ -18502,28 +18426,28 @@ msgstr "Aucune d'information trouvée"
 msgid "No recipient keys defined."
 msgstr "Pas de clé de destinataire spécifiée."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Erreur de décodage BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Les messages en file d'attente sont déjà en cours d'envoi."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Impossible d'ouvrir le fichier %s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "L'en-tête de message en file d'attente est corrompue."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "Une erreur est survenue durant la session SMTP."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -18531,7 +18455,7 @@ msgstr ""
 "Aucun compte précis n'a été trouvé pour l'envoi, et une erreur est survenue "
 "durant la session SMTP."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -18539,22 +18463,22 @@ msgstr ""
 "Impossible de déterminer les paramètres d'envoi. Le message n'a sans doute "
 "pas été généré par Claws Mail."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "Impossible de créer un fichier temporaire pour l'envoi de l'article."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Erreur pendant l'écriture du ficher temporaire nécessaire\n"
 "à l'envoi de l'article."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Filtrage des messages..\n"
 
@@ -18864,88 +18788,88 @@ msgstr "Veuillez saisir le texte pour remplacer '%s'"
 msgid "Enter variable"
 msgstr "Remplacement de variable"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Envoi du message par la commande : %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Impossible de lancer la commande : %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Une erreur est survenue pendant le lancement de la commande : %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Connexion"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Connexion POP avant SMTP.."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP avant SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Compte '%s' : Connexion au serveur SMTP : %s:%d.."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "Message envoyé avec succès."
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Envoi de HELO.."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Envoi du message.."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "Envoi de EHLO.."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "Envoi de MAIL FROM.."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "Envoi de RCPT TO.."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "Envoi de DATA.."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Fermeture.."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Envoi du message (%d / %d octets)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Envoi de message"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Une erreur est survenue pendant l'envoi de message."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19837,12 +19761,12 @@ msgstr "Veuillez sélectionner un URL à ouvrir."
 msgid "Select All"
 msgstr "Sélectionner tout"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenue dans Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -19937,48 +19861,48 @@ msgstr ""
 "<%s>\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Veuillez saisir le nom de la boîte aux lettres."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Veuillez saisir votre nom et adresse email."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr ""
 "Veuillez saisir votre serveur de réception et votre compte utilisateur."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Veuillez saisir l'emplacement de votre boîte aux lettres locale."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Veuillez saisir votre serveur d'envoi (SMTP)."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Veuillez saisir votre nom d'utilisateur sur le serveur d'envoi."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Votre nom :"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Votre adresse email"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Votre société :"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Nom de la boîte aux lettres"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19986,7 +19910,7 @@ msgstr ""
 "Vous pouvez aussi spécifier un chemin absolu, comme par exemple : « /home/"
 "john/Documents/Mail »."
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19994,55 +19918,55 @@ msgstr ""
 "Vous pouvez spécifier le numéro du port en l'ajoutant à la fin : « mail."
 "exemple.com:25 »."
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "Adresse du serveur d'envoi (SMTP) :"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Utiliser l'authentification (SMTP AUTH)"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(si non renseigné, utilise le même qu'en réception)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "Nom d'utilisateur SMTP :"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "Mot de passe SMTP :"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Utiliser SSL pour les connexions au serveur d'envoi (SMTP)"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Utiliser SSL via STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Certificat client SSL (optionnel)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Adresse du serveur :"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Boîte aux lettres locale"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Type de serveur :"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP4"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -20050,19 +19974,19 @@ msgstr ""
 "Vous pouvez spécifier le numéro du port en l'ajoutant à la fin : « mail."
 "exemple.com:110 »."
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Utiliser SSL pour les connexions au serveur de réception"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "Répertoire IMAP4 :"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Afficher seulement les dossiers inscrits"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -20070,15 +19994,15 @@ msgstr ""
 "Attention : la version de Claws Mail actuellement\n"
 "utilisée a été compilée sans le support IMAP."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Assistant de configuration de Claws Mail"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenue dans Claws Mail"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -20093,31 +20017,31 @@ msgstr ""
 "que vous puissiez commencer à utiliser Claws Mail dans une poignée de "
 "secondes.."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Informations personnelles"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Les champs en gras doivent être spécifiés."
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Réception du courrier"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Envoi du courrier"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Enregistrer les messages sur le disque"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Configuration terminée"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -20128,9 +20052,6 @@ msgstr ""
 "Vous pouvez maintenant cliquer sur « Enregistrer » pour\n"
 "débuter et apprécier.."
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "La signature ne peut être vérifiée - %s."
-
 #~ msgid "+_Insert"
 #~ msgstr "+_Insérer"
 
@@ -20216,11 +20137,11 @@ msgstr ""
 #~ "span>"
 
 #~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
-#~ "%d errors</span>"
+#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and %"
+#~ "d errors</span>"
 #~ msgstr ""
-#~ "<span color=\"red\">Utilisation de %s dans %d fichiers, %d répertoires, "
-#~ "%d autres et %d erreurs</span>"
+#~ "<span color=\"red\">Utilisation de %s dans %d fichiers, %d répertoires, %"
+#~ "d autres et %d erreurs</span>"
 
 #~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
 #~ msgstr ""
@@ -20262,8 +20183,8 @@ msgstr ""
 #~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
 #~ msgstr ""
 #~ "<b>Intervalle de mise à jour, en minutes :</b>\n"
-#~ "<small>(Saisissez 0 pour désactiver la mise à jour automatique de ce "
-#~ "flux)</small>"
+#~ "<small>(Saisissez 0 pour désactiver la mise à jour automatique de ce flux)"
+#~ "</small>"
 
 #~ msgid "<b>If an item changes, do not mark it as new:</b>"
 #~ msgstr "<b>Si un article change, ne pas le marquer comme non lu :</b>"
diff --git a/po/he.po b/po/he.po
index e7e95be..d94115f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 11:20+0000\n"
 "PO-Revision-Date: 2015-07-12 18:57+0200\n"
 "Last-Translator: Isratine Citizen <genghiskhan at gmx.ca>\n"
 "Language-Team: Rahut <translators at lists.claws-mail.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Language: he\n"
 "X-Source-Language: en\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -28,16 +28,16 @@ msgstr ""
 "ישנם כמה חלונות הלחנה פתוחים.\n"
 "עליך לסגור כל חלון הלחנה בטרם עריכת חשבונות."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "אין אפשרות ליצור תיקייה."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "עריכת חשבונות"
 
 # מחווינה
-#: src/account.c:744
+#: src/account.c:741
 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,43 +46,43 @@ msgstr ""
 "באמצעות 'השג דואר' תאחזרו הודעות מתוך חשבונות בסדר נתון, תיבת הסימון\n"
 "מתווה אילו חשבונות יכללו. טקסט בולט מעיד על החשבון השגרתי."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " קבע בתור חשבון ש_גרתי "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "חשבונות עם תיקיות מרוחקות לא ניתנות להעתקה."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "עותק של %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את החשבון '%s'?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(ללא כותרת)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "מחיקת חשבון"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "ק"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'השג דואר' מאחזרת דואר מתוך החשבונות הנבחרים"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -95,11 +95,11 @@ msgstr "'השג דואר' מאחזרת דואר מתוך החשבונות הנב
 msgid "Name"
 msgstr "שם"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "שרת"
 
@@ -154,10 +154,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "שגיאה לא מוכרת"
 
@@ -420,18 +420,18 @@ msgid "_Book"
 msgstr "פנק_ס"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "_כלים"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_עזרה"
 
@@ -470,13 +470,13 @@ msgstr "_מחק ספר"
 msgid "_Save"
 msgstr "ש_מור"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_סגור"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "_בחר הכל"
 
@@ -485,7 +485,7 @@ msgid "C_ut"
 msgstr "_גזור"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "ה_עתק"
@@ -535,8 +535,8 @@ msgstr "מצא כפילויות..."
 msgid "Edit custom attributes..."
 msgstr "ערוך אפיונים מותאמים..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_אודות"
 
@@ -655,7 +655,7 @@ msgstr "אימות חזק (יותר) נדרש"
 msgid "Sources"
 msgstr "מקורות"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "פנקס כתובות"
@@ -706,7 +706,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "מחיקת תיקייה"
 
@@ -819,7 +819,7 @@ msgid "Person"
 msgstr "אישיות"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "תיקייה"
 
@@ -959,19 +959,19 @@ msgstr "כתובות עודכנו"
 msgid "Update failed. Changes not written to Directory."
 msgstr "עדכון נכשל. שינויים לא נכתבו למדור."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "התראה"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868 src/plugins/pgpcore/sgpgme.c:750
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
 msgid "Warning"
 msgstr "אזהרה"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "שגיאה"
 
@@ -1004,88 +1004,88 @@ msgstr "שם LDAP"
 msgid "Attribute Value"
 msgstr "ערך אפיון"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "כלום"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "צופה"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "מנתח MIME‏"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "תיקיות"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "סינון"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "ממשק פרטיות"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "מתריע"
 
 # typo: an > a
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "כלי עזר"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "דברים"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "תוסף זה מספק %s ‏(%s), שכבר מסופק על ידי התוסף %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "תוסף כבר טעון"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "כשל בהקצאת זיכרון עבור תוסף"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr "מודול זה אינו רשוי תחת GPL v3 או רשיון יותר מאוחר תואם."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "מודול זה מיועד עבור Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr "הגרסא של Claws Mail שברשותך חדשה יותר מן הגרסא שהתוסף '%s' נבנה עמה."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "הגרסא של Claws Mail שברשותך חדשה יותר מן הגרסא שהתוסף נבנה עמה."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "הגרסא של Claws Mail שברשותך הינה ישנה מדי עבור התוסף '%s'."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "הגרסא של Claws Mail שברשותך הינה ישנה מדי עבור התוסף."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "לחיצת יד SSL נכשלה\n"
 
@@ -1477,7 +1477,7 @@ msgstr "הס_ר"
 msgid "_Properties..."
 msgstr "_מאפיינים..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_הודעה"
 
@@ -1547,7 +1547,7 @@ msgstr "_כרוכה"
 msgid "_Unwrapped"
 msgstr "_לא כרוכה"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "בחר ה_כל"
@@ -1612,7 +1612,7 @@ msgstr "מחק שורה"
 msgid "Delete to end of line"
 msgstr "מחק עד סוף שורה"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_מצא"
@@ -1657,47 +1657,47 @@ msgstr "מערכת _פרטיות"
 msgid "_Priority"
 msgstr "_עדיפות"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_קידוד תווים"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "מערב אירופאי"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "בלטי"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "עברי"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "ערבי"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "קירילי"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "יפני"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "סיני"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "קוריאני"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "תאילנדי"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_פנקס כתובות"
 
@@ -1705,7 +1705,7 @@ msgstr "_פנקס כתובות"
 msgid "_Template"
 msgstr "_תבנית"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "פ_עולות"
 
@@ -1741,11 +1741,11 @@ msgstr "_הצג סרגל"
 msgid "_Normal"
 msgstr "_רגילה"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_כולם"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_ממען"
 
@@ -1769,27 +1769,27 @@ msgstr "_נמוכה"
 msgid "_Lowest"
 msgstr "נ_מוכה ביותר"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_אוטומטי"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "‏7bit ASCII ‏(US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "קידוד אוניברסלי (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "מרכז אירופאי (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "יווני (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "טורקי (ISO-8859-_9)"
 
@@ -1836,47 +1836,46 @@ msgstr "לגוף של התבנית \"קידום\" יש שגיאה בשורה %d.
 msgid "Fw: multiple emails"
 msgstr "Fw: הודעות דואר מרובות"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "לגוף של התבנית \"הכוונה מחדש\" יש שגיאה בשורה %d."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "עותק:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "עותק סמוי:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "מענה-אל:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
-#: src/gtk/headers.h:33
+#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946 src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "קבוצות דיונים:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "המשך-אל:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "ב-מענה-אל:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "לכבוד:"
 
 # הימור
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "לא היתה אפשרות לספח קובץ (המרת מערך תווים נכשלה)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1891,16 +1890,16 @@ msgstr[1] ""
 "הקבצים הבאים סופחו: \n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"סימן מרכאות\" של התבנית הינו שגוי."
 
-#: src/compose.c:3605
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "לא היתה אפשרות להשיג גודל של קובץ '%s'."
 
-#: src/compose.c:3616
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1908,57 +1907,57 @@ msgid ""
 msgstr ""
 "בחרת לשבץ קובץ של %s בתוך גוף ההודעה. האם אתה בטוח כי ברצונך לעשות זאת?"
 
-#: src/compose.c:3619
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "האם אתה בטוח?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "_שבץ"
 
-#: src/compose.c:3744
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "קובץ %s הינו ריק."
 
-#: src/compose.c:3745
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "קובץ ריק"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "_ספח למרות זאת"
 
-#: src/compose.c:3755
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "אין אפשרות לקרוא %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "הודעה: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [ערוכה]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "‏%s - הלחנת הודעה%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[אין נושא] - הלחנת הודעה%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "הלחנת הודעה"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4820 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1966,52 +1965,52 @@ msgstr ""
 "חשבון לשליחת דואר אינו מצוין.\n"
 "אנא בחר חשבון דואר לפני שליחה."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "שלח"
 
-#: src/compose.c:5035
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "הנמען היחיד הינו כתובת CC ברירת מחדל. לשלוח למרות זאת?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_שלח"
 
-#: src/compose.c:5067
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "הנמען היחיד הינו כתובת BCC ברירת מחדל. לשלוח למרות זאת?"
 
-#: src/compose.c:5084
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "נמען אינו מצוין."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_תור"
 
-#: src/compose.c:5104
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "הנושא הינו ריק. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "לשלוח למרות זאת?"
 
 # להעמיד בתור
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "להשים בתור למרות זאת?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "שלח אח״כ"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2021,7 +2020,7 @@ msgstr ""
 "\n"
 "המרת מערך תווים נכשלה."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2031,7 +2030,7 @@ msgstr ""
 "\n"
 "לא היתה אפשרות להשיג מפתח הצפנה של נמען."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2042,7 +2041,7 @@ msgstr ""
 "\n"
 "חתימה נכשלה: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2053,11 +2052,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "לא היתה אפשרות להשים הודעה בתור לשליחה."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5196 src/compose.c:5256
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2066,7 +2065,7 @@ msgstr ""
 "נסה את \"שלח הודעות בהמתנה\" מתוך התפריט הראשי ונסה שוב."
 
 # נצל
-#: src/compose.c:5246
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2075,7 +2074,7 @@ msgstr ""
 "%s\n"
 "נסה את \"שלח הודעות בהמתנה\" מתוך התפריט הראשי ונסה שוב."
 
-#: src/compose.c:5621
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2086,7 +2085,7 @@ msgstr ""
 "אל מערך התווים %s המצוין.\n"
 "שלח זאת בתור הודעה %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2099,73 +2098,73 @@ msgstr ""
 "\n"
 "לשלוח למרות זאת?"
 
-#: src/compose.c:5790
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "לא היתה אפשרות להצפין את הדוא״ל: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "אזהרת הצפנה"
 
-#: src/compose.c:5912
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "ה_משך"
 
-#: src/compose.c:5961
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "אין חשבון זמין לצורך שליחת דואר!"
 
-#: src/compose.c:5970
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "חשבון נבחר אינו NNTP: פרסום הינו בלתי אפשרי."
 
-#: src/compose.c:6205
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "תצריף %s לא קיים כבר. להתעלם?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "בטל שליחה"
 
 # check
-#: src/compose.c:6206
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "התעלם מן תצריף"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "אזור %s מקורי"
 
-#: src/compose.c:6824
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "הוסף לפנק_ס כתובות"
 
-#: src/compose.c:6985
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "מחק תכולות רשומה"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "באפשרותך להקיש על <tab> להשלמה אוטומטית מתוך פנקס כתובות"
 
-#: src/compose.c:7204
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "טיפוס Mime"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "גודל"
 
-#: src/compose.c:7273
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "שמור הודעה אל "
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7327 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2176,23 +2175,23 @@ msgstr "שמור הודעה אל "
 msgid "_Browse"
 msgstr "   _עיון   "
 
-#: src/compose.c:7783
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "_תקורה"
 
-#: src/compose.c:7788
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "ת_צריפים"
 
-#: src/compose.c:7802
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "א_חרים"
 
-#: src/compose.c:7817
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "_נושא:"
 
-#: src/compose.c:8041
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2201,19 +2200,19 @@ msgstr ""
 "בודק איות לא יכול היה להתחיל.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "_מאת‎:"
 
-#: src/compose.c:8197
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "חשבון לשימוש עבור דוא״ל זה"
 
-#: src/compose.c:8199
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "כתובת ממען לשימוש"
 
-#: src/compose.c:8365
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2222,68 +2221,68 @@ msgstr ""
 "מערכת הפרטיות '%s' לא היתה ניתנת להיטען. לא תהא נתונה לך אפשרות לחתום או "
 "להצפין את הודעה זו."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_ללא"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8584 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "גוף התבנית מכיל שגיאה בשורה %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "שגיאת פורמט From של תבנית."
 
-#: src/compose.c:8701
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "שגיאת פורמט To של תבנית."
 
-#: src/compose.c:8719
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "שגיאת פורמט Cc של תבנית."
 
-#: src/compose.c:8737
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "שגיאת פורמט Bcc של תבנית."
 
-#: src/compose.c:8755
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "שגיאת פורמט Reply-To של תבנית."
 
-#: src/compose.c:8774
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "שגיאת פורמט נושא של תבנית."
 
-#: src/compose.c:9043
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "טיפוס MIME שגוי."
 
-#: src/compose.c:9058
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "קובץ לא קיים או שהינו ריק."
 
-#: src/compose.c:9132
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "מאפיינים"
 
-#: src/compose.c:9149
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "טיפוס MIME"
 
-#: src/compose.c:9190
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "קידוד"
 
-#: src/compose.c:9210
+#: src/compose.c:9227
 msgid "Path"
 msgstr "נתיב"
 
-#: src/compose.c:9211
+#: src/compose.c:9228
 msgid "File name"
 msgstr "שם קובץ"
 
-#: src/compose.c:9462
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2294,15 +2293,15 @@ msgstr ""
 "לכפות את סיום התהליך?\n"
 "process group id: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9968 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לשלוח את דוא״ל זה."
 
-#: src/compose.c:9977
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "לא היתה אפשרות להשים הודעה בתור."
 
-#: src/compose.c:9979
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2313,15 +2312,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "לא היתה אפשרות לשמור טיוטה."
 
-#: src/compose.c:10161
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "לא היתה אפשרות לשמור טיוטה"
 
-#: src/compose.c:10162
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2329,24 +2328,24 @@ msgstr ""
 "לא היתה אפשרות לשמור טיוטה.\n"
 "האם ברצונך לבטל יציאה או לסלק את דואר זה?"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "_ביטול יציאה"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "_סלק דואר"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "בחירת קובץ"
 
-#: src/compose.c:10352
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "קובץ '%s' לא היה יכול להיקרא."
 
-#: src/compose.c:10354
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2355,71 +2354,71 @@ msgstr ""
 "קובץ '%s' מכיל תווים שגויים\n"
 "עבור הקידוד הנוכחי, שיבוץ עשוי להיות לא מדויק."
 
-#: src/compose.c:10441
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "סילוק הודעה"
 
 # עברה שינוי. האם לסלקה
-#: src/compose.c:10442
+#: src/compose.c:10459
 msgid "This message has been modified. Discard it?"
 msgstr "הודעה זו שונתה. לסלק אותה?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_סלק"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "_שמור לטיוטות"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "שמירת שינויים"
 
-#: src/compose.c:10446
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr "הודעה זו שונתה. לשמור שינויים אחרונים?"
 
-#: src/compose.c:10447
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "_אל תשמור"
 
-#: src/compose.c:10518
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "האם ברצונך להחיל את התבנית '%s'?"
 
-#: src/compose.c:10520
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "החלת תבנית"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10538 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_החלף"
 
-#: src/compose.c:11379
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "לשבץ או לספח?"
 
-#: src/compose.c:11380
+#: src/compose.c:11397
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 "האם ברצונך לשבץ את התכולות של הקובץ/הקבצים לתוך גוף ההודעה, או לספחן לדוא״ל?"
 
-#: src/compose.c:11382
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "_ספח"
 
-#: src/compose.c:11599
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "שגיאת פורמט ציטטה בשורה %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2637,8 +2636,8 @@ msgid " Check File "
 msgstr " בחן קובץ "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "קובץ"
 
@@ -2786,7 +2785,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2904,16 +2903,17 @@ msgstr "התאם שמות 'מכילים' מונחי חיפוש"
 
 #: src/editldap.c:647
 msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"search; this type of search usually takes longer to complete. Note that for "
-"performance reasons, address completion uses \"begins-with\" for all "
-"searches against other address interfaces."
+"Searches for names and addresses can be performed either using "
+"\"begins-with\" or \"contains\" search term. Check this option to perform a "
+"\"contains\" search; this type of search usually takes longer to complete. "
+"Note that for performance reasons, address completion uses \"begins-with\" "
+"for all searches against other address interfaces."
 msgstr ""
-"חיפושים עבור שמות וכתובות ניתנים להתבצע בין באמצעות מונח חיפוש \"begins-with"
-"\" או באמצעות \"contains\". סמן את אפשרות זו כדי לקיים חיפוש \"contains\"; "
-"טיפוס חיפוש זה לוקח לרוב יותר זמן להשלמה. שים לב שמשום טעמים של ביצוע, השלמת "
-"כתובת משתמשת במונח \"begins-with\" עבור כל החיפושים לנגד ממשקי כתובות אחרים."
+"חיפושים עבור שמות וכתובות ניתנים להתבצע בין באמצעות מונח חיפוש "
+"\"begins-with\" או באמצעות \"contains\". סמן את אפשרות זו כדי לקיים חיפוש "
+"\"contains\"; טיפוס חיפוש זה לוקח לרוב יותר זמן להשלמה. שים לב שמשום טעמים "
+"של ביצוע, השלמת כתובת משתמשת במונח \"begins-with\" עבור כל החיפושים לנגד "
+"ממשקי כתובות אחרים."
 
 #: src/editldap.c:700
 msgid "Bind DN"
@@ -2955,7 +2955,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "המספר המקסימלי של רשומות שיוחזרו בתוצאות חיפוש."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "בסיסי"
 
@@ -3089,15 +3089,15 @@ msgid "Stylesheet"
 msgstr "יריעת סגנון"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "ללא"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "ברירת מחדל"
 
@@ -3468,8 +3468,8 @@ msgstr "כלל הינו מבוסס-חשבון, מדלג על בקשת משתמש
 #: src/filtering.c:694
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], not matching current account [id="
-"%d, name='%s']\n"
+"rule is account-based [id=%d, name='%s'], not matching current account "
+"[id=%d, name='%s']\n"
 msgstr ""
 "כלל הינו מבוסס-חשבון [id=%d, name='%s'], אינו תואם חשבון נוכחי [id=%d, "
 "name='%s']\n"
@@ -3588,27 +3588,27 @@ msgstr "אשפה"
 msgid "Drafts"
 msgstr "טיוטות"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "כעת מעבד (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "כעת מעתיק את %s אל %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "כעת מעביר את %s אל %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "כעת מעדכן מטמון עבור %s..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "כעת מעבד הודעות..."
 
@@ -3634,7 +3634,7 @@ msgstr "תיקייה_חדשה"
 #: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
 #: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "‏'%c' לא יכול להיכלל בשם תיקייה."
@@ -3642,7 +3642,7 @@ msgstr "‏'%c' לא יכול להיכלל בשם תיקייה."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "התיקייה '%s' כבר קיימת."
@@ -3666,7 +3666,7 @@ msgstr "סמן _רקורסיבית את כולן ככאלה שנקראו"
 msgid "R_un processing rules"
 msgstr "ה_רץ כללי עיבוד"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_חפש תיקייה..."
 
@@ -3725,12 +3725,12 @@ msgstr "האם אתה בטוח כי ברצונך לסמן את כל הדואר 
 msgid "Mark all as read"
 msgstr "סמן את כולן ככאלה שנקראו"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "כעת סורק תיקייה %s%c%s..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "כעת סורק תיקייה %s..."
@@ -3776,7 +3776,7 @@ msgstr "כעת פותח תיקייה %s..."
 msgid "Folder could not be opened."
 msgstr "תיקייה לא היתה ניתנת להיפתח."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "ריקון אשפה"
 
@@ -3963,8 +3963,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"‏Claws Mail הינו תוכנה חופשית המשוחרר תחת הרשיון GPL. אם ברצונך לתרום לפרויקט "
-"Claws Mail באפשרותך לעשות כן בכתובת:\n"
+"‏Claws Mail הינו תוכנה חופשית המשוחרר תחת הרשיון GPL. אם ברצונך לתרום "
+"לפרויקט Claws Mail באפשרותך לעשות כן בכתובת:\n"
 
 #: src/gtk/about.c:158
 msgid ""
@@ -4017,7 +4017,7 @@ msgstr ""
 "מקומיות: %s (מערך תווים: %s)\n"
 "מערכת הפעלה: לא ידועה"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "‪נבחרת ‫Claws Mail"
 
@@ -4454,8 +4454,7 @@ msgid "To"
 msgstr "‎לכבוד"
 
 #: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164
-#: src/quote_fmt.c:58
+#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "‎עותק‎"
 
@@ -4927,8 +4926,7 @@ msgstr "קלט סיסמה עבור %s:"
 msgid "Input password:"
 msgstr "קלט סיסמה:"
 
-#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271 src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "קלט סיסמה"
 
@@ -5013,9 +5011,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "תוספים"
 
@@ -5052,14 +5050,14 @@ msgstr "תוספים מוטענים"
 msgid "Page Index"
 msgstr "מפתח עמוד"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "הס_תר"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5503,234 +5501,194 @@ msgid "Load Image"
 msgstr "טעינת תמונה"
 
 # שבור
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "חיבור IMAP4 רצוץ\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "שגיאת IMAP אצל %s:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr " מאומת\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr " לא מאומת\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr " מצב רע\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr " שגיאת זרם\n"
 
-#: src/imap.c:634
+#: src/imap.c:633
 #, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr "שגיאת IMAP אצל %s: שגיאת ניתוח (קרוב לוודאי אי תאימות RFC מתוך השרת)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr " חיבור סורב\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr " שגיאת זיכרון\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr " שגיאה פטאלית\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr " שגיאת פרוטוקול (קרוב לוודאי אי תאימות RFC מתוך השרת)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr " חיבור לא קביל\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " שגיאת APPEND\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " שגיאת NOOP\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " שגיאת LOGOUT\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " שגיאת CAPABILITY\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " שגיאת CHECK\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " שגיאת CLOSE\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " שגיאת EXPUNGE\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " שגיאת COPY\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " שגיאת UID COPY\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " שגיאת CREATE\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " שגיאת DELETE\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " שגיאת EXAMINE\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " שגיאת FETCH\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " שגיאת UID FETCH\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " שגיאת LIST\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " שגיאת LOGIN\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr " שגיאת LSUB\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " שגיאת RENAME\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " שגיאת SEARCH\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " שגיאת UID SEARCH\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " שגיאת SELECT\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " שגיאת STATUS\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " שגיאת STORE\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " שגיאת UID STORE\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " שגיאת SUBSCRIBE\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " שגיאת UNSUBSCRIBE\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " שגיאת STARTTLS\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " שגיאת INVAL\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " שגיאת EXTENSION\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " שגיאת SASL\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " שגיאת SSL\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr " שגיאה לא מוכרת [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5742,7 +5700,7 @@ msgstr ""
 "התחברויות CRAM-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף CRAM-MD5 "
 "SASL הינו מותקן."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5751,10 +5709,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"התחברויות DIGEST-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף DIGEST-"
-"MD5 SASL הינו מותקן."
+"התחברויות DIGEST-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף "
+"DIGEST-MD5 SASL הינו מותקן."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5766,50 +5724,37 @@ msgstr ""
 "התחברויות SCRAM-SHA-1 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף SCRAM "
 "SASL הינו מותקן."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"התחברויות CRAM-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף CRAM-MD5 "
-"SASL הינו מותקן."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "חיבור %s נכשל: התחברות סורבה.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "חיבור %s נכשל: התחברות סורבה.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "התחברות אל %s נכשלה"
 
 # מחדש חיבור כעת
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "חיבור IMAP4 אל %s התנתק. כעת מחדש חיבור...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לגשת לשרת IMAP."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "חיבור לא מאובטח"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5822,124 +5767,124 @@ msgstr ""
 "\n"
 "האם יש ברצונך להמשיך להתחבר לשרת זה? ההתקשרות לא תהא מאובטחת."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "ה_משך התחברות"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "חשבון '%s': כעת מתחבר לשרת IMAP4: ‏%s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "אין אפשרות לקשר לשרת IMAP4: ‏%s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "אין אפשרות לקשר לשרת IMAP4: ‏%s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "אין אפשרות להתחיל סשן TLS.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "לא היתה אפשרות להתחבר לשרת IMAP ‏%s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "לא היתה אפשרות להתחבר לשרת IMAP ‏%s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "כעת מוסיף הודעות..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "כעת מעתיק הודעות..."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "אין אפשרות לקבוע דגלים של מחיקה\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "אין אפשרות להסיר באופן מוחלט\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "כעת מחפש עבור תיקיות לא רשומות אצל %s..."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "כעת מחפש עבור תיקיות משנה של %s..."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "אין אפשרות ליצור תיבת דואר: LIST נכשל\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "אין אפשרות ליצור תיבת דואר\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "אין אפשרות לשנות תיבת דואר: %s אל %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "אין אפשרות למחוק תיבת דואר\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST נכשל\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "כעת מדגל הודעות..."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "אין אפשרות לבחור תיקייה: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "שרת מצריך TLS כדי להתחבר.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "אין אפשרות לרענן יכולות.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr "חיבור אל %s נכשל: שרת מצריך TLS, אך Claws Mail הודר בלי תמיכת TLS.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "התחברויות שרת הינן מנוטרלות.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "כעת מושך הודעה..."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "אין אפשרות לקבוע דגלים של מחיקה: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5990,7 +5935,7 @@ msgstr "ה_רשמות"
 msgid "_Subscribe..."
 msgstr "_הירשם..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "_בטל הרשמה..."
 
@@ -6027,20 +5972,20 @@ msgstr "הורש מאפיינים מתוך תיקיית הורה"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "הזן שם חדש עבור '%s':"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "שנה שם תיקייה"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6062,7 +6007,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "אין אפשרות להסיר את התיקייה '%s'."
@@ -6090,7 +6035,7 @@ msgstr "_חפש"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "בחר תיקיית משנה של %s להירשם אל: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "הרשמה"
 
@@ -6317,57 +6262,57 @@ msgstr "בחירת קובץ Pine"
 msgid "Import Pine file into Address Book"
 msgstr "ייבוא קובץ Pine לתוך פנקס כתובות"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת להשיג דואר."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "‏%s נכשלה\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "מאחזר כעת הודעות חדשות"
 
-#: src/inc.c:479
+#: src/inc.c:478
 #, fuzzy
 msgid "Standby"
 msgstr "כוננות"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "בוטלה"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "אחזור"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "סיים (הודעה %d ‏(%s) התקבלה)"
 msgstr[1] "סיים (%d הודעות (%s) התקבלו)"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "סוים (אין הודעות חדשות)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "חיבור נכשל"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "אימות נכשל"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "נעולה"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "פקיעת זמן"
 
@@ -6403,7 +6348,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "אין אפשרות להתחבר לשרת POP3: ‏%s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "כעת מאמת..."
 
@@ -6428,7 +6373,7 @@ msgstr "כעת משיג את המספר של הודעות חדשות (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "כעת משיג את הגודל הודעות (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "כעת יוצא"
 
@@ -6480,7 +6425,7 @@ msgstr "שגיאת Socket."
 msgid "Socket error on connection to %s:%d."
 msgstr "שגיאת Socket בעת התחברות אל %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "חיבור נסגר על ידי מארח מרוחק."
 
@@ -6502,11 +6447,11 @@ msgstr ""
 "תיבת דואר הינה נעולה:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "אימות נכשל."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6516,7 +6461,7 @@ msgstr ""
 "%s"
 
 # הינך עשוי להשיב
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6854,832 +6799,827 @@ msgstr "‏NetworkManager: רשת תקשורת הינה מקוונות.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "‏NetworkManager: רשת תקשורת אינה מקוונות.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_קובץ"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "_תצוגה"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "ת_צורה"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "_הוסף תיבת דואר"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "‏MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "שנה סדר תיבת דואר..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "י_בא קובץ mbox..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "יצ_א לקובץ mbox..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "יצא ה_נבחרות לקובץ mbox..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "רוקן כל תיקיות _אשפה"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_שמור דוא״ל בשם..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_שמור אזור בשם..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "מבנה עמוד..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "_הדפס..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "סנכרן תיקיות"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "י_ציאה"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "בחר _שרשור"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_חפש בתוך הודעה נוכחית..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_חיפוש מהיר"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "הצג או ה_סתר"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "_סרגל כלים"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "הגדר _טורים מוצגים"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "בתוך רשימת _תיקייה..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "בתוך רשימת _הודעה..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "מ_ערך ממשק"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_מיון"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "מ_שוך לפי נושא"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "ה_רחב את כל השרשורים"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "_צמצם את כל השרשורים"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_עבור אל"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "הודעה _קודמת"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "הודעה ה_באה"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "הודעה קו_דמת שלא נקראה"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "הודעה הב_אה שלא נקראה"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "הודעה _חדשה קודמת"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "הודעה ח_דשה הבאה"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "הודעה _מסומנת קודמת"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "הודעה מ_סומנת הבאה"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "הודעה מסוו_גת קודמת"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "הודעה מסווג_ת הבאה"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "הודעה פתוחה קודמת"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "הודעה פתוחה הבאה"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "הודעת הורה"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "_תיקייה הבאה שלא נקראה"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "תיקייה _אחרת..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "חלק הבא"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "חלק קודם"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "גלילת הודעה"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "שורה קודמת"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "שורה הבאה"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "עמוד קודם"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "עמוד הבא"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "פענוח קוד"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "פתח בחלון _חדש"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "מ_קור הודעה"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "אזור הודעה"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "הצג בתור טקסט"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "פתח"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "פתח בעזרת..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "ציטטות"
 
 # סיכום
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "_עדכן תמצית"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "ק_בלה"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "השג מתוך חשבון _נוכחי"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "השג מתוך _כל החשבונות"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "_בטל קבלה"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "_שלח הודעות בהמתנה"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "הלחן _הודעת דוא״ל"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "הלחן הודעת חדשות"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "ה_שב"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "השב _אל"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_רשימת דיוור"
 
 # המשך-אל ומענה אל
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "המשך-אל ומענה עבור"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_קדם"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "קדם בתור _תצריף"
 
 # הפנה מחדש
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "ה_כוון מחדש"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "רשימת-_דיוור"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "פרסום הודעה"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "עזרה"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "ביטול הרשמה"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "עיון בארכיון"
 
 # יצירת מגע עם בעלים
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "התקשרות עם בעלים"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "ה_עבר..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "הע_תק..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "העבר ל_אשפה"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "_מחק..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "העבר שרשור לאש_פה"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "_מחק שרשור"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "ביטול הודעת חדשות"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_סמן"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_בטל סימון"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "סמן בתור לא _נקראה"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "סמן בתור נקר_אה"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "סמן את כולן ככאלה שנקראו"
 
 # נכר פתיל דיון
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "שרשור מנוכר"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "שרשור לא מנוכר"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "שרשור מפוקח"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "שרשור לא מפוקח"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "סמן בתור _ספאם"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "סמן בתור _לגיטימית"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "נעולה"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "לא נעולה"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "צבע _תווית"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "_תגיות"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "עריכה-_מחודשת"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "בידוק חתימה"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "הוסף ממען לפנקס _כתובות"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "_אסוף כתובות"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "מתוך _תיקייה נוכחית..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "מתוך _הודעות נוכחיות..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "_סנן את כל ההודעות בתיקייה"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "סנן הודעות _נבחרות"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "הרץ כללי _עיבוד תיקייה"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "_צור כלל סינון"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_אוטומטית"
 
 # מאת
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "לפי _From"
 
 # לכבוד
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "לפי _To"
 
 # נושא
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "לפי _Subject"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "צור כלל עיבוד"
 
 # מנה מסדר
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "ספור כתובות _URL..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "ב_דוק עבור הודעות חדשות בכל התיקיות"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "מחק הודעות כ_פולות"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "בתיקייה נוכחית"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "בכל התיקיות"
 
 # הר_ץ
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "_בצע"
 
 # הסרה מוחלטת גמורה
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "הסר באופן מוחל_ט"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "תעודות _SSL"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "ר_שומות סינון"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "_רשומות רשת תקשורת"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "_שכח את כל סיסמאות הסשן"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "_שכח את כל סיסמאות הסשן"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "_שנה חשבון נוכחי"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "_העדפות עבור חשבון נוכחי..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "צור חשבון _חדש..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "_ערוך חשבונות..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "הע_דפות..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "_טרום-עיבוד..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "עו_בר-עיבוד..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_סינון..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "ת_בניות..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_פעולות..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "ת_גיות..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "_תוספים..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_מדריך"
 
 # שנתרם ע״י משתמשים
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "_שו״ת מקוונות (קהילתי)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "_מקרא סמלים"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "הגדר בתור לקוח ברירת מחדל"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "מצב _לא־מקוון"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "שורת _תפריט"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "תצוגת _הודעה"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "שורת _מצב"
 
 # Column bar
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "טור תקורות"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "תצוגת ש_רשור"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "הסתר שרשורים שנקראו"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "_הסתר הודעות שנקראו"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "הסתר הודעות שנמחקו"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "_מסך מלא"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "הצג את כל ה_תקורות"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "_צמצם הכל"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "צמצם מן רמה _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "צמצם מן רמה _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "טקסט תחת _סמלים"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "טקסט ל_צד סמלים"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "_סמלים בלבד"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "_טקסט בלבד"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_סטנדרטי"
 
 # שלוש עמודות
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_שלושה טורים"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "_הודעה רחבה"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "רשימת הודעות _רחבה"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "מסך _קטן"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "לפי מ_ספר"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "לפי _גודל"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "לפי _תאריך"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "לפי תאריך שרשור"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "לפי _נושא"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "לפי _צבע תווית"
 
 # BUG: underline is missing
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "לפי תגית"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "לפי סימו_ן"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "לפי מצ_ב"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "לפי תצ_ריף"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "לפי ניקוד"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "לפי נעולה"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "_אל תמיין"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "סדר עולה"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "סדר יורד"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_איתור אוטומטי"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "החל תגיות..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "אירעו שגיאות מסוימות. הקלק כאן לצפייה ביומן."
 
 # הקלקה על הסמל תובילך למצב לא מקוון
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "מצב מקוון. הקלק על הסמל כדי לעבור למצב לא־מקוון"
 
 # הקלקה על הסמל תובילך למצב מקוון
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "מצב לא־מקוון. הקלק על הסמל כדי לעבור למצב מקוון"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "בחירת חשבון"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "יומן רשת תקשורת"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "יומן דיבאג סינון/עיבוד"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "יומן סינון מאופשר\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "יומן סינון מנוטרל\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "ללא כותרת"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "כלום"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "מחיקת כל ההודעות בתיקיות אשפה?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "אל תצא"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "הוספת תיבת דואר"
 
 # מצוינת
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7689,18 +7629,18 @@ msgstr ""
 "כאשר תיבת דואר קיימת תצוין, זו\n"
 "תיסרק באופן אוטומטי."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "תיבת הדואר '%s' כבר קיימת."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "תיבת דואר"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7710,76 +7650,76 @@ msgstr ""
 "ייתכן כי קבצים מסוימים כבר קיימים, או שלא עומדת לרשותך ההרשאה לכתוב כאם."
 
 # לא מותר לפרסם
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "פרסום לא מותר"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "ייבוא mbox נכשל."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "ייצוא אל mbox נכשל."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "יציאה"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "באם ברצונך לצאת מתוך Claws Mail?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "סנכרון תיקייה"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "האם ברצונך לסנכרן את תיקיותייך כעת?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_סנכרן"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "כעת מוחק הודעות כפולות..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "נמחקה הודעה כפולה %d בתיקייה %d.\n"
 msgstr[1] "נמחקו %d הודעות כפולות בתיקייה %d.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "כללי עיבוד להחלה לפני כללי תיקייה"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "כללי עיבוד להחלה עובר כללי תיקייה"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "תצורת סינון"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "אין אפשרות להירשם בתור לקוח ברירת מחדל: בלתי אפשרי להשיג נתיב נתון ליישום."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "‏Claws Mail נרשם בתור לקוח ברירת מחדל."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr "אין אפשרות להירשם בתור לקוח ברירת מחדל: בלתי אפשרי לרשום אל registry."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7860,7 +7800,7 @@ msgstr "כתיבה על קובץ mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "קובץ זה כבר ישנו. האם ברצונך להחליפו?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "כתיבה על הכתוב"
@@ -7906,19 +7846,19 @@ msgstr "הודעה מוצתה עד סופה; האם להמשיך מן ההתחל
 msgid "Search finished"
 msgstr "חיפוש סוים"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "הלחן הודעה חדשה"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "‏Claws Mail - תצוגת הודעה"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<לא נמצא נתיב-חזרה>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7933,11 +7873,11 @@ msgstr ""
 "נתיב חזרה: %s\n"
 "מוטב שלא לשלוח אישור מסירה."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_אל תשלח"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7949,64 +7889,64 @@ msgstr ""
 "מוּענה אליך באופן רשמי.\n"
 "מוטב שלא לשלוח אישור מסירה."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "כעת מושך הודעה (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "לא היתה אפשרות לפענח צופן: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "הודעה לא תואמת תקן MIME. זו עשויה להצטייר באופן מוטעה."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "שמור בשם"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "להחליף קובץ קיים?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "לא היתה אפשרות לשמור את הקובץ '%s'."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "הצג %s נותרים."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "רק המגה בייט הראשון של טקסט הינו מוצג."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "קיבלת קבלת מסירה עבור הודעה זו : זו הוצגה על ידי הנמען."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "ביקשת קבלת מסירה בהודעה זו."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "הודעה זו מבקשת קבלת מסירה."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "שלח קבלה"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8014,7 +7954,7 @@ msgstr ""
 "הודעה זו אוחזרה באופן חלקי,\n"
 "ונמחקה מתוך השרת."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8023,15 +7963,15 @@ msgstr ""
 "הודעה זו אוחזרה באופן חלקי;\n"
 "זו כעת %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "סמן להורדה"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "סמן למחיקה"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8040,12 +7980,12 @@ msgstr ""
 "הודעה זו אוחזרה באופן חלקי;\n"
 "זו כעת %s ותורד בעתיד."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "אי סימון"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8055,12 +7995,12 @@ msgstr ""
 "זו כעת %s ותימחק בעתיד."
 
 # התראת קבלת מסירה
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "שלח אישור מסירה"
 
 # ההודעה נשלחה למספר חשבונות אשר מצויים ברשותך
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8070,19 +8010,19 @@ msgstr ""
 "הכתובת אשר אליה נשלחה הודעה זו מצויה בשימוש על ידי כמה מחשבונותיך.\n"
 "אנא בחר באיזה חשבון ברצונך להשתמש לצורך שליחת התראת אישור מסירה:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_שלח התראה"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "אין אפשרות להדפיס: ההודעה לא מכילה טקסט."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8090,7 +8030,7 @@ msgstr ""
 "\n"
 "  אין הודעות בתיקייה זו"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8098,7 +8038,7 @@ msgstr ""
 "\n"
 "  הודעה נמחקה"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8106,16 +8046,16 @@ msgstr ""
 "\n"
 "  הודעה נמחקה או הועברה לתיקייה אחרת"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "אירעה שגיאה במהלך למידה.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "כעת מעביר הודעות..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "כעת מוחק הודעות..."
 
@@ -8216,7 +8156,7 @@ msgid "Go back to email"
 msgstr "חזור לדוא״ל"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "לא היתה אפשרות לשמור אזור של הודעה מרובת חלקים: %s"
@@ -8296,78 +8236,78 @@ msgstr "גודל:"
 msgid "Description:"
 msgstr "תיאור:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "חיבור NNTP אל %s:%d התנתק.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "חשבון '%s': כעת מתחבר לשרת NNTP: ‏%s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "שגיאה בהתחברות אל %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr "‏Libetpan לא תומכת return code 480 ונכון לעכשיו אנחנו בוחרים להמשיך\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "קורא מצב נכשל, ממשיך בכל זאת\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "שגיאה ביצירת סשן עם %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "שגיאה באימות אל %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לגשת לשרת חדשות."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "לא היתה אפשרות לבחור קבוצה: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "לא היתה אפשרות להגדיר קבוצה: %s\n"
 
 # פריטים
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "טווח מאמרים שגוי: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "לא היתה אפשרות להשיג xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "כעת משיג xover ‏%d - %d בתוך %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "לא היתה אפשרות להשיג xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "שורת xover שגויה\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9178,8 +9118,8 @@ msgid ""
 msgstr ""
 "התוסף Bogofilter לא יכל לסנן הודעה. הגורם המסתבר של השגיאה הוא שזה לא למד "
 "מאף דואר.\n"
-"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור לגיטימית"
-"\" בכדי לאמן את Bogofilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
+"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור "
+"לגיטימית\" בכדי לאמן את Bogofilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
 
 #: src/plugins/bogofilter/bogofilter.c:619
 #, c-format
@@ -9398,8 +9338,8 @@ msgid ""
 msgstr ""
 "התוסף Bsfilter לא יכל לסנן הודעה. הגורם המסתבר של השגיאה הוא שזה לא למד מאף "
 "דואר.\n"
-"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור לגיטימית"
-"\" בכדי לאמן את Bsfilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
+"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור "
+"לגיטימית\" בכדי לאמן את Bsfilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
 
 #: src/plugins/bsfilter/bsfilter.c:400
 #, c-format
@@ -9836,7 +9776,7 @@ msgstr "‏CSS בקובץ זה יוחל לכל חלקי HTML"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "   _עיון   "
@@ -9845,104 +9785,104 @@ msgstr "   _עיון   "
 msgid "Select stylesheet"
 msgstr "בחר גיליון סגנון"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "טעינת תוכן מרוחק הינה מנוטרלת."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "הטען תמונות"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "אפשר תוכן מרוחק"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "אפשר Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "אפשר תוספים"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "אפשר Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "פתח קישורים בדפדפן חיצוני"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "אירעה שגיאה: %d\n"
 
 # הזנה
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "‏%s הינו ערוץ פגום או שאינו נתמך"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "חפש ברשת"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "פתח בתוך צופה"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "פתח בתוך צופה (אפשר תוכן מרוחק)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "פתח בתוך דפדפן"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "פתח תמונה"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "העתק קישור"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "הורד קישור"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "שמור תמונה בשם"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "העתק תמונה"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "יבא ערוץ"
 
 # מגונדר
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "מהודר"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "‏Fancy צופה HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
-"By default all remote content is blocked. Options can be found in /"
-"Configuration/Preferences/Plugins/Fancy"
+"By default all remote content is blocked. Options can be found in "
+"/Configuration/Preferences/Plugins/Fancy"
 msgstr ""
 "תוסף זה מצייר דואר HTML באמצעות הספרייה WebKit %d.%d.%d library.\n"
-"באופן רגיל כל תוכן מרוחק הינו חסום. ניתן למצוא אפשרויות "
-"בתוך /תצורה/העדפות/תוספים/Fancy"
+"באופן רגיל כל תוכן מרוחק הינו חסום. ניתן למצוא אפשרויות בתוך "
+"/תצורה/העדפות/תוספים/Fancy"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:200
@@ -10025,11 +9965,11 @@ msgid ""
 msgstr ""
 "מוסיף את התקורה X-FETCH-TIME עם התאריך ושעה של אחזור הודעה בפורמט RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "תוסף GData: נדרשת הרשאה"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10046,30 +9986,30 @@ msgstr ""
 "תקבל קוד הרשאה. הזן את הקוד בשדה מטה כדי להעניק עבור Claws Mail גישה לרשימת "
 "אנשי קשר Google שלך."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "צעד 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr "לחץ כאן כדי לפתוח עמוד אימות Google בתוך דפדפן"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "צעד 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "הזן קוד:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "תוסף GData: שגיאה בתחקור עבור אנשי קשר: %s\n"
 
 # improve
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10077,73 +10017,73 @@ msgstr[0] "הוסף %d של"
 msgstr[1] "הוספו %d של"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "איש קשר 1 למטמון"
 msgstr[1] "%d אנשי קשר למטמון"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "תוסף GData: מתחיל כעת שאילתת איש קשר async\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "תוסף GData: שגיאה בתחקור עבור קבוצות: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "תוסף GData: קבוצות התקבלו\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "תוסף GData: מתחיל כעת שאילתת קבוצות async\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "תוסף GData: שגיאת הרשאה: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "תוסף GData: הרשאה צלחה\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "תוסף GData: כעת מתחיל הרשאה הדדית\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "תוסף GData: התקבל קוד הרשאה, כעת מבקש אישור\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "תוסף GData: שגיאה רענון הרשאה: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "תוסף GData: רענון הרשאה צלח\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "תוסף GData: כעת מנסה לרענן הרשאה\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "אימות"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "שם משתמש:"
 
@@ -10188,7 +10128,7 @@ msgstr ""
 "משוב לכבוד <berndth at gmx.de> מקודם בברכה."
 
 # אינטגרציית GeoLocation
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "שילוב GData"
 
@@ -10410,7 +10350,7 @@ msgstr "פקיעת זמן בקשה"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "שניות"
@@ -10696,28 +10636,28 @@ msgid "Specify authentication"
 msgstr "ציין אימות"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "מזהה משתמש"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "סיסמה"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "שיטת אימות"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "אוטומטית"
 
@@ -11587,8 +11527,8 @@ msgid ""
 "This plugin handles PGP core operations and provides address autocompletion "
 "from the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
 "\n"
-"Options can be found in /Configuration/Preferences/Plugins/GPG and /"
-"Configuration/[Account Preferences]/Plugins/GPG\n"
+"Options can be found in /Configuration/Preferences/Plugins/GPG and "
+"/Configuration/[Account Preferences]/Plugins/GPG\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
@@ -11791,156 +11731,161 @@ msgstr "החתימה לא נבדקה."
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "‏PGP Core: אין אפשרות להשיג מפתח - אין סוכן gpg-agent שמורץ כעת."
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "החתימה לא ניתנת לבדיקה - %s."
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "חתימה טובה מאת \"%s\" [סוםית]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "חתימה טובה מאת \"%s\" [מלאה]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "חתימה טובה מאת \"%s\" [שולית]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "חתימה טובה מאת \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "מפתח 0x%s לא זמין כדי לאמת את חתימה זו"
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "חתימה פקועה מאת \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "חתימה טובה מאת %s, אך המפתח פקע"
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "חתימה טובה מאת %s, אך המפתח נשלל"
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "חתימה רעה מאת \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "מפתח 0x%s לא זמין כדי לאמת את חתימה זו"
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "החתימה לא נבדקה"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "שגיאה בבדיקת חתימה: אין מצב\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "שגיאה בבדיקת חתימה: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "חתימה נוצרה ביום %s באמצעות %s מזהה מפתח %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "חתימה טובה מאת מזהה משתמש (uid) ‏\"%s\" (תקפות: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "מפתח מזהה משתמש (uid) פקוע \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "חתימה פקועה מאת מזהה משתמש (uid) ‏\"%s\" (תקפות: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "מפתח מזהה משתמש (uid) פסול \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "חתימה רעה מאת \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "‏uid ‏\"%s\" (תקפות: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "פסולה"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, fuzzy, c-format
 msgid "Owner Trust: %s\n"
 msgstr "נאמנות בעלים: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "אין מפתח!"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "טביעת אצבע של מפתח עיקרי:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "אזהרה: כתובת חותם \"%s\" לא תואמת רשומת DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "כתובת חותם מאומת הינה \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "לא היתה אפשרות לקבל מידע מתוך הודעה, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "לא היתה אפשרות לאתחל נתונים, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "מפרט מפתח סודי הינו מעורפל"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "מפתח סודי לא נמצא (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "שגיאה בהגדרת מפתח סודי: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "פרוטוקול Gpgme ‏'%s' אינו שמיש: מנוע '%s' אינו מותקן כיאות."
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -11949,12 +11894,12 @@ msgstr ""
 "פרוטוקול Gpgme ‏'%s' אינו שמיש: מנוע '%s' גרסא %s אכן מותקן, אולם גרסא %s "
 "נדרשת.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "פרוטוקול Gpgme ‏'%s' אינו שמיש (בעיה לא מוכרת)"
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11962,7 +11907,7 @@ msgstr ""
 "‏GnuPG אינו מותקן כיאות, או שזה צריך שדרוג.\n"
 "תמיכת OpenPGP מנוטרלת."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -11970,11 +11915,11 @@ msgstr ""
 "עליך לשמור מידע חשבון בעזרת \"אישור\" לפני שתעמוד לרשותך אפשרות להלחין "
 "מפתח.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "לא נמצא מפתח PGP"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -11984,12 +11929,12 @@ msgstr ""
 "דואר או לקבל הודעות דואר מוצפנות.\n"
 "האם ברצונך ליצור כעת צמד מפתחות חדש?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "לא היתה אפשרות לחולל צמד מפתחות חדש: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -11997,11 +11942,11 @@ msgstr ""
 "כעת מחולל את צמד המפתחות החדש שלך... אנא הזז את העכבר סביב כדי לסייע לחולל "
 "אנטרופיה..."
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "לא היתה אפשרות לחולל צמד מפתחות חדש: שגיאה לא מוכרת"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12014,19 +11959,19 @@ msgstr ""
 "\n"
 "האם ברצונך לייצאו לשרת מפתחות?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "מפתח התחולל"
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "מפתח יוצא."
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "לא היתה אפשרות לייצא מפתח."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "ייצוא מפתח אינו מיושם תחת Windows."
 
@@ -12204,8 +12149,8 @@ msgstr "חתימה דיגיטאלית OpenPGP"
 
 #: src/plugins/pgpmime/pgpmime.c:618
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the PGP/"
-"Mime system."
+"Please note that email headers, like Subject, are not encrypted by the "
+"PGP/Mime system."
 msgstr ""
 "לצומת לבך: תקורות של דוא״ל, כגון נושא, אינן מוצפנות על ידי המערכת PGP/Mime."
 
@@ -12241,8 +12186,7 @@ msgstr ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/python/python_plugin.c:358
-#: src/plugins/python/python_plugin.c:502
+#: src/plugins/python/python_plugin.c:358 src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "תסריטי Python"
 
@@ -12255,14 +12199,13 @@ msgstr "הצג מסוף Python..."
 msgid "Refresh"
 msgstr "רענן"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "   עיין   "
 
-#: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:735
+#: src/plugins/python/python_plugin.c:651 src/plugins/python/python_plugin.c:735
 msgid "Python"
 msgstr "Python"
 
@@ -12281,8 +12224,8 @@ msgid ""
 "put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
-"You can provide scripts working on the main window by placing files into ~/."
-"claws-mail/python-scripts/main.\n"
+"You can provide scripts working on the main window by placing files into "
+"~/.claws-mail/python-scripts/main.\n"
 "\n"
 "You can also provide scripts working on an open compose window by placing "
 "files into ~/.claws-mail/python-scripts/compose.\n"
@@ -12520,7 +12463,7 @@ msgstr ""
 "אפשר זאת כדי לשמר שם תיקייה, אפילו כאשר מחבר ערוץ משנה את הכותרת של הערוץ."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "אמת תוקף תעודת SSL"
 
@@ -12677,17 +12620,17 @@ msgid "Updating comments for '%s'..."
 msgstr "כעת מעדכן תגובות עבור '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (נדרשת הרשאה)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (לא מורשה)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (לא נמצא)"
 
@@ -12812,26 +12755,26 @@ msgstr "לא היתה אפשרות לסגור קובץ זמני"
 
 #: src/plugins/smime/smime.c:710
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the S/"
-"MIME system."
+"Please note that email headers, like Subject, are not encrypted by the "
+"S/MIME system."
 msgstr ""
 "לצומת לבך: תקורות של דוא״ל, כגון נושא, אינן מוצפנות על ידי המערכת S/MIME."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "כעת מדווח על ספאם..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "כעת מדווח ספאם באופן מקוון..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "‏SpamReport"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12847,19 +12790,19 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "דיווח ספאם"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "אפשר"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "קדם אל:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "סיסמה:"
 
@@ -13155,7 +13098,7 @@ msgid "Next month"
 msgstr "חודש בא"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "‏vCalendar"
 
@@ -13188,7 +13131,7 @@ msgstr ""
 "באפשרותך יהיה ניתן גם להירשם לערוצי webCal,לייצא את המפגשים שלך וגם לוח שנה, "
 "לפרסם מידע חופשי/עסוק ולאחזר את מידע זה מאחרים."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "לוח שנה"
 
@@ -13373,63 +13316,63 @@ msgstr "נוכחים:"
 msgid "Action:"
 msgstr "פעולה:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "מפגש _חדש..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "י_צא לוח שנה..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_הירשם אל webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "_שנה שם..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "_עדכן הרשמות"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "תצוגת _רשימה"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "תצוגת _שבוע"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "תצוגת _חודש"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "מפגשים"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "בעבר"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "היום"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "מחר"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "שבוע זה"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "מאוחר יותר"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13438,17 +13381,17 @@ msgstr ""
 "\n"
 "אלו האירועים שמתוכננים %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "פקיעת זמן (%d שניות) בעת התחברות אל %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "שגיאה %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13461,7 +13404,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13474,7 +13417,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13485,7 +13428,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13496,42 +13439,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "לא היתה אפשרות ליצור מדור %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לעדכן ערוץ Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "כעת מושך לוח שנה עבור %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "הרשמה חדשה"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לעדכן את ההרשמה."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "הרשמה אל WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "הזן כתובת WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "לא היתה אפשרות לנתח כתובת URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "האם אתה בטוח כי ברצונך לבטל הרשמה?"
 
@@ -13905,82 +13848,81 @@ msgstr "לא היתה אפשרות לייצא את המידע חופשי/עסו
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "לא היתה אפשרות לייצא חופשי/עסוק אל '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "תזכורות"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "התרע אותי"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "דקות לפני אירוע"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "ייצוא לוח שנה"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "יצא לוח שנה אוטומטית אל"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335 src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "באפשרותך לייצא לקובץ מקומי או כתובת URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "ציין קובץ מקומי או כתובת URL ‏(http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "כלול הרשמות webcal בתוך ייצוא"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "פקודה להרצה עובר ייצוא לוח שנה"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "רשום את לוח שנה Claws בתוך שעון  Orage של XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "מעניקה היתר עבור Orage (גרסא שהינה מעל 4.4) לראות את לוח שנה Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "יצא בתור שרת לוח שנה GNOME shell"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "מידע חופשי/עסוק"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "יצא אוטומטית מצב חופשי/עסוק אל"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "ציין קובץ מקומי או כתובת URL ‏(http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "פקודה להרצה עובר ייצוא מצב חופשי/עסוק"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "השג מצב חופשי/עסוק של אחרים מתוך"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -13989,7 +13931,7 @@ msgstr ""
 "ציין קובץ מקומי או כתובת URL ‏(http://server/path/file.ifb).\n"
 "‏‎%u עבור החלק השמאלי של כתובת הדוא״ל, ‎%d עבור המתחם"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "אפשרויות SSL"
 
@@ -14044,12 +13986,12 @@ msgstr "אירעה שגיאה בסשן POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "פקודת TOP לא נתמכת\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14057,7 +13999,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "חדשות (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "קובץ mbox מקומי"
 
@@ -14086,11 +14028,11 @@ msgid "Mail address"
 msgstr "כתובות דואר"
 
 # אוטומטית
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "תצורה-עצמית"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -14181,7 +14123,7 @@ msgstr ""
 "הודעות מעל לגודל זה יאוחזרו באופן חלקי. בעת בחירה תעמוד לך האפשרות להורידן "
 "במלואן או למוחקן."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14194,72 +14136,67 @@ msgstr "מספר מרבי של מאמרים להורדה"
 msgid "unlimited if 0 is specified"
 msgstr "בלי הגבלה אם 0 מצוין"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "מצא טקסט:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "מדור שרת IMAP"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(לרוב ריק)"
 
 # מורשמות
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "הצג תיקיות רשומות בלבד"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "מצב רוחב-פס-תועלתי (מונע אחזור של תגיות מרוחקות)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "מצב זה משתמש בפחות רוחב פס, אך עשוי להיות אטי יותר עם שרתים מסוימים."
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "סנן הודעות בעת קבלה"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "התר סינון באמצעות תוספים בעת קבלה"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'השג דואר' בודקת עבור הודעות חדשות בחשבון זה"
 
 # כותר
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "תקורה"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "הלחן Message-ID"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "שלח כתובת דואר של חשבון בתוך Message-ID"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "הוסף תקורת סוכן משתמש"
 
 # שמוגדרת לפי משתמש
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "הוסף תקורה מוגדרת-משתמש"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "אימות SMTP ‏(SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14267,304 +14204,305 @@ msgstr ""
 "כאשר ערכים אלו יישארו ריקים, ייעשה שימוש באותו מזהה משתמש ובאותה סיסמה אשר "
 "משמשים לצורך קבלה."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "אמת עם POP3 טרם שליחה"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "פקיעת זמן אימות POP: "
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "דקות"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "חתימה"
 
 # שיבוץ חתימה אוטומטי
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "שבץ חתימה אוטומטית"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "מפריד חתימה"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "פלט פקודה"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "הגדר אוטומטית את הכתובות הבאות"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "מילונים לבדיקת איות"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "מילון שגרתי"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "מילון חלופי שגרתי"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "הלחן"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "השב"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "קדם"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "מערכת פרטיות שגרתית"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "תמיד חתום הודעות"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "תמיד הצפן הודעות"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "תמיד חתום הודעות בעת מענה להודעה חתומה"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "תמיד הצפן הודעות בעת מענה להודעה מוצפנת"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "הצפן הודעות נשלחות עם המפתח העצמי שלך בנוסף לזה של נמען"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "שמור הודעות מוצפנות אשר נשלחו בתור טקסט גלוי"
 
 # לא לעשות שימוש בהצפנת
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "אל תשתמש בהצפנת SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור POP3"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "השתמש בפקודת STARTTLS כדי להתחיל סשן SSL"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור IMAP4"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור NNTP"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "שליחה (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "אל תשתמש בהצפנת SSL (אולם, במידת וקיים הצורך, תתעל את STARTTLS)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור SMTP"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "תעודות לקוח"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "תעודה עבור קבלה"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "קובץ תעודת לקוח כקובץ PKCS12 או PEM"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "תעודה עבור שליחה"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "קבל אוטומטית תעודות SSL תקינות"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "נצל SSL שאינו חוסם (non-blocking)"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "כבה את העדפה זו אם קיימות אצלך בעיות התחברות אשר קשורות אל SSL"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "פורט SMTP"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "פורט POP3"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "פורט IMAP4"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "פורט NNTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "שם מתחם"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr "שם המתחם ינוצל בתוך Message-ID המולחנת, ובעת התקשרות עם שרתי SMTP."
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "השתמש בפקודה לתקשור עם שרת"
 
 # מוסר
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "העבר דואר מחוק לאשפה והסירו לחלוטין לאלתר"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
-msgstr "העבר דואר מחוק לאשפה במקום לעשות שימוש בדגל ‪\\Deleted‬ ללא הסרה מוחלטת."
+msgstr ""
+"העבר דואר מחוק לאשפה במקום לעשות שימוש בדגל ‪\\Deleted‬ ללא הסרה מוחלטת."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "סמן הודעות פרסום-צולב ככאלה שנקראו וצבע:"
 
 # השמת
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "השם הודעות שנשלחו בתוך"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "השם הודעות בהמתנה בתוך"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "השם הודעות טיוטה בתוך"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "השם הודעות מחוקות בתוך"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "שם חשבון אינו מוזן."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "כתובת דואר אינה מוזנת."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "שרת SMTP אינו מוזן."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "מזהה משתמש לא מוזן."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "שרתPOP3 אינו מוזן."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "תיקיית דואר נכנס שגרתית לא קיימת."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "שרת IMAP4 אינו מוזן."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "שרת NNTP אינו מוזן."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "שם קובץ תיבת דואר מקומית אינו מוזן."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "פקודת דואר אינה מוזנת."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "קבלה"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "תבניות"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "פרטיות"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "העדפות עבור חשבון חדש"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "‏%s - העדפות חשבון"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "נכשל (כתובת שגויה)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "בחירת קובץ חתימה"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "בחירת קובץ תעודה"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "פרוטוקול:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (תוסף לא טעון)"
@@ -14811,8 +14749,7 @@ msgstr ""
 "תכונת הפעולות הינה דרך עבור המשתמש לשגר פקודות חיצוניות כדי לעבד קובץ הודעה "
 "שלמה או רק חלק אחד מאזוריה."
 
-#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695
-#: src/prefs_template.c:1121
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695 src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "כ_פילות"
 
@@ -14836,12 +14773,13 @@ msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "ביום %d\\nנכתב על ידי %f כדלקמן:\\n\\n%q\\n%X"
 
 #: src/prefs_common.c:304 src/prefs_quote.c:85
+#, qt-format
 msgid ""
-"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
-"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
+"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: "
+"%t\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
-"\\n\\nמתחיל הודעה מקודמת:\\n\\n?d{תאריך: %d\\n}?f{מאת: %f\\n}?t{אל: %t\\n}?"
-"c{עותק: %c\\n}?n{קבוצות דיונים: %n\\n}?s{נושא: %s\\n}\\n\\n%M"
+"\\n\\nמתחיל הודעה מקודמת:\\n\\n?d{תאריך: %d\\n}?f{מאת: %f\\n}?t{אל: "
+"%t\\n}?c{עותק: %c\\n}?n{קבוצות דיונים: %n\\n}?s{נושא: %s\\n}\\n\\n%M"
 
 #: src/prefs_common.c:448
 msgid "%x(%a) %H:%M"
@@ -15073,8 +15011,7 @@ msgstr ""
 "אפשרות זו מתירה לחלקי MIME להיות מוצגים בתוך תצוגת הודעה מבעד לתסריט כאשר "
 "משתמשים בפריט התפריט ההקשרי 'הצג בתור טקסט'"
 
-#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:354
+#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138 src/prefs_message.c:354
 msgid "Message View"
 msgstr "תצוגת הודעה"
 
@@ -15143,8 +15080,7 @@ msgstr "הכוון מחדש"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
 #: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87
-#: src/summaryview.c:446
+#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87 src/summaryview.c:446
 msgid "Score"
 msgstr "ניקוד"
 
@@ -15229,8 +15165,7 @@ msgstr "שם תגית הינו ריק."
 msgid "No action was defined."
 msgstr "אף פעולה לא הוגדרה."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160
-#: src/quote_fmt.c:79
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160 src/quote_fmt.c:79
 msgid "literal %"
 msgstr "% מילולי"
 
@@ -15238,8 +15173,7 @@ msgstr "% מילולי"
 msgid "filename (should not be modified)"
 msgstr "שם קובץ (לא אמור להיות נתון לשינוי)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170
-#: src/quote_fmt.c:87
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170 src/quote_fmt.c:87
 msgid "new line"
 msgstr "שורה חדשה"
 
@@ -15289,8 +15223,7 @@ msgstr "רשימת פעולה נוכחית"
 msgid "Filtering/Processing configuration"
 msgstr "תצורת סינון/עיבוד"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
-#: src/prefs_filtering.c:981
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867 src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "כולם"
@@ -15610,7 +15543,7 @@ msgstr "תצוגה"
 msgid "Fonts"
 msgstr "גופנים"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -15753,7 +15686,7 @@ msgstr "הודעות שגיאה"
 msgid "Status messages for filtering/processing log"
 msgstr "הודעות מצב עבור יומן רשומות סינון/עיבוד"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "אחרות"
 
@@ -16118,8 +16051,8 @@ msgid ""
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"‏'Test' מתיר לך לבחון הודעה או אלמנט של הודעה באמצעות תכנית חיצונית או תסריט. "
-"התוכנית תחזיר 0 או 1.\n"
+"‏'Test' מתיר לך לבחון הודעה או אלמנט של הודעה באמצעות תכנית חיצונית או "
+"תסריט. התוכנית תחזיר 0 או 1.\n"
 "\n"
 "הסמלים הבאים ניתנים לשימוש:"
 
@@ -16390,15 +16323,15 @@ msgstr "קטוף צבע עבור תיקייה"
 msgid "Colors"
 msgstr "צבעים"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "בחירת קיצורי דרך מקלדת מוגדרים מראש"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "בחר קיצור מוגדר:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16406,37 +16339,37 @@ msgstr ""
 "באפשרותך גם להתאים כל קיצור דרך תפריט על ידי לחיצה\n"
 "על כל מקש(ים) בעת מיקוד סמן העכבר על הפריט."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "הוסף כתובת ליעד בלחיצה-כפולה"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "בעת יציאה"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "ודא בעת יציאה"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "רוקן אשפה בעת יציאה"
 
 # קיימות
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "הזהר אם יש הודעות בהמתנה"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "קיצורי דרך מקלדת"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "אפשר קיצורי דרך מקלדת מותאמים"
 
 # כאשר העדפה זו מסומנת
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16446,15 +16379,15 @@ msgstr ""
 "על ידי התמקדות על פירטי תפריט ולחיצה על צירוף מקשים.\n"
 "אל תסמן את אפשרות זו אם ברצונך לנעול את כל קיצורי דרך מקלדת הקיימים."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr " בחר קיצורי דרך מקלדת מוגדרים מראש... "
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "ניהול Metadata"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16462,31 +16395,31 @@ msgstr ""
 "מצב בטוח יותר שואל את מערכת ההפעלה לרשום מידע-מוצמד ישירות\n"
 "אל הכונן; זה נמנע מאיבוד מידע לאחר קריסות אך לוקח זמן מה."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "בטוח יותר"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "מהיר יותר"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "פקיעת זמן Socket I/O"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "שאל לפני ריקון אשפה"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "שאל אודות כללי סינון של חשבון מסוים בעת סינן ידני"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "השתמש במחיקת קובץ מאובטחת במידת האפשר"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16494,7 +16427,7 @@ msgstr ""
 "השתמש במחיקת קובץ מאובטחת במידת האפשר\n"
 "(התוכנית 'shred' אינה זמינה)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16502,32 +16435,11 @@ msgstr ""
 "השתמש בתוכנית 'shred' כדי להחליף קבצים עם נתונים אקראיים לפני מחיקתם. זה מאט "
 "מחיקה. היה בטוח לעיין בעמוד man shred לאזהרות."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "סנכרן תיקיות לא מקוונות בהקדם האפשרי"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "הזן סיסמה"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "הזן סיסמה"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "הזן סיסמה"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "שונות"
 
@@ -16786,8 +16698,8 @@ msgid ""
 msgstr "ציין קידוד-העברת-תוכן בשימוש כאשר גוף הודעה מכיל תווים שאינם ASCII"
 
 # שולח כעת
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "שליחה"
 
@@ -16917,8 +16829,7 @@ msgstr "השנה בתור מספר עשרוני"
 msgid "the time zone or name or abbreviation"
 msgstr "אזור הזמן או קיצור"
 
-#: src/prefs_summaries.c:192 src/prefs_summaries.c:240
-#: src/prefs_summaries.c:561
+#: src/prefs_summaries.c:192 src/prefs_summaries.c:240 src/prefs_summaries.c:561
 msgid "Date format"
 msgstr "פורמט תאריך"
 
@@ -17011,8 +16922,8 @@ msgstr "יישום מיידי בעת העברה או מחיקה של הודעו
 
 #: src/prefs_summaries.c:518
 msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/"
-"Execute'"
+"Defers moving, copying and deleting of messages until you choose "
+"'Tools/Execute'"
 msgstr "עיכוב העברה, העתקה ומחיקה של הודעות עד שתבחר 'כלים/בצע'"
 
 #: src/prefs_summaries.c:521
@@ -17519,36 +17430,36 @@ msgstr "אין מידע זמין"
 msgid "No recipient keys defined."
 msgstr "אין מפתחות נמען מוגדרים."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[שגיאה בפענוח BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "כבר מנסה לשלוח."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "לא היתה אפשרות לפתוח קובץ %s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "תקורת הודעה בהמתנה הינה רצוצה."
 
 # occur?
 # במשך
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "התרחשה שגיאה במהלך סשן SMTP."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr "לא נמצא חשבון מסוים לשליחה, והתרחשה שגיאה במהלך סשן SMTP."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17556,20 +17467,20 @@ msgstr ""
 "לא היתה אפשרות לקבוע מידע שליחה. ייתכן כי הדוא״ל לא התחולל באמצעות Claws "
 "Mail."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "לא היתה אפשרות ליצור קובץ זמני לשליחת חדשות."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "שגיאה בעת כתיבת קובץ זמני לשליחת חדשות."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "אירעה שגיאה במהלך פרסום ההודעה אצל %s."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "כעת מסנן הודעות...\n"
 
@@ -17731,7 +17642,8 @@ msgid ""
 "to insert"
 msgstr ""
 "שבץ קובץ:\n"
-"‏<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ לשיבוץ"
+"‏<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ "
+"לשיבוץ"
 
 # להשיג את הקלט
 #: src/quote_fmt.c:93
@@ -17762,7 +17674,8 @@ msgid ""
 "to attach"
 msgstr ""
 "ספח קובץ:\n"
-"<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ לסיפוח"
+"<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ "
+"לסיפוח"
 
 #: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -17865,89 +17778,89 @@ msgstr "הזן טקסט להחלפה '%s'"
 msgid "Enter variable"
 msgstr "הזן משתנה"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "שולח כעת הודעה באמצעות פקודה: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "לא היתה אפשרות לבצע פקודה: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "אירעה שגיאה במהלך ביצוע פקודה: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "מתחבר כעת"
 
 # מיישם מבצע
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "מקיים POP לפני SMTP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP לפני SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "חשבון '%s': כעת מתחבר לשרת SMTP: ‏%s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "דואר נשלח בהצלחה."
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "כעת שולח HELO..."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "מאמת כעת"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "כעת שולח הודעה..."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "כעת שולח EHLO..."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "כעת שולח MAIL FROM..."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "כעת שולח RCPT TO..."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "כעת שולח DATA..."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "כעת יוצא..."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "כעת שולח הודעה (%d / %d בתים)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "כעת שולח הודעה"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "אירעה שגיאה במהלך שליחת ההודעה."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18829,14 +18742,14 @@ msgstr "אנא בחר כתובת URL לפתיחה."
 msgid "Select All"
 msgstr "בחר הכל"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "ברוכים הבאים אל Claws Mail"
 
 # כעת ש
 # ובכן מש
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -18927,128 +18840,128 @@ msgstr ""
 "זאת בכתובת <%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "אנא הזן את שם תיבת הדואר."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "אנא הזן את שמך ואת כתובת הדוא״ל שלך."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "אנא הזן את השרת המקבל שלך ושם משתמש."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "אנא הזן את שם המשתמש שלך."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "אנא הזן שרת SMTP."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "אנא הזן שם משתמש SMTP."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "שמך:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "כתובות דוא״ל שלך:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "ארגונך:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "שם תיבת דואר:"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
-"You can also specify an absolute path, for example: \"/home/john/Documents/"
-"Mail\""
+"You can also specify an absolute path, for example: "
+"\"/home/john/Documents/Mail\""
 msgstr ""
 "באפשרותך גם לציין את הנתיב המוחלט, לדוגמא: \"/home/john/Documents/Mail\""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:25\""
+"You can specify the port number by appending it at the end: "
+"\"mail.example.com:25\""
 msgstr "באפשרותך לציין מספר פורט על ידי הוספתו בסוף: \"mail.example.com:25\""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "כתובת שרת SMTP:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "השתמש באימות"
 
 # בזה של
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(השאר ריק כדי להשתמש באותו מידע אשר משמש לצורך קבלה)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "שם משתמש SMTP:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "סיסמת SMTP:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "השתמש בהצפנת SSL להתחברות לשרת SMTP"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "SSL דרך STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "תעודת לקוח SSL (רשות)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "כתובת שרת:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "תיבת דואר מקומית:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "טיפוס שרת:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:110\""
+"You can specify the port number by appending it at the end: "
+"\"mail.example.com:110\""
 msgstr ""
 "באפשרותך לציין את מספר הפורט על ידי צירופו בקצה: \"mail.example.com:110\""
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "השתמש בהצפנת SSL כדי להתחבר לשרת קבלה"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "מדור שרת IMAP:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "הצג תיקיות רשומות בלבד"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19056,15 +18969,15 @@ msgstr ""
 "אזהרה: גרסא זו של Claws Mail\n"
 "נבנתה בלי תמיכת IMAP."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "אשף הבניית Claws Mail"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "ברוכים הבאים אל Claws Mail"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19077,31 +18990,31 @@ msgstr ""
 "אנחנו נתחיל בהגדרת מידע בסיסי אודותייך ואפשרויות דואר שהכי נפוצות עבורך כדי "
 "שתעמוד לרשותך האפשרות להתחיל את Claws Mail בתוך פחות מחמש דקות."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "אודותייך"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "על שדות בולטות להיות מושלמות"
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "קבלת דואר"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "שליחת דואר"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "שמירת דואר בכונן"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "תצורה הושלמה"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19109,9 +19022,6 @@ msgstr ""
 "‏Claws Mail הינו מוכן כעת.\n"
 "להתחלה, לחץ על שמור."
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "החתימה לא ניתנת לבדיקה - %s."
-
 #~ msgid "+_Insert"
 #~ msgstr "+_שבץ"
 
@@ -19198,8 +19108,8 @@ msgstr ""
 #~ msgstr "+_שמור"
 
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
+#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase "
+#~ "for:</span>\n"
 #~ "\n"
 #~ "%.*s\n"
 #~ msgstr ""
diff --git a/po/hu.po b/po/hu.po
index c6a42f3..fefa4f1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-15 02:49+0100\n"
 "PO-Revision-Date: 2015-12-19 03:33+0100\n"
 "Last-Translator: rezso <rezso at rezso.net>\n"
 "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.6\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -31,16 +31,16 @@ msgstr ""
 "Zárd be a szerkesztablakokat a fiókok módosítása előtt!"
 
 # src/folderview.c:1567 src/folderview.c:1814
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "A mappa nem hozható létre."
 
 # src/account.c:513
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Fiókok szerkesztése"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -51,41 +51,41 @@ msgstr ""
 "fiók neve vastag betűs."
 
 # src/account.c:620
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr "_Alapértelmezett fiókként beállít "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Fiókok távoli mappákkal nem másolhatók."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "%s másolata"
 
 # src/account.c:673
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Tényleg törölni kívánod a(z) '%s' fiókot?"
 
 # src/mainwindow.c:1044 src/mainwindow.c:1061
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Névtelen)"
 
 # src/account.c:672
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Fiók törlése"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "A 'Levelek fogadása' minden bejelölt fiókot ellenőriz"
 
@@ -94,8 +94,8 @@ msgstr "A 'Levelek fogadása' minden bejelölt fiókot ellenőriz"
 # src/editaddress.c:980 src/editbook.c:190 src/editgroup.c:254
 # src/editjpilot.c:295 src/editldap.c:298 src/editvcard.c:210
 # src/mimeview.c:150 src/prefs_folder_item.c:164 src/select-keys.c:299
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -109,12 +109,12 @@ msgid "Name"
 msgstr "Név"
 
 # src/account.c:552 src/prefs_account.c:803
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protokoll"
 
 # src/account.c:553
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Szerver"
 
@@ -172,10 +172,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -476,20 +476,20 @@ msgstr "_Címjegyzék"
 # src/addressbook.c:382 src/addressbook.c:392 src/compose.c:457
 # src/mainwindow.c:436
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
 # src/addressbook.c:356 src/compose.c:572 src/mainwindow.c:641
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "_Eszközök"
 
 # src/addressbook.c:358 src/compose.c:576 src/mainwindow.c:683
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Súgó"
 
@@ -540,14 +540,14 @@ msgstr "_Mentés"
 # src/addressbook.c:2432 src/addressbook.c:2538 src/addressbook.c:2544
 # src/inc.c:550 src/message_search.c:135 src/prefs_actions.c:1648
 # src/prefs_filter.c:198 src/summary_search.c:201
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Bezárás"
 
 # src/summaryview.c:390
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "Mindent _kijelöl"
 
@@ -557,7 +557,7 @@ msgstr "Ki_vágás"
 
 # src/summaryview.c:355
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Másolás"
@@ -619,8 +619,8 @@ msgid "Edit custom attributes..."
 msgstr "Saját attribútumok szerkesztése..."
 
 # src/about.c:89
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_Névjegy"
 
@@ -751,7 +751,7 @@ msgid "Sources"
 msgstr "Források"
 
 # src/addressbook.c:493 src/compose.c:3994 src/prefs_common.c:1959
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Címjegyzék"
@@ -813,7 +813,7 @@ msgstr ""
 # src/folderview.c:1695
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
@@ -944,7 +944,7 @@ msgstr "Partner"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Mappa"
 
@@ -1101,21 +1101,21 @@ msgid "Update failed. Changes not written to Directory."
 msgstr "A frissítés nem sikerült. A változások nem lettek a címjegyzékbe írva."
 
 # src/alertpanel.c:120 src/compose.c:4590 src/main.c:410
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "Megjegyzés"
 
 # src/alertpanel.c:133 src/main.c:245
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868 src/plugins/pgpcore/sgpgme.c:750
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
 # src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "Hiba"
 
@@ -1153,69 +1153,69 @@ msgid "Attribute Value"
 msgstr "Tulajdonság érték"
 
 # src/inc.c:807
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Semmi"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "egy megjelenítő"
 
 # src/mimeview.c:148
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "egy MIME parser"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "mappa"
 
 # src/summaryview.c:3150
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "szűrés"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "egy titkosítás-kezelő"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "értesítő"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "egy segédeszköz"
 
 # src/send.c:375
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "egyéb"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "A bővítmény %s (%s)-t biztosít, amit a(z) %s bővítmény már telepített."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "A bővítmény már betöltve"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Nem sikerült memóriát lefoglalni a bővítmény számára"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr "A modul licensze nem kompatíbilis a GPL v3 vagy későbbi verziójával."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Claws Mail GTK1 modul."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1223,23 +1223,23 @@ msgid ""
 msgstr ""
 "A Claws Mail verziója újabb, mint amellyel a(z) '%s' bővítmény fordítva lett."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "A Claws Mail verziója újabb, mint amellyel a bővítmény fordítva lett."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "A Claws Mail verziója túl régi a(z) '%s' bővítményhez."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "A Claws Mail verziója túl régi a bővítményhez."
 
 # src/ssl.c:106
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "SSL kézfogás sikertelen\n"
 
@@ -1661,7 +1661,7 @@ msgid "_Properties..."
 msgstr "_Tulajdonságok..."
 
 # src/compose.c:557 src/mainwindow.c:604
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "Ü_zenet"
 
@@ -1747,7 +1747,7 @@ msgid "_Unwrapped"
 msgstr "_Nem tördelt"
 
 # src/summaryview.c:390
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Mi_ndent kijelöl"
@@ -1829,7 +1829,7 @@ msgstr "Törlés a sor végéig"
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Keresés"
@@ -1879,54 +1879,54 @@ msgid "_Priority"
 msgstr "_Prioritás"
 
 # src/mainwindow.c:482
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Karakterkódolás"
 
 # src/prefs_common.c:1093
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Nyugat-európai"
 
 # src/editldap.c:461 src/prefs_account.c:668
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Balti"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Héber"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Arab"
 
 # src/prefs_common.c:1103
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cirill"
 
 # src/prefs_common.c:1110
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japán"
 
 # src/prefs_common.c:950
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Kínai"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Koreai"
 
 # src/folderview.c:284 src/prefs_summary_column.c:68
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Thai"
 
 # src/addressbook.c:493 src/compose.c:3994 src/prefs_common.c:1959
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Címjegyzék"
 
@@ -1935,7 +1935,7 @@ msgstr "_Címjegyzék"
 msgid "_Template"
 msgstr "_Sablon"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Mű_veletek"
 
@@ -1976,13 +1976,13 @@ msgstr "_Vonalzó mutatása"
 msgid "_Normal"
 msgstr "_Normál"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "Ö_sszes"
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_Feladó"
 
@@ -2008,32 +2008,32 @@ msgid "_Lowest"
 msgstr "Leg_alacsonyabb"
 
 # src/prefs_account.c:1171
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automatikus"
 
 # src/prefs_common.c:1089
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bites ASCII (US-ASC_II)"
 
 # src/prefs_common.c:1091
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
 # src/prefs_common.c:1095
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Közép-európai (ISO-8859-_2)"
 
 # src/prefs_common.c:1098
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Görög (ISO-8859-_7)"
 
 # src/prefs_common.c:1099
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Török (ISO-8859-_9)"
 
@@ -2088,55 +2088,55 @@ msgid "Fw: multiple emails"
 msgstr "Továbbítás: több e-mail"
 
 # src/compose.c:1157
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Hiba az \"Átirányítás\" sablon törzsének %d. sorában."
 
 # src/addressbook.c:646
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Másolatot kap:"
 
 # src/addressbook.c:650
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Titkos másolatot kap:"
 
 # src/prefs_account.c:1311
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Válaszcím:"
 
 # src/headerview.c:56
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Hírcsoportok:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Válasz e hírcsoport(ok)ba:"
 
 # src/prefs_account.c:1311
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Megválaszolt üzenet:"
 
 # src/addressbook.c:642 src/headerview.c:55 src/prefs_template.c:170
 # src/summary_search.c:155
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Címzett:"
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "A fájl nem csatolható (karakterkészlet átalakítása nem sikerült)."
 
 # src/textview.c:557
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2151,17 +2151,17 @@ msgstr[1] ""
 "A fájlok csatolása megtörtént: \n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "A sablon \"Idézet jele\" mezője érvénytelen."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:3605
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "'%s' fájl mérete nem állapítható meg."
 
-#: src/compose.c:3616
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -2169,66 +2169,66 @@ msgid ""
 msgstr ""
 "%s méretű fájlt akarsz beszúrni az üzenet törzsébe. Biztosan ezt szeretnéd?"
 
-#: src/compose.c:3619
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "Biztos vagy benne?"
 
 # src/compose.c:3946 src/compose.c:5131
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "Beszúrás"
 
 # src/compose.c:1404
-#: src/compose.c:3744
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "%s fájl üres."
 
-#: src/compose.c:3745
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "Üres fájl"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "_Csatolás mindenképpen"
 
 # src/compose.c:1408
-#: src/compose.c:3755
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható"
 
 # src/compose.c:1432
-#: src/compose.c:3782
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "Üzenet: %s"
 
 # src/compose.c:2097
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Szerkesztett]"
 
 # src/compose.c:2099
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Üzenet írása%s"
 
 # src/compose.c:2099
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "%s üzenet írása - [nincs tárgy]"
 
 # src/mainwindow.c:612
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Üzenet írása"
 
 # src/compose.c:2308
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4820 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2238,59 +2238,59 @@ msgstr ""
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Küldés"
 
-#: src/compose.c:5035
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "Az egyetlen címzett az alapértelmezett CC cím. Elküldöd így az üzenetet?"
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Küldés"
 
-#: src/compose.c:5067
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "Az egyetlen címzett az alapértelmezett BCC cím. Elküldöd így az üzenetet?"
 
 # src/compose.c:2233
-#: src/compose.c:5084
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "Nincs címzett."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Küldendő"
 
 # src/compose.c:2242
-#: src/compose.c:5104
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Tárgy nincs megadva. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Mindenképpen elküldöd?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Mindenképpen a várakozó üzenetek közé teszed?"
 
 # src/compose.c:3928
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "Küldés később"
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2301,7 +2301,7 @@ msgstr ""
 "A karakterkészlet átalakítása nem sikerült."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2312,7 +2312,7 @@ msgstr ""
 "A címzett titkosító kulcsa nem hozzáférhető."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2324,7 +2324,7 @@ msgstr ""
 "Az aláírás nem sikerült: %s"
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:5173
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2336,11 +2336,11 @@ msgstr ""
 "%s."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:5175
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "Az üzenet nem tehető sorba a küldéshez."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5196 src/compose.c:5256
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2348,7 +2348,7 @@ msgstr ""
 "Az üzenet besorolva, de nincs elküldve.\n"
 "Használd \"Várakozó üzenetek elküldése\" opciót."
 
-#: src/compose.c:5246
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2358,7 +2358,7 @@ msgstr ""
 "Próbáld újra a \"Várakozó üzenetek elküldése\" opcióval a főablakban."
 
 # src/compose.c:2497
-#: src/compose.c:5621
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2369,7 +2369,7 @@ msgstr ""
 "a megadott %s karakterkészletre.\n"
 "Elküldöd %s kódolással?"
 
-#: src/compose.c:5679
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2383,82 +2383,82 @@ msgstr ""
 "Elküldöd így?"
 
 # src/editbook.c:120 src/editjpilot.c:192 src/editvcard.c:99
-#: src/compose.c:5790
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Az e-mail nem titkosítható: %s"
 
 # src/inc.c:462
-#: src/compose.c:5911
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "Titkosítási figyelmeztetés"
 
-#: src/compose.c:5912
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "F_olytatás"
 
-#: src/compose.c:5961
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "Nincs elérhető fiók az üzenetküldéshez!"
 
-#: src/compose.c:5970
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "A kiválasztott fiók nem NNTP: a küldés nem lehetséges."
 
-#: src/compose.c:6205
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "%s csatolás már nem létezik. Kihagyás?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "A küldés félbeszakítása"
 
 # src/summaryview.c:349
-#: src/compose.c:6206
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "Csatolás kihagyása"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "Eredeti %s rész"
 
 # src/summaryview.c:369
-#: src/compose.c:6824
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "Felvétel a _címjegyzékbe"
 
 # src/account.c:672
-#: src/compose.c:6985
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "Bejegyzés tartalmának törlése"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Használd a <TAB> billentyűt az automatikus kiegészítéshez a címjegyzékből"
 
 # src/compose.c:3460 src/compose.c:4384
-#: src/compose.c:7204
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "MIME típus"
 
 # src/compose.c:3461 src/mimeview.c:149 src/prefs_summary_column.c:73
 # src/select-keys.c:297 src/summaryview.c:401
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Méret"
 
 # src/prefs_common.c:1065
-#: src/compose.c:7273
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "Elküldött üzenet mentése:"
 
 # src/colorlabel.c:51
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7327 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2471,25 +2471,25 @@ msgstr "_Böngészés"
 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241
-#: src/compose.c:7783
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "_Fejléc"
 
 # src/mimeview.c:196
-#: src/compose.c:7788
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "_Csatolások"
 
 # src/prefs_common.c:826 src/select-keys.c:324
-#: src/compose.c:7802
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "_Egyebek"
 
-#: src/compose.c:7817
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "_Tárgy:"
 
-#: src/compose.c:8041
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2498,20 +2498,20 @@ msgstr ""
 "Helyesírás-ellenőrző nem indítható.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "_Feladó:"
 
-#: src/compose.c:8197
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "Az e-mailhez használandó fiók"
 
 # src/editaddress.c:460
-#: src/compose.c:8199
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "A használt feladó cím."
 
-#: src/compose.c:8365
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2521,84 +2521,84 @@ msgstr ""
 "titkosítani."
 
 # src/colorlabel.c:281 src/prefs_folder_item.c:256 src/summaryview.c:3506
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Nincs"
 
 # src/prefs_template.c:438
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8584 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Hiba a sablon törzsének %d. sorában."
 
 # src/prefs_template.c:438
-#: src/compose.c:8683
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "Feladó formátum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8701
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "Címzett formátum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8719
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "Másolatot kap formátum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8737
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "Titkos másolatot kap formátum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8755
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "Válaszcím formátum hiba a sablonban."
 
 # src/compose.c:1157
-#: src/compose.c:8774
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "Tárgy formátum hiba a sablonban."
 
 # src/compose.c:4280
-#: src/compose.c:9043
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
 # src/compose.c:4298
-#: src/compose.c:9058
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
 # src/compose.c:445 src/folderview.c:229 src/folderview.c:245
 # src/folderview.c:260
-#: src/compose.c:9132
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "Tulajdonságok"
 
 # src/compose.c:3460 src/compose.c:4384
-#: src/compose.c:9149
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "MIME típus"
 
 # src/compose.c:4386
-#: src/compose.c:9190
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "Kódolás"
 
 # src/compose.c:4409 src/prefs_folder_item.c:177
-#: src/compose.c:9210
+#: src/compose.c:9227
 msgid "Path"
 msgstr "Elérési út"
 
 # src/compose.c:4410
-#: src/compose.c:9211
+#: src/compose.c:9228
 msgid "File name"
 msgstr "Fájlnév"
 
 # src/compose.c:4587
-#: src/compose.c:9462
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2609,17 +2609,17 @@ msgstr ""
 "Processz leállítása?\n"
 "Processzcsoport azonosító: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9968 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Az e-mail elküldéséhez hálózati kapcsolat kell."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:9977
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "Az üzenet nem tehető sorba a küldéshez."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:9979
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2631,16 +2631,16 @@ msgstr ""
 "%s."
 
 # src/prefs_actions.c:683
-#: src/compose.c:10157
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "A vázlat nem menthető."
 
 # src/prefs_actions.c:683
-#: src/compose.c:10161
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "A vázlat nem menthető."
 
-#: src/compose.c:10162
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2661,26 +2661,26 @@ msgstr ""
 # src/prefs_display_header.c:192 src/prefs_summary_column.c:310
 # src/prefs_template.c:259 src/progressdialog.c:77 src/select-keys.c:323
 # src/summaryview.c:588 src/summaryview.c:2671
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "_Mégsem lép ki"
 
 # src/compose.c:5095
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "_E-mail eldobása"
 
 # src/compose.c:5055 src/compose.c:5069
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "Fájl kiválasztása"
 
-#: src/compose.c:10352
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "'%s' fájl nem olvasható."
 
-#: src/compose.c:10354
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2690,62 +2690,62 @@ msgstr ""
 "nem érvényes karaktereket tartalmaz, a beszúrás hibás lehet."
 
 # src/compose.c:5093
-#: src/compose.c:10441
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "Üzenet eldobása"
 
 # src/compose.c:5094
-#: src/compose.c:10442
+#: src/compose.c:10459
 msgid "This message has been modified. Discard it?"
 msgstr "Az üzenet megváltozott. Elveted?"
 
 # src/compose.c:5095
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "Elvetés"
 
 # src/compose.c:5095
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "Mentés a Vázlatokhoz"
 
 # src/mimeview.c:798 src/summaryview.c:2664
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Módosítások mentése"
 
 # src/compose.c:5094
-#: src/compose.c:10446
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Az üzenet megváltozott. Mented az utolsó módosításokat?"
 
-#: src/compose.c:10447
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "_Nincs mentés"
 
 # src/compose.c:5128
-#: src/compose.c:10518
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Alkalmazni kívánod a(z) '%s' sablont?"
 
 # src/compose.c:5130
-#: src/compose.c:10520
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
 # src/compose.c:5131
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10538 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "Cse_re"
 
-#: src/compose.c:11379
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "Beszúrás vagy csatolás?"
 
-#: src/compose.c:11380
+#: src/compose.c:11397
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2754,17 +2754,17 @@ msgstr ""
 "szeretnéd elküldeni?"
 
 # src/compose.c:3954
-#: src/compose.c:11382
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "_Csatolás"
 
 # src/compose.c:1145
-#: src/compose.c:11599
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Idézet formátum hiba a(z) %d. sorban."
 
-#: src/compose.c:11894
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3016,8 +3016,8 @@ msgstr " Fájl ellenőrzés"
 
 # src/editbook.c:202 src/editjpilot.c:307 src/editvcard.c:222
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Fájl"
 
@@ -3193,7 +3193,7 @@ msgid "TLS"
 msgstr "TLS"
 
 # src/prefs_account.c:681
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -3375,7 +3375,7 @@ msgid ""
 msgstr "A keresés eredményeként visszaadott bejegyzések maximális száma."
 
 # src/editldap.c:461 src/prefs_account.c:668
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Egyszerű"
 
@@ -3529,7 +3529,7 @@ msgstr "Stíluslap"
 
 # src/colorlabel.c:281 src/prefs_folder_item.c:256 src/summaryview.c:3506
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
@@ -3537,8 +3537,8 @@ msgid "None"
 msgstr "Nincs"
 
 # src/prefs_common.c:2920 src/prefs_common.c:3242
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Alapértelmezett "
 
@@ -4080,30 +4080,30 @@ msgstr "Kuka"
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Feldolgozás (%s)...\n"
 
 # src/imap.c:664 src/imap.c:717 src/mh.c:282 src/mh.c:378
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "%s másolása ide: %s...\n"
 
 # src/imap.c:664 src/imap.c:717 src/mh.c:282 src/mh.c:378
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "%s áthelyezése ide: %s...\n"
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "%s cache frissítése..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Üzenetek feldolgozása..."
 
@@ -4132,7 +4132,7 @@ msgstr "Új mappa"
 #: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
 #: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "A mappnév nem tartalmazhatja '%c'-t."
@@ -4141,7 +4141,7 @@ msgstr "A mappnév nem tartalmazhatja '%c'-t."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "'%s' mappa már létezik."
@@ -4168,7 +4168,7 @@ msgstr "Összes megjelölése olvasottként rekurzí_van"
 msgid "R_un processing rules"
 msgstr "Feldolgozási _szabályok futtatása"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "Ma_ppa keresése..."
 
@@ -4236,13 +4236,13 @@ msgid "Mark all as read"
 msgstr "Összes megjelölése olvasottként"
 
 # src/folderview.c:606 src/mainwindow.c:2712 src/setup.c:81
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "%s mappa átvizsgálása..."
@@ -4296,7 +4296,7 @@ msgid "Folder could not be opened."
 msgstr "A mappa nem volt megnyitható."
 
 # src/mainwindow.c:1229
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
@@ -4563,7 +4563,7 @@ msgstr ""
 "Nyelv: %s (karakterkészlet: %s)\n"
 "Operációs rendszer: ismeretlen"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "A Claws Mail Csapat"
 
@@ -5662,9 +5662,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Bővítmények"
 
@@ -5706,15 +5706,15 @@ msgstr "Oldal index"
 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Elrejtés"
 
 # src/mainwindow.c:1906 src/prefs_folder_item.c:240 src/progressdialog.c:52
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -6191,234 +6191,193 @@ msgid "Load Image"
 msgstr "Kép betöltése"
 
 # src/prefs_account.c:1523
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4 kapcsolat törött\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr ""
 
-# src/prefs_account.c:1138
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
-msgstr "Azonosítás"
+#: src/imap.c:621
+msgid " authenticated\n"
+msgstr ""
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
-msgstr "Nincs azonosítás"
+#: src/imap.c:624
+msgid " not authenticated\n"
+msgstr ""
 
-#: src/imap.c:628
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr ""
 
-# src/send.c:375
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
-msgstr "Belső hiba"
+#: src/imap.c:630
+msgid " stream error\n"
+msgstr ""
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr ""
-"IMAP hiba: %s: értelmezési hiba (nagy valószínűséggel nem RFC szerinti "
-"válasz a szervertől)\n"
 
-# src/inc.c:462
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
-msgstr "Kapcsolódás sikertelen"
+#: src/imap.c:637
+msgid " connection refused\n"
+msgstr ""
 
-# src/send.c:375
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
-msgstr "Belső hiba"
+#: src/imap.c:640
+msgid " memory error\n"
+msgstr ""
 
-# src/send.c:375
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
-msgstr "Belső hiba"
+#: src/imap.c:643
+msgid " fatal error\n"
+msgstr ""
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr ""
-"IMAP hiba: %s: protokollhiba (nagy valószínűséggel nem RFC szerinti válasz a "
-"szervertől)\n"
 
-# src/prefs_account.c:1523
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
-msgstr "IMAP hiba: %s: a kapcsolat nem elfogadott\n"
+#: src/imap.c:650
+msgid " connection not accepted\n"
+msgstr ""
 
-#: src/imap.c:654
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr ""
 
-#: src/imap.c:657
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr ""
 
-#: src/imap.c:660
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr ""
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
-msgstr "IMAP hiba %s: CAPABILITY hiba\n"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
+msgstr ""
 
-# src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
-msgstr "Hiba"
+#: src/imap.c:665
+msgid " CHECK error\n"
+msgstr ""
 
-# src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
-msgstr "Hiba"
+#: src/imap.c:668
+msgid " CLOSE error\n"
+msgstr ""
 
-#: src/imap.c:672
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr ""
 
-#: src/imap.c:675
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr ""
 
-#: src/imap.c:678
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr ""
 
-#: src/imap.c:681
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr ""
 
-#: src/imap.c:684
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr ""
 
-#: src/imap.c:687
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr ""
 
-# src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
-msgstr "Hiba"
+#: src/imap.c:689
+msgid " FETCH error\n"
+msgstr ""
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
-msgstr "IMAP hiba: %s: UID FETCH hiba\n"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
+msgstr ""
 
-# src/pop.c:379 src/pop.c:426
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
-msgstr "Socket hiba."
+#: src/imap.c:695
+msgid " LIST error\n"
+msgstr ""
 
-#: src/imap.c:699
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr ""
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
-msgstr "Ismeretlen hiba"
+#: src/imap.c:701
+msgid " LSUB error\n"
+msgstr ""
 
-#: src/imap.c:705
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr ""
 
-#: src/imap.c:708
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr ""
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
-msgstr "IMAP hiba: %s: UID SEARCH hiba\n"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
+msgstr ""
 
-#: src/imap.c:714
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr ""
 
-#: src/imap.c:717
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr ""
 
-# src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
-msgstr "Hiba"
+#: src/imap.c:719
+msgid " STORE error\n"
+msgstr ""
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
-msgstr "IMAP hiba: %s: UID STORE hiba\n"
+#: src/imap.c:722
+msgid " UID STORE error\n"
+msgstr ""
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
-msgstr "IMAP hiba: %s: SUBSCRIBE hiba\n"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
+msgstr ""
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
-msgstr "IMAP hiba: %s: UNSUBSCRIBE hiba\n"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
+msgstr ""
 
-#: src/imap.c:732
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr ""
 
-#: src/imap.c:735
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr ""
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
-msgstr "IMAP hiba: %s: EXTENSION hiba\n"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
+msgstr ""
 
-# src/pop.c:379 src/pop.c:426
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
-msgstr "Socket hiba."
+#: src/imap.c:740
+msgid " SASL error\n"
+msgstr ""
 
-# src/pop.c:379 src/pop.c:426
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
-msgstr "Socket hiba."
+#: src/imap.c:744
+msgid " SSL error\n"
+msgstr ""
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
-msgstr "Ismeretlen hiba"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
+msgstr ""
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -6430,7 +6389,7 @@ msgstr ""
 "A CRAM-MD5 belépés csak akkor működik, ha a libetpan SASL támogatással lett "
 "telepítve, és a CRAM-MD5 SASL bővítmény telepítve van."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -6442,7 +6401,7 @@ msgstr ""
 "A DIGEST-MD5 belépés csak akkor működik, ha a libetpan SASL támogatással "
 "lett telepítve, és a DIGEST-MD5 SASL bővítmény telepítve van."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -6454,52 +6413,39 @@ msgstr ""
 "SCRAM-SHA-1 azonosítás csak akkor elérhető, ha a libetpan SASL támogatást "
 "tartalmaz, és a SCRAM SASL bővítmény telepítve van."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"A CRAM-MD5 belépés csak akkor működik, ha a libetpan SASL támogatással lett "
-"telepítve, és a CRAM-MD5 SASL bővítmény telepítve van."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Kapcsolódás %s szerverhez nem sikerült: bejelentkezés elutasítva. %s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Kapcsolódás %s szerverhez nem sikerült: bejelentkezés elutasítva. %s\n"
 
 # src/inc.c:462
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Kapcsolódás nem sikerült: %s"
 
 # src/imap.c:351
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s IMAP kapcsolat megszakadt. Újrakapcsolódás...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Az IMAP szerver eléréséhez hálózati kapcsolat kell."
 
 # src/send.c:375
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Nem biztonságos kapcsolat"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -6513,122 +6459,122 @@ msgstr ""
 "Folytatod a kapcsolódást a szerverhez? A kommunikáció nem lesz titkosítva."
 
 # src/send.c:375
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "Kapcsolódás foly_tatása"
 
 # src/send.c:371
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "'%s' fiók: Kapcsolódás az IMAP4 szerverhez: %s:%d..."
 
 # src/imap.c:1661
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "%s:%d IMAP4 szerverhez nem sikerült kapcsódni"
 
 # src/imap.c:1661
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 szerverhez nem sikerült kapcsódni\n"
 
 # src/imap.c:1685
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "TLS folyamat nem indítható.\n"
 
 # src/send.c:371
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nem lehet bejelentkezni %s IMAP szerverre.\n"
 
 # src/send.c:371
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nem lehet bejelentkezni %s IMAP szerverre."
 
 # src/send.c:536
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Üzenetek hozzáadása..."
 
 # src/main.c:411
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Üzenetek másolása..."
 
 # src/imap.c:870 src/imap.c:922
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "törölt jelző nem állítható be\n"
 
 # src/imap.c:877 src/imap.c:930 src/imap.c:981
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "nem törölhető\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Nem felírt mappák keresése itt: %s..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "%s almappáinak vizsgálata..."
 
 # src/imap.c:1351
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nem tudtam postaládát létrehozni: LIST hiba\n"
 
 # src/imap.c:1372
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "nem tudtam postaládát létehozni\n"
 
 # src/imap.c:1443
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s postaláda nem nevezhető át %s -ra(re)\n"
 
 # src/imap.c:1509
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "nem tudtam törölni a postaládát\n"
 
 # src/send.c:285
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST sikertelen\n"
 
 # src/summaryview.c:2611
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Üzenetek megjelölése..."
 
 # src/imap.c:2202
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappa kiválasztása nem sikerült\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "A szerver TLS-t követel a bejelentkezéshez.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "A lehetőségek nem frissíthetőek.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6637,22 +6583,22 @@ msgstr ""
 "Kapcsolódás ehhez: %s sikertelen: a szerver TLS-t követel meg, de a Claws "
 "Mail nem tartalmaz TLS támogatást.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Szerverbejelentkezések letiltva.\n"
 
 # src/summaryview.c:2611
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Üzenet vétele..."
 
 # src/imap.c:870 src/imap.c:922
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "törölt jelzés nem állítható be: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6710,7 +6656,7 @@ msgid "_Subscribe..."
 msgstr "_Feliratkozás..."
 
 # src/folderview.c:250
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "_Leiratkozás..."
 
@@ -6754,7 +6700,7 @@ msgstr "A szülőmappa beállításainak átvétele"
 # src/folderview.c:1612
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "'%s' új neve:"
@@ -6762,13 +6708,13 @@ msgstr "'%s' új neve:"
 # src/folderview.c:1613
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6793,7 +6739,7 @@ msgstr ""
 # src/folderview.c:1704
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "'%s' mappa nem távolítható el."
@@ -6824,7 +6770,7 @@ msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "%s alkönyvtárának kiválasztása a feliratkozáshoz ide:"
 
 # src/folderview.c:250
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
@@ -7084,38 +7030,38 @@ msgstr "Pine fájl kiválasztása"
 msgid "Import Pine file into Address Book"
 msgstr "Pine fájl importálása a címjegyzékbe"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "A levelek letöltéséhez hálózati kapcsolat szükséges."
 
 # src/send.c:285
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s sikertelen\n"
 
 # src/inc.c:312
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Új üzenetek vétele"
 
 # src/inc.c:210 src/inc.c:289 src/send.c:367
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Készenlét"
 
 # src/inc.c:479
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Megszakítva"
 
 # src/inc.c:442
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Fogadás"
 
 # src/inc.c:451
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -7123,28 +7069,28 @@ msgstr[0] "Kész (%d üzenet (%s) fogadva)"
 msgstr[1] "Kész (%d üzenet (%s) fogadva)"
 
 # src/inc.c:455
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Kész (nincs új üzenet)"
 
 # src/inc.c:462
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Kapcsolódás sikertelen"
 
 # src/inc.c:466
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Azonosítás nem sikerült"
 
 # src/inc.c:470
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Zárolt"
 
 # src/editldap.c:420
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Időtúllépés"
 
@@ -7189,7 +7135,7 @@ msgstr "Nem sikerült a kapcsolódás a POP3 szerverhez: %s:%d\n"
 
 # src/inc.c:764
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Azonosítás..."
 
@@ -7220,7 +7166,7 @@ msgid "Getting the size of messages (LIST)..."
 msgstr "Üzenetekméretének lekérdezése (LIST)..."
 
 # src/inc.c:807
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Kilépés"
 
@@ -7280,7 +7226,7 @@ msgstr "Socket hiba."
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket hiba a kapcsolat létesítésekor: %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "A távoli szerver lezárta a kapcsolatot."
 
@@ -7305,12 +7251,12 @@ msgstr ""
 "%s"
 
 # src/prefs_account.c:1161
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Az azonosítás nem sikerült."
 
 # src/prefs_account.c:1161
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -7319,7 +7265,7 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -7707,975 +7653,970 @@ msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: a hálózat nem elérhető.\n"
 
 # src/addressbook.c:334 src/compose.c:450 src/mainwindow.c:417
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Fájl"
 
 # src/compose.c:545 src/mainwindow.c:445 src/summaryview.c:381
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "_Nézet"
 
 # src/mainwindow.c:666
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Beállítások"
 
 # src/mainwindow.c:1258
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "Ú_j postaláda"
 
 # src/summaryview.c:354
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH..."
 
 # src/mainwindow.c:464
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Postaládák sorrendjének módosítása..."
 
 # src/mainwindow.c:427
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "Mbox fájl _importálása..."
 
 # src/mainwindow.c:427
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "_Exportálás mbox fájlba..."
 
 # src/mainwindow.c:427
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "Kijelölés exp_ortálása mbox fájlba..."
 
 # src/mainwindow.c:428
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Összes _kuka mappa ürítése"
 
 # src/mimeview.c:117 src/summaryview.c:387
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "E-mail menté_se másként..."
 
 # src/mimeview.c:117 src/summaryview.c:387
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "Rész menté_se másként..."
 
 # src/mainwindow.c:430
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Oldalbeállítás..."
 
 # src/summaryview.c:388
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "_Nyomtatás..."
 
 # src/compose.c:452
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "Mappák szinkronizálása"
 
 # src/mainwindow.c:2182
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "_Kilépés"
 
 # src/mainwindow.c:439
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "Téma ki_jelölése"
 
 # src/message_search.c:88
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_Keresés az aktuális üzenetben..."
 
 # src/compose.c:463
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_Gyorskeresés"
 
 # src/mainwindow.c:446
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "_Mutat vagy elrejt"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "_Eszköztár"
 
 # src/mainwindow.c:489
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "Megjelenített oszlopok _beállítása"
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "A _mappalistában..."
 
 # src/prefs_common.c:1065
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "Az ü_zenetlistában..."
 
 # src/mainwindow.c:467
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "Elrendezé_s"
 
 # src/editldap.c:316 src/editldap_basedn.c:171
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Rendezés"
 
 # src/mainwindow.c:484
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "C_soportosítás tárgy szerint"
 
 # src/mainwindow.c:487
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "Összes téma kife_jtése"
 
 # src/mainwindow.c:488
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "Összes téma össze_vonása"
 
 # src/mainwindow.c:492
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Ugrás"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Előző üzenet"
 
 # src/summaryview.c:954
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "_Következő üzenet"
 
 # src/mainwindow.c:496
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Előző olvasatla_n üzenet"
 
 # src/summaryview.c:898
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Következő olvasatlan üz_enet"
 
 # src/mainwindow.c:501
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Előző ú_j üzenet"
 
 # src/summaryview.c:954
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Következő új ü_zenet"
 
 # src/mainwindow.c:504
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Előző me_gjelölt üzenet"
 
 # src/summaryview.c:1010 src/summaryview.c:1035
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Következő _megjelölt üzenet"
 
 # src/mainwindow.c:509
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Előző cí_mkézett üzenet"
 
 # src/summaryview.c:1060 src/summaryview.c:1085
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Következő _címkézett üzenet"
 
 # src/mainwindow.c:501
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Előző megnyitott üzenet"
 
 # src/summaryview.c:954
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Következő megnyitott üzenet"
 
 # src/summaryview.c:1010 src/summaryview.c:1035
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Szülő üzenet"
 
 # src/mainwindow.c:498
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Következő olvasatlan _mappa"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Egyéb mappa"
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Következő rész"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Előző rész"
 
 # src/grouplistdialog.c:216
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Üzenet görgetése"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Előző sor"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Köv. sor"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Előző oldal"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Következő oldal"
 
 # src/compose.c:547
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Dekódolás"
 
 # src/mainwindow.c:598 src/summaryview.c:382
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "Me_gnyitás új ablakban"
 
 # src/mainwindow.c:599
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Üze_net forrása"
 
 # src/prefs_common.c:1065
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Üzenetrész"
 
 # src/mimeview.c:116
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Megjelenítés szövegként"
 
 # src/mimeview.c:114
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Megnyitás"
 
 # src/mimeview.c:115
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Megnyitás más programmal..."
 
 # src/prefs_common.c:814
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Idézetek"
 
 # src/mainwindow.c:602
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "Összefog_laló frissítése"
 
 # src/prefs_account.c:670 src/prefs_common.c:808
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "_Fogadás"
 
 # src/mainwindow.c:606
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Fogadás az _aktuális fiókról"
 
 # src/mainwindow.c:606
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Fogadás az ö_sszes fiókról"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "Fogadás leállí_tása"
 
 # src/mainwindow.c:1822
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "_Várakozó üzenet(ek) küldése"
 
 # src/mainwindow.c:612
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "Ú_j e-mail üzenet szerkesztése"
 
 # src/mainwindow.c:612
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Új hírüzenet szerkesztése"
 
 # src/summaryview.c:341
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Válasz"
 
 # src/summaryview.c:342
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Válasz _alábbiaknak:"
 
 # src/mainwindow.c:618
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_Levelezőlista"
 
 # src/mainwindow.c:615
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Nyomonkövetés és válasz"
 
 # src/summaryview.c:348
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Továbbítás"
 
 # src/summaryview.c:349
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Tová_bbítás csatolásként"
 
 # src/summaryview.c:350
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Áti_rányítás"
 
 # src/mainwindow.c:618
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "_Levelezőlista"
 
 # src/editldap.c:316 src/editldap_basedn.c:171
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Üzenet"
 
 # src/addressbook.c:358 src/compose.c:576 src/mainwindow.c:683
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "Súgó"
 
 # src/folderview.c:250
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Archívum megtekintése"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "Kapcsolatfelvétel a tulajdonossal"
 
 # src/summaryview.c:354
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "Át_helyezés..."
 
 # src/summaryview.c:355
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Másolás..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Áthelyezés a _kukába"
 
 # src/addressbook.c:383 src/addressbook.c:393 src/summaryview.c:356
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "_Törlés..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Téma áthelyezése a kukáb_a"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "Téma _törlése"
 
 # src/mainwindow.c:612
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Hírüzenet elvetése"
 
 # src/summaryview.c:359
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "Me_gjelölés"
 
 # src/addressadd.c:203 src/addressbook.c:490 src/editaddress.c:196
 # src/editaddress.c:785 src/editaddress.c:850 src/editgroup.c:256
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "Kijelölés _visszavonása"
 
 # src/summaryview.c:363
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Megjelölés olvasatla_nként"
 
 # src/summaryview.c:364
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Megjelölés olvaso_ttként"
 
 # src/summaryview.c:366
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Ö_sszes megjelölése olvasottként"
 
 # src/summaryview.c:364
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Téma figyelmen kívül hagyása"
 
 # src/summaryview.c:364
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Téma újrafigyelése"
 
 # src/compose.c:3460 src/compose.c:4384
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Téma megfigyelése"
 
 # src/compose.c:3460 src/compose.c:4384
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Téma figyelés törlése"
 
 # src/summaryview.c:364
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Megjelölés, mint _spam"
 
 # src/summaryview.c:364
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Megjelölés, mint _nem spam"
 
 # src/inc.c:470
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Zárolás"
 
 # src/summaryview.c:361
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Zárolás feloldása"
 
 # src/summaryview.c:367
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "_Színes címke"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "_Címkék"
 
 # src/summaryview.c:350
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "_Szerkesztés újra"
 
 # src/mimeview.c:120
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Aláírás ellenőrzése"
 
 # src/summaryview.c:369
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "_Feladó címét a címlistába"
 
 # src/addressbook.c:837
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "Címek ki_gyűjtése"
 
 # src/folderview.c:218 src/folderview.c:234
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "A jelenlegi _mappából..."
 
 # src/summaryview.c:2351
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "A kijelölt ü_zenetekből ..."
 
 # src/mainwindow.c:646
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "Összes üzenet szűrése a _mappában"
 
 # src/mainwindow.c:646
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Ki_jelölt üzenetek szűrése"
 
 # src/mainwindow.c:647
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Fel_dolgozási szabályok futtatása"
 
 # src/summaryview.c:371
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Szűrési szabály létre_hozása"
 
 # src/prefs_account.c:1171
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatikusan"
 
 # src/prefs_summary_column.c:71 src/summaryview.c:399
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "_Feladó szerint"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "_Címzett szerint"
 
 # src/prefs_summary_column.c:70 src/summaryview.c:398
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "_Tárgy szerint"
 
 # src/summaryview.c:371
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Feldolgozási szabály létrehozása"
 
 # src/addressbook.c:357
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "_URL-ek listája..."
 
 # src/folderview.c:749
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "Ú_j üzenetek ellenőrzése az összes mappában"
 
 # src/mainwindow.c:659
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Tö_bbszörös üzenetek törlése"
 
 # src/folderview.c:1695
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "A kiválasztott mappában"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "Minden mappában"
 
 # src/mainwindow.c:1877
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "_Futtatás"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "_Végleges törlés"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "SSL _tanúsítványok..."
 
 # src/summaryview.c:3150
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "Szű_rési napló"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "Há_lózat napló"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "Minden munkamenet _jelszó törlése"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "Minden munkamenet _jelszó törlése"
-
 # src/mainwindow.c:680
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "Aktuális fiók _cseréje"
 
 # src/mainwindow.c:674
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "_Aktuális fiók beállításai..."
 
 # src/mainwindow.c:676
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Ú_j fiók létrehozása..."
 
 # src/account.c:513
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "_Fiókok szerkesztése..."
 
 # src/grouplistdialog.c:243
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "_Beállítások..."
 
 # src/summaryview.c:388
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "_Előfeldolgozás..."
 
 # src/summaryview.c:388
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "_Utófeldolgozás..."
 
 # src/summaryview.c:3150
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Szűrés..."
 
 # src/prefs_template.c:373
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "Sa_blonok..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Műveletek..."
 
 # src/foldersel.c:232 src/folderview.c:896 src/prefs_folder_item.c:210
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "_Címkék..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "Plu_ginek..."
 
 # src/mainwindow.c:684
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "Kéziköny_v"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "_Online GYIK"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "Ikonok je_lentése"
 
 # src/prefs_account.c:743
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Beállítás alapértelmezett kliensként"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "Kapcsolat nélküli _mód"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Me_nüsáv"
 
 # src/prefs_common.c:818
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "Ü_zenet nézet"
 
 # src/progressdialog.c:53
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "Állapot_sáv"
 
 # src/addrindex.c:94 src/addrindex.c:98 src/addrindex.c:105
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Oszlop fejlécek"
 
 # src/mainwindow.c:486
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "Téma _szerinti nézet"
 
 # src/mainwindow.c:498
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Olvasott témák elrejtése"
 
 # src/mainwindow.c:498
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "_Olvasott üzenetek elrejtése"
 
 # src/summaryview.c:2351
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Törölt üzenetek elrejtése"
 
 # src/mainwindow.c:489
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "Teljes ké_pernyő"
 
 # src/mainwindow.c:600
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Összes _fejléc megjelenítése"
 
 # src/mainwindow.c:488
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Összes _bezárása"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Elrejtés a _2. szinttől"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Elrejtés a _3. szinttől"
 
 # src/mimeview.c:114
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Szöveg az ikonok _alatt"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Szöveg az ikonok _mellett"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Csak _ikonok"
 
 # src/mimeview.c:114
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "_Csak szöveg"
 
 # src/inc.c:210 src/inc.c:289 src/send.c:367
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Alapértelmezett"
 
 # src/mainwindow.c:489
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Három oszlop"
 
 # src/compose.c:3922
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "_Széles üzenet"
 
 # src/prefs_common.c:1065
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "Széles üzenet_lista"
 
 # src/mainwindow.c:489
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "_Kis képernyő"
 
 # src/prefs_summary_column.c:74
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "_Azonosító szerint"
 
 # src/compose.c:3461 src/mimeview.c:149 src/prefs_summary_column.c:73
 # src/select-keys.c:297 src/summaryview.c:401
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "_Méret szerint"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "_Dátum szerint"
 
 # src/mainwindow.c:470
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Téma dátuma szerint"
 
 # src/prefs_summary_column.c:70 src/summaryview.c:398
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "_Tárgy szerint"
 
 # src/summaryview.c:367
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "Cím_keszín szerint"
 
 # src/mainwindow.c:1840 src/prefs_common.c:1278
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Címke szerint"
 
 # src/addressadd.c:203 src/addressbook.c:490 src/editaddress.c:196
 # src/editaddress.c:785 src/editaddress.c:850 src/editgroup.c:256
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "Meg_jelölés szerint"
 
 # src/progressdialog.c:53
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "_Státusz szerint"
 
 # src/prefs_summary_column.c:69
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "Csato_lás szerint"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Pontozás szerint"
 
 # src/inc.c:470
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Zárolás szerint"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "_Nincs rendezés"
 
 # src/send.c:391
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Növekvő"
 
 # src/send.c:391
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Csökkenő"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_Automatikus felismerés"
 
 # src/mainwindow.c:1840 src/prefs_common.c:1278
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Címkék alkalmazása..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Egy vagy több hiba történt. Kattints ide a napló megtekintéséhez."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Kapcsolódva vagy. Kattints az ikonra a kapcsolat nélküli módhoz."
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "Kapcsolat nélküli módban vagy. Kattints az ikonra a kapcsolódáshoz."
 
 # src/account.c:672
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Fiók kiválasztása"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Hálózat napló"
 
 # src/mainwindow.c:666
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Szűrési/feldolgozási hibakeresés napló"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "szűrési napló engedélyezve\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "szűrési napló letiltva\n"
 
 # src/mainwindow.c:1044 src/mainwindow.c:1061
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Névtelen"
 
 # src/mainwindow.c:1062
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "nincs"
 
 # src/mainwindow.c:1230
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Minden üzenet törlése a kukákból?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Nem lép ki"
 
 # src/mainwindow.c:1258
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Új postaláda"
 
 # src/mainwindow.c:1259
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8686,20 +8627,20 @@ msgstr ""
 "automatikusan átvizsgálásra kerül."
 
 # src/mainwindow.c:1265
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "'%s' postaláda már létezik."
 
 # src/mainwindow.c:1270 src/setup.c:57
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Postaláda"
 
 # src/mainwindow.c:1276 src/setup.c:63
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -8708,84 +8649,84 @@ msgstr ""
 "Postaláda létrehozása nem sikerült.\n"
 "Talán néhány fájl már létezik, vagy nincs írási jogod."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "A küldés nincs engedélyezve"
 
 # src/import.c:224
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Az mbox fájl importálása nem sikerült."
 
 # src/mainwindow.c:427
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "Az mbox fájl exportálása nem sikerült."
 
 # src/mainwindow.c:2182
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Kilépés a Claws Mail-ból?"
 
 # src/prefs_common.c:910
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Mappaszinkronizáció"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Szinkronizálod a mappáidat most?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Szinkronizálás"
 
 # src/summaryview.c:2393 src/summaryview.c:2395
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Többszörös üzenetek törlése..."
 
 # src/summaryview.c:2393 src/summaryview.c:2395
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d többszörös üzenet törölve %d mappában.\n"
 msgstr[1] "%d többszörös üzenet törölve %d mappában.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Mappaszabályok előtt alkalmazandó feldolgozási szabályok"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Mappaszabályok után alkalmazandó feldolgozási szabályok"
 
 # src/mainwindow.c:666
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Szűrési beállítások"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Nem állítható be alapértelmezett kliensként: az elérési út nem állapítható "
 "meg."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "A Claws Mail beállítva alapértelmezett kliensként."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr "Nem állítható be alapértelmezett kliensként: a registry nem írható."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8881,7 +8822,7 @@ msgid "This file already exists. Do you want to overwrite it?"
 msgstr "A fájl már létezik. Felülírod?"
 
 # src/mimeview.c:803 src/summaryview.c:2669
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Felülírás"
@@ -8937,21 +8878,21 @@ msgid "Search finished"
 msgstr "A keresés befejeződött"
 
 # src/mainwindow.c:612
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Új üze_net írása"
 
 # src/mainwindow.c:1619 src/messageview.c:115
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Üzenetnézet"
 
 # src/rfc2015.c:136 src/rfc2015.c:171 src/sigstatus.c:222
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<Válasz útvonal nem található>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8966,11 +8907,11 @@ msgstr ""
 "Válaszcím: %s\n"
 "Nem ajánlott az olvasási visszaigazolás elküldése."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Nem küld"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -8983,50 +8924,50 @@ msgstr ""
 "Nem ajánlott az olvasási visszaigazolás elküldése."
 
 # src/summaryview.c:2611
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Üzenet vétele (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "%s nem fejthető vissza"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Az üzenet nem felel meg a MIME szabványnak, ezért rosszul jelenhet meg."
 
 # src/mimeview.c:798 src/summaryview.c:2664
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Mentés másként"
 
 # src/mimeview.c:804 src/summaryview.c:2670
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Létező fájl felülírása?"
 
 # src/summaryview.c:2677
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "'%s' fájl nem menthető el."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Összes %s megjelenítése."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Csak a szöveg első megabájtja jelenik meg."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -9034,19 +8975,19 @@ msgstr ""
 "Visszaigazoló üzenetet kaptál erre az üzenetre: a címzett elolvasta az "
 "üzeneted."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Az üzenet visszaigazolást kér."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Ez az üzenet visszaigazolást kér."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Visszaigazolás küldése"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -9055,7 +8996,7 @@ msgstr ""
 "és törölve lesz a szerverről."
 
 # src/compose.c:5094
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -9064,15 +9005,15 @@ msgstr ""
 "Az üzenet csak részben érkezett meg.\n"
 "%s"
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Kijelölés letöltésre"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Kjelölés törlésre"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -9083,12 +9024,12 @@ msgstr ""
 
 # src/addressadd.c:203 src/addressbook.c:490 src/editaddress.c:196
 # src/editaddress.c:785 src/editaddress.c:850 src/editgroup.c:256
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Kijelölés visszavonása"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -9097,11 +9038,11 @@ msgstr ""
 "Az üzenet részben lett letöltve,\n"
 "%s - és törölve lesz"
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Visszaigazolás értesítés"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -9124,22 +9065,22 @@ msgstr ""
 # src/prefs_display_header.c:192 src/prefs_summary_column.c:310
 # src/prefs_template.c:259 src/progressdialog.c:77 src/select-keys.c:323
 # src/summaryview.c:588 src/summaryview.c:2671
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Mégsem"
 
 # src/prefs_account.c:1138
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "Feljegyzés küldése"
 
 # src/compose.c:2362
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nem nyomtatható: az üzenet nem tartalmaz szöveget."
 
 # src/mainwindow.c:1230
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -9148,7 +9089,7 @@ msgstr ""
 "  Nincsenek üzenetek a mappában"
 
 # src/summaryview.c:342
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -9157,7 +9098,7 @@ msgstr ""
 "  Az üzenet törölve"
 
 # src/summaryview.c:342
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -9166,18 +9107,18 @@ msgstr ""
 "  Az üzenet törölve lett, vagy másik mappába került"
 
 # src/news.c:776 src/news.c:801
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "Hiba történt a tanulás közben.\n"
 
 # src/main.c:411
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Üzenetek áthelyezése..."
 
 # src/summaryview.c:2611
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Üzenetek törlése..."
 
@@ -9293,7 +9234,7 @@ msgstr "Vissza az e-mailhez"
 
 # src/mimeview.c:757 src/mimeview.c:811 src/mimeview.c:830 src/mimeview.c:854
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "A többrészes üzenet egy darabja nem menthető: %s"
@@ -9380,90 +9321,90 @@ msgid "Description:"
 msgstr "Leírás:"
 
 # src/news.c:260
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "Az NNTP kapcsolatt %s:%d megszakadt.\n"
 
 # src/send.c:371
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "'%s' fiók: Kapcsolódás az NNTP szerverhez: %s:%d...\n"
 
 # src/news.c:158
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Hiba a bejelentkezésnél: %s:%d ...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "A libetpan nem ismeri a 480-as visszatérési kódot, ezért választunk egyet a "
 "folytatáshoz\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "A MODE READER sikertelen, folytatás\n"
 
 # src/news.c:158
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Hiba a munkafolyamat kezdésénél: %s:%d\n"
 
 # src/inc.c:764
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Hiba az azonosításnál: %s:%d ...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Az hírszerver eléréséhez aktív hálózati kapcsolat kell."
 
 # src/news.c:357
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "%s csoportot nem sikerült kiválasztani\n"
 
 # src/news.c:392 src/news.c:704
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "%s csoportot nem tudom beállítani\n"
 
 # src/news.c:710
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "érvénytelen cikktartomány: %d - %d\n"
 
 # src/news.c:768 src/news.c:793
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "xhdr nem elérhető\n"
 
 # src/news.c:733
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Hírjegyzék fogadása %d - %d %s-b(ae)...\n"
 
 # src/news.c:736
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "xover nem elérhető\n"
 
 # src/news.c:750
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "érvénytelen hírjegyzék sor\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -11044,7 +10985,7 @@ msgstr "A fájlban szereplő stíluslap lesz alkalmazva minden HTML részre"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "_Böngészés"
@@ -11053,103 +10994,103 @@ msgstr "_Böngészés"
 msgid "Select stylesheet"
 msgstr "Stíluslap kiválasztása"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "A távoli tartalom betöltése tiltott."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Képek betöltése"
 
 # src/account.c:672
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Távoli tartalom engedélyezése"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "JavaScript engedélyezése"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Bővítmények engedélyezése"
 
 # src/prefs_common.c:2353
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Java engedélyezése"
 
 # src/mimeview.c:864
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Linkek megnyitása külső böngészővel"
 
 # src/pop.c:162 src/pop.c:191 src/pop.c:243
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Hiba történt: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s rosszul formázott, vagy nem támogatott hírforrás"
 
 # src/editldap.c:333 src/editldap_basedn.c:181
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Keresés a weben"
 
 # src/mimeview.c:864
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Megnyitás a megjelenítővel"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Megnyitás megjelenítőben (távoli tartalom engedélyezése)"
 
 # src/mimeview.c:864
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Megnyitás böngészőben"
 
 # src/mimeview.c:116
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Kép megnyitása"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "A link másolása"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Hivatkozott elem letöltése"
 
 # src/mimeview.c:798 src/summaryview.c:2664
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "A kép mentése másként"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "A kép másolása"
 
 # src/mainwindow.c:427
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Hírforrás importálása"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML megjelenítő"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -11249,11 +11190,11 @@ msgstr ""
 "X-FETCH-TIME fejléc hozzáadása az üzenet vételi dátumával és idejével RFC822 "
 "formátumban"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "GData bővítmény: Azonosítás szükséges"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -11270,29 +11211,29 @@ msgstr ""
 "után kapott azonosítási kódot a lenti mezőben kell megadni a Google "
 "kapcsolatok listájának eléréséhez."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "1. lépés:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr "A Google azonosítási oldalának megnyitása böngészőben"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "2. lépés:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Kód:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "GData bővítmény: Hiba a kapcsolatok lekérdezésekor: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -11300,74 +11241,74 @@ msgstr[0] "%d hozzáadva:"
 msgstr[1] "%d hozzáadva:"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 kapcsolat a gyorsítótárba"
 msgstr[1] "%d kapcsolat a gyorsítótárba"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "GData bővítmény: A kapcsolatok aszinkron lekérdezésének indítása\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "GData bővítmény: Hiba a csoportok lekérdezésekor: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "GData bővítmény: Csoportok lekérdezve\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "GData bővítmény: A csoportok aszinkron lekérdezésének indítása\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "GData bővítmény: Azonosítási hiba: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData bővítmény: Sikeres azonosítás\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "GData bővítmény: Interaktív azonosítás indítása\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "GData bővítmény: Azonosítási kód megadva, azonosítás kérése\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr "GData bővítmény: Nincs azonosítási kód, azonosítás kérés törölve\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData bővítmény: Azonosítás frissítési hiba: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData bővítmény: Azonosítás frissítés sikeres\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData bővítmény: Azonosítás frissítési kísérlet\n"
 
 # src/prefs_account.c:1138
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Azonosítás"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Felhasználónév:"
 
@@ -11415,7 +11356,7 @@ msgstr ""
 "Visszajelzéseket a <berndth at gmx.de> címre várok."
 
 # src/prefs_filter.c:329
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "GData integráció"
 
@@ -11642,7 +11583,7 @@ msgstr "Kérés timeout"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "másodperc"
@@ -11938,31 +11879,31 @@ msgstr ""
 
 # src/prefs_account.c:892 src/prefs_account.c:1190
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Felhasználó-azonosító"
 
 # src/prefs_account.c:898 src/prefs_account.c:1199
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Jelszó"
 
 # src/prefs_account.c:1161
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Azonosítási eljárás"
 
 # src/prefs_account.c:1171
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automatikus"
 
@@ -13123,165 +13064,170 @@ msgstr "Ez a digitális aláírás még nincs ellenőrizve."
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: a kulcs nem érhető el - nincs futó gpg-agent."
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "Az aláírás nem ellenőrizhető - %s."
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "\"%s\" aláírása jó [ultimate]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "\"%s\" aláírása jó [teljes]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "\"%s\" aláírása jó [marginális]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" aláírása jó."
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "0x%s kulcs nem elérhető az aláírás ellenőrzéséhez"
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" aláírása lejárt."
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "\"%s\" aláírása jó, de a kulcs lejárt."
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "\"%s\" aláírása jó, de a kulcs visszavonva."
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "\"%s\" aláírása rossz."
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "0x%s kulcs nem elérhető az aláírás ellenőrzéséhez"
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "Az aláírás nincs ellenőrizve"
 
 # src/sigstatus.c:129
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "Hiba az aláírás ellenőrzésénél: nincs státusz\n"
 
 # src/sigstatus.c:129
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Hiba az aláírás ellenőrzésénél: %s\n"
 
 # src/rfc2015.c:248
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Az aláírás %s kulcs, %s azonosító használatával készült ekkor: %s.\n"
 
 # src/rfc2015.c:174
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "\"%s\" digitális aláírása jó (Érvényesség: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "%s kulcs uid lejárt.\n"
 
 # src/rfc2015.c:174
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "\"%s\" aláírása lejárt (Érvényesség: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Visszavont kulcs uid \"%s\"\n"
 
 # src/rfc2015.c:177
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "%s digitális aláírása rossz\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid \"%s\" (Érvényesség: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "Visszavont"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Tulajdonos megbízhatósága: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "Nincs kulcs!"
 
 # src/rfc2015.c:257
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "Elsődleges kulcs-ujjlenyomat:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "Az aláíró címe (\"%s\") nem szerepel a DNS-ben\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Ellenőrzött aláíró címe: \"%s\"\n"
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Az adatok nem érhetőek el az üzenetből, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Az adat nem inicializálható, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "A titkos kulcs specifikáció bizonytalan"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "A titkos kulcs nem található (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Titkos kulcs beállítási hiba: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "'%s' gpgme protokoll nem használható: '%s' nincs megfelelően telepítve."
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -13290,13 +13236,13 @@ msgstr ""
 "'%s' gpgme protokoll nem használható: '%s' %s verziója telepítve van, de %s "
 "verzió szükséges.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "'%s' gpgme protokoll nem használható (ismeretlen probléma)"
 
 # src/main.c:246
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -13304,7 +13250,7 @@ msgstr ""
 "A GnuPG nincs megfelelően telepítve, vagy frissítendő.\n"
 "OpenPGP támogatás letiltva."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -13312,11 +13258,11 @@ msgstr ""
 "Az \"OK\" gombbal elmentheted a fiókinformációkat a kulcspár létrehozása "
 "előtt.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "PGP kulcs nem található"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -13326,12 +13272,12 @@ msgstr ""
 "aláírni, illetve titkosított leveleket fogadni.\n"
 "Létrehozol most egy új kulcspárt?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Az új kulcspár nem hozható létre: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -13339,11 +13285,11 @@ msgstr ""
 "Új kulcspár létrehozása... Mozgasd körbe az egeret az entrópia generálás "
 "segítéséhez."
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Az új kulcspár nem hozható létre: ismeretlen hiba"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13356,21 +13302,21 @@ msgstr ""
 "\n"
 "Exportálod a kulcsszerverhez?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "Kulcs létrehozva"
 
 # src/importldif.c:124
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "Kulcs exportálva."
 
 # src/compose.c:4662
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "A kulcs nem exportálható."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "A kulcs esportálása a Windowsban nem elérhető."
 
@@ -13615,9 +13561,9 @@ msgid "Refresh"
 msgstr "Frissítés"
 
 # src/colorlabel.c:51
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Böngészés"
 
@@ -13896,7 +13842,7 @@ msgstr ""
 "meg nem változtatja a hírforrás címét."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "SSL tanúsítvány érvényességének ellenőrzése"
 
@@ -14071,17 +14017,17 @@ msgstr "'%s' hozzászólásainak frissítése..."
 
 # src/prefs_account.c:1138
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Azonosítás szükséges)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (Tiltott)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (Nem található)"
 
@@ -14221,21 +14167,21 @@ msgid ""
 msgstr "Az S/MIME nem titkosítja a fejléceket, mint pl. Tárgy."
 
 # src/summaryview.c:1625 src/summaryview.c:1626
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Spam jelentése..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Spam jelentése online..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "SpamReport"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -14252,22 +14198,22 @@ msgstr ""
 " * lists.debian.org nomination system"
 
 # src/send.c:391
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Spam jelentése"
 
 # src/prefs_common.c:2353
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Engedélyezve"
 
 # src/mainwindow.c:1857
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Továbbítás:"
 
 # src/prefs_account.c:898 src/prefs_account.c:1199
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Jelszó:"
 
@@ -14572,7 +14518,7 @@ msgid "Next month"
 msgstr "Következő hónap"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -14606,7 +14552,7 @@ msgstr ""
 "találkozóidat és naptáraidat, közzéteheted a szabad/elfoglalt "
 "információidat, és mások ezen információt lekérdezheted."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Naptár"
 
@@ -14801,71 +14747,71 @@ msgstr "Résztvevők:"
 msgid "Action:"
 msgstr "Művelet:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "Ú_j találkozó..."
 
 # src/mainwindow.c:427
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Naptár exportálása..."
 
 # src/folderview.c:250
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_Feliratkozás webCal-ra..."
 
 # src/folderview.c:219 src/folderview.c:235
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "Át_nevezés…"
 
 # src/prefs_common.c:2314
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "Feli_ratkozások frissítése"
 
 # src/prefs_common.c:818
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "_Lista nézet"
 
 # src/prefs_common.c:818
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "H_eti nézet"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "H_avi nézet"
 
 # src/send.c:375
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Találkozók"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "korábban"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "ma"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "holnap"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "a héten"
 
 # src/compose.c:3928
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "később"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -14874,19 +14820,19 @@ msgstr ""
 "\n"
 "Tervezett események: %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Időtúllépés (%d másodperc) a kapcsolódáskor: %s\n"
 
 # src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "%ld hiba"
 
 # src/editbook.c:120 src/editjpilot.c:192 src/editvcard.c:99
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14899,7 +14845,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14912,7 +14858,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -14923,7 +14869,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -14935,47 +14881,47 @@ msgstr ""
 "%s\n"
 
 # src/compose.c:4658
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "%s könyvtár nem hozható létre"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "A Webcal információk eléréséhez hálózati kapcsolat kell."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "%s naptár vétele..."
 
 # src/headerview.c:56
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "új feliratkozás"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "A feliratkozás frissítéséhez hálózati kapcsolat kell."
 
 # src/folderview.c:250
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Feliratkozás WebCal-ra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "A WebCal URL-je:"
 
 # src/prefs_actions.c:683
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Az URL nem értelmezhető."
 
 # src/prefs_filter.c:797
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Valóban le akarsz iratkozni?"
 
@@ -15371,86 +15317,86 @@ msgstr "A szabad/elfoglalt információ nem exportálható ide: '%s'\n"
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Emlékeztetők"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Figyelmeztető"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "perccel az esemény előtt"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "A naptár exportálása"
 
 # src/prefs_common.c:1782
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Naptár automatikus exportálása"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Exportálhatsz helyi fájlt vagy URL-t"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Add meg a helyi fájlt vagy az URL-t (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Webcal feliratkozások is szerepeljenek az exportálásban"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Naptár exportálása után futtatandó parancs"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "A Claws Naptár regisztrálása az Xfce Orage órájába"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "A Claws Mail naptár megjelenítésének engedélyezése az Orage-ban (4.4 verzió "
 "felett)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Exportálás  GNOME shell naptár szerverként"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 
 # src/prefs_account.c:792
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Szabad/elfoglalt információ"
 
 # src/prefs_common.c:1782
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Szabad/elfoglalt állapot automatikus exportálása ide:"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Helyi fájl vagy URL megadása (http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Szabad/elfoglalt státusz exportálása után futtatandó parancs"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Mások szabad/elfoglalt státuszának vétele innen:"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -15460,7 +15406,7 @@ msgstr ""
 "%u -t az e-mail cím '@' előtti részéhez, %d -t a domain-hez."
 
 # src/summaryview.c:344
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "SSL opciók"
 
@@ -15527,13 +15473,13 @@ msgid "TOP command unsupported\n"
 msgstr "A TOP parancs nem támogatott\n"
 
 # src/prefs_account.c:957 src/prefs_account.c:1495
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
 # src/prefs_account.c:817 src/prefs_account.c:1512 src/prefs_account.c:1674
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -15543,7 +15489,7 @@ msgid "News (NNTP)"
 msgstr "Hírek (NNTP)"
 
 # src/mbox.c:79
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Helyi postaláda fájl (mbox)"
 
@@ -15578,7 +15524,7 @@ msgid "Mail address"
 msgstr "E-mail cím"
 
 # src/mainwindow.c:666
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Automatikus beállítás"
 
@@ -15595,7 +15541,7 @@ msgstr "Automatikus beállítás"
 # src/prefs_display_header.c:192 src/prefs_summary_column.c:310
 # src/prefs_template.c:259 src/progressdialog.c:77 src/select-keys.c:323
 # src/summaryview.c:588 src/summaryview.c:2671
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -15699,7 +15645,7 @@ msgstr ""
 "Kijelölésükkor teljesen letöltheted, vagy törölheted őket."
 
 # src/prefs_account.c:1529
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -15712,81 +15658,75 @@ msgstr "Letöltendő cikkek maximális száma"
 msgid "unlimited if 0 is specified"
 msgstr "0 megadása esetén korlátlan"
 
-# src/message_search.c:106
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Keresett szöveg:"
-
 # src/prefs_account.c:1685
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "IMAP szerver könyvtár"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(általában üres)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Csak feliratkozott mappák megjelenítése"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Sávszélesség-kímélő mód (a távoli címkék vételének tiltása)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "Kisebb sávszélességet használ, de lassabb lehet, szervertől függően."
 
 # src/prefs_account.c:1029
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Üzenetek szűrése fogadás közben"
 
 # src/prefs_account.c:1029
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Szűrés bővítmények használatával fogadás közben"
 
 # src/prefs_account.c:1067
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'E-mail fogadása' ellenőrzi, van-e új üzenet ezen a címen"
 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Fejléc"
 
 # src/summaryview.c:2351
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Üzenet-azonosító generálása"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Fiók e-mail cím elküldése az üzenet-azonosítóban"
 
 # src/prefs_account.c:1126
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "User-Agent fejléc hozzáadása"
 
 # src/prefs_account.c:1126
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Egyéni fejléc hozzáadása"
 
 # src/prefs_account.c:1146
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP azonosítás (SMTP AUTH)"
 
 # src/prefs_account.c:1221
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15795,62 +15735,62 @@ msgstr ""
 "azonosító és jelszó lesz használva."
 
 # src/prefs_account.c:1230
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Küldés előtt azonosítás POP3-mal"
 
 # src/prefs_account.c:1161
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "POP azonosítás időtúllépés: "
 
 # src/prefs_common.c:950
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "perc"
 
 # src/compose.c:3964 src/prefs_common.c:1186
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Aláírás"
 
 # src/prefs_common.c:1782
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Aláírás automatikus beszúrása"
 
 # src/prefs_common.c:1197
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Aláírás elválasztó"
 
 # src/prefs_common.c:883 src/prefs_common.c:1046
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Parancs kimenete"
 
 # src/prefs_account.c:1276
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Az alábbi címek automatikus beállítása"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Helyesírás-ellenőrzés szótárai"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Alapértelmezett szótár"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Alapértelmezett alternatív szótár"
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
@@ -15858,147 +15798,147 @@ msgid "Compose"
 msgstr "Új üzenet"
 
 # src/mainwindow.c:1840 src/prefs_common.c:1278
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Válasz"
 
 # src/mainwindow.c:1857
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Továbbítás"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Alapértelmezett titkosítás"
 
 # src/grouplistdialog.c:216
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Mindig aláírja az üzeneteket"
 
 # src/prefs_account.c:965
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Mindig titkosítja az üzeneteket"
 
 # src/prefs_account.c:965
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "Mindig aláírja az üzeneteket aláírt üzenetekre válaszoláskor"
 
 # src/prefs_account.c:965
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Mindig titkosítja az üzeneteket titkosított üzenetekre válaszoláskor"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Egyúttal az elküldött üzenetek titkosítása a saját kulcsoddal"
 
 # src/prefs_common.c:1065
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Titkosított üzenetek mentése titkosítás nélkül"
 
 # src/prefs_account.c:1503 src/prefs_account.c:1520 src/prefs_account.c:1536
 # src/prefs_account.c:1554
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "SSL használatának mellőzése"
 
 # src/prefs_account.c:1506
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "SSL használata POP3 kapcsolathoz"
 
 # src/prefs_account.c:1509 src/prefs_account.c:1526 src/prefs_account.c:1560
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS parancs használata SSL kapcsolathoz"
 
 # src/prefs_account.c:1523
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL használata IMAP4 kapcsolathoz"
 
 # src/prefs_account.c:1544
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "SSL használata NNTP kapcsolathoz"
 
 # src/prefs_account.c:1546
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Küldés (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "SSL használatának mellőzése (de szükség esetén STARTTLS használata)"
 
 # src/prefs_account.c:1557
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "SSL használata SMTP kapcsolathoz"
 
 # src/summaryview.c:2677
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Ügyfél-tanúsítványok"
 
 # src/prefs_account.c:879
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Tanúsítvány fogadáshoz"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Ügyfél tanúsítvány fájl PKCS12 vagy PEM fájlként"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Tanúsítvány küldéshez"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Érvényes SSL tanúsítványok automatikus elfogadása"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Nem blokkoló SSL használata"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Kapcsold ki, ha problémák vannak az SSL kapcsolódással"
 
 # src/prefs_account.c:1644
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "SMTP port"
 
 # src/prefs_account.c:1650
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "POP3 port"
 
 # src/prefs_account.c:1656
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "IMAP4 port"
 
 # src/prefs_account.c:1662
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "NNTP port"
 
 # src/prefs_account.c:1667
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Domain név"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -16006,15 +15946,15 @@ msgstr ""
 "Ez a domain név lesz használva a generált Üzenet-azonosítókban, és az SMTP "
 "szerverekhez kapcsolódáskor."
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "A szerverrel történő kommunikációhoz használandó parancs"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "A törölt üzenetek áthelyezése a kukába, és végleges törlésük"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -16022,131 +15962,131 @@ msgstr ""
 "Áthelyezi a törölt üzeneteket a kukába a \\Deleted jelző használata helyett, "
 "végleges törlés nélkül."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Több címre is elküldött üzenetek megjelölése olvasottként és színnel:"
 
 # src/prefs_account.c:1739
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Elküldött üzenetek mentése ide:"
 
 # src/prefs_account.c:1743
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Várakozó üzenetek mentése ide:"
 
 # src/prefs_account.c:1741
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Vázlatok mentése ide:"
 
 # src/prefs_account.c:1743
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Törölt üzenetek ide:"
 
 # src/prefs_account.c:1803
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Fiók neve nincs megadva."
 
 # src/prefs_account.c:1807
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "E-mail cím nincs megadva."
 
 # src/prefs_account.c:1812
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "SMTP szerver nincs megadva."
 
 # src/prefs_account.c:1817
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Felhasználói azonosító nincs megadva."
 
 # src/prefs_account.c:1822
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "POP3 szerver nincs megadva."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "Az alapértelmezett 'Bejövő üzenetek' mappa nem létezik."
 
 # src/prefs_account.c:1827
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 szerver nincs megadva."
 
 # src/prefs_account.c:1832
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "NNTP szerver nincs megadva."
 
 # src/prefs_account.c:1803
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "helyi postaláda fájl nincs megadva."
 
 # src/prefs_account.c:1807
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "üzenet parancs nincs megadva."
 
 # src/prefs_account.c:670 src/prefs_common.c:808
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Fogadás"
 
 # src/prefs_template.c:373
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Sablonok"
 
 # src/prefs_account.c:677 src/prefs_common.c:821
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Titkosítás"
 
 # src/prefs_account.c:684
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Haladó"
 
 # src/prefs_account.c:622
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Új fiók beállításai"
 
 # src/prefs_account.c:627
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Fiók beállításai"
 
 # src/prefs_account.c:762
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Sikertelen (hibás cím)"
 
 # src/editjpilot.c:225
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Aláírás fájl kiválasztása"
 
 # src/summaryview.c:2677
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Tanúsítványfájl kiválasztása"
 
 # src/account.c:552 src/prefs_account.c:803
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (bővítmény nincs betöltve)"
@@ -17323,7 +17263,7 @@ msgid "Fonts"
 msgstr "Betűkészletek"
 
 # src/grouplistdialog.c:243
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -17485,7 +17425,7 @@ msgid "Status messages for filtering/processing log"
 msgstr "Szűrési/feldolgozási napló státuszüzenetei"
 
 # src/prefs_common.c:826 src/select-keys.c:324
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Egyéb"
 
@@ -18243,17 +18183,17 @@ msgstr "Mappa színének kiválasztása"
 msgid "Colors"
 msgstr "Színek"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Mentett gyorsbillentyű beállítások kiválasztása"
 
 # src/select-keys.c:271
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Előre beállított kiválasztása:"
 
 # src/prefs_common.c:2908
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -18262,39 +18202,39 @@ msgstr ""
 "lenyomod a kívánt billentyű(ke)t, amikor az egér a menüponton van."
 
 # src/prefs_common.c:1968
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Dupla-klikk esetén cím a célmezőbe"
 
 # src/prefs_common.c:2085
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Kilépéskor"
 
 # src/prefs_common.c:2093
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Kilépéskor rákérdez"
 
 # src/prefs_common.c:2100
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Kuka ürítése kilépéskor"
 
 # src/prefs_common.c:2106
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Elküldetlen üzenetek esetén figyelmeztet"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Gyorsbillentyűk..."
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Saját gyorsbillentyű beállítások engedélyezése"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -18304,15 +18244,15 @@ msgstr ""
 "hogy a menüpontra állsz és a lenyomod a kívánt billentyűkombinációt.\n"
 "Töröld az opciót az összes menü gyorsbillentyű rögzítéséhez."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Mentett gyorsbillentyű beállítások kiválasztása..."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Metaadat kezelés"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -18322,33 +18262,33 @@ msgstr ""
 "ezzel megelőzhető az összeomlás utáni adatvesztés, de sokáig tarthat."
 
 # src/mimeview.c:117 src/summaryview.c:387
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Biztonságos"
 
 # src/compose.c:463
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Gyors"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Socket I/O időtúllépés"
 
 # src/prefs_common.c:2102
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Megerősítés a kuka ürítése előtt"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "Rákérdezés a fiók-specifikus szűrési szabályokra kézi szűrés esetén"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Biztonságos fájltörlés használata, ha lehetséges"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -18356,7 +18296,7 @@ msgstr ""
 "Biztonságos fájltörlés használata, ha lehetséges\n"
 "(a 'shred' program nem használható)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -18365,32 +18305,11 @@ msgstr ""
 "a törlés előtt. Ez lelassítja a törlést. Olvasd el a shred man oldalát, hogy "
 "tisztában légy a veszélyekkel."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Kapcsolat nélküli mappák szinkronizálása a lehető leghamarabb"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Jelszó megadása"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Jelszó megadása"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Jelszó megadása"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Vegyes"
 
@@ -18696,8 +18615,8 @@ msgstr ""
 "ASCII karaktereket is."
 
 # src/send.c:391
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Küldés"
 
@@ -19515,31 +19434,31 @@ msgstr "Nincs elérhető információ"
 msgid "No recipient keys defined."
 msgstr "Nincs definiált elfogadókulcs."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64 dekódolási hiba]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Mindig megpróbálja a küldést."
 
 # src/compose.c:2898
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "%s fájl nem nyitható meg."
 
 # src/prefs_common.c:1067
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "A várakozó üzenet fejléce sérült."
 
 # src/news.c:776 src/news.c:801
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "Hiba történt az SMTP folyamat közben."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -19547,7 +19466,7 @@ msgstr ""
 "Nem található a küldéshez megadott fiók, és hiba történt az SMTP folyamat "
 "alatt."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -19556,22 +19475,22 @@ msgstr ""
 "hozta létre az e-mailt."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "Nem hozható létre átmeneti fájl a hírküldéshez."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "Hiba a hírküldés átmeneti fájljának írásakor."
 
 # src/compose.c:2322
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Hiba lépett fel az üzenet küldése közben: %s"
 
 # src/summaryview.c:2611
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Üzenetek szűrése...\n"
 
@@ -19899,105 +19818,105 @@ msgid "Enter variable"
 msgstr "Változó megadása"
 
 # src/send.c:449 src/send.c:513
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Üzenet küldése e parancssal: %s\n"
 
 # src/send.c:237
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "%s parancs nem hajtható végre"
 
 # src/smtp.c:82
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Hiba e parancs végrehajtása közben: %s"
 
 # src/send.c:375
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "POP végrehajtása SMTP előtt..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP SMTP előtt..."
 
 # src/send.c:371
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "'%s' fiók: Kapcsolódás az SMTP szerverhez: %s:%d..."
 
 # src/importldif.c:356
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "A levél sikeresen elküldve."
 
 # src/send.c:390
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "HELO küldése..."
 
 # src/prefs_account.c:1138
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Azonosítás"
 
 # src/send.c:536
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Üzenet küldése..."
 
 # src/send.c:390
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "EHLO küldése..."
 
 # src/send.c:390
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM küldése..."
 
 # src/send.c:399
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO küldése..."
 
 # src/send.c:406
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "DATA küldése..."
 
 # src/send.c:416
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Kilépés..."
 
 # src/send.c:449 src/send.c:513
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Üzenet küldése (%d / %d byte)"
 
 # src/send.c:536
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Üzenet küldése"
 
 # src/compose.c:2346
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Hiba történt az üzenet küldése közben."
 
 # src/compose.c:2346
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -21020,12 +20939,12 @@ msgid "Select All"
 msgstr "Összes kijelölése"
 
 # src/prefs_actions.c:875
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Üdvözöl a Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -21119,50 +21038,50 @@ msgstr ""
 "\n"
 
 # src/importldif.c:312
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Add meg a postafiók nevét."
 
 # src/prefs_account.c:1389
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Add meg a neved és az e-mail címed."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Add meg a fogadó szervert és a felhasználónevet."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Add meg a felhasználóneved."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Add meg az SMTP szervered."
 
 # src/importldif.c:312
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Add meg az SMTP felhasználóneved."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Név:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "E-mail cím:"
 
 # src/prefs_account.c:768
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Szervezet:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Postafiók neve:"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -21170,66 +21089,66 @@ msgstr ""
 "Abszolút elérési utat is megadhatsz, például: \"/home/user/Dokumentumok/Mail"
 "\""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 "A végéhez hozzáfűzve megadhatsz egy portszámot is: \"mail.example.com:25\""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "SMTP szerver címe:"
 
 # src/prefs_account.c:1138
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Azonosítás használata"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(üres, ha ugyanaz, mint a fogadásnál)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "SMTP felhasználónév:"
 
 # src/prefs_account.c:898 src/prefs_account.c:1199
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "SMTP jelszó:"
 
 # src/smtp.c:68
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "SSL használata az SMTP szerverhez kapcsolódáskor"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "SSL használata STARTTLS-en keresztül"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Ügyfél SSL tanúsítványa (opcionális)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Szerver címe:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Helyi postafiók:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Szerver típusa:"
 
 # src/prefs_account.c:817 src/prefs_account.c:1512 src/prefs_account.c:1674
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -21237,36 +21156,36 @@ msgstr ""
 "A végéhez hozzáfűzve megadhatsz egy portszámot is: \"mail.example.com:110\""
 
 # src/editldap.c:167 src/editldap_basedn.c:290
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "SSL kapcsolat használata a fogadó szerverhez"
 
 # src/prefs_account.c:1685
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "IMAP szerver könyvtár:"
 
 # src/prefs_display_header.c:342
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Csak a felírt mappák megjelenítése"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
 msgstr ""
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail beállítás varázsló"
 
 # src/prefs_actions.c:875
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Üdvözöl a Claws Mail"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -21281,34 +21200,34 @@ msgstr ""
 "elkezdheted."
 
 # src/about.c:89
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Adataid"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "A vastagbetűs mezők kitöltése kötelező."
 
 # src/prefs_account.c:1015
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "E-mail fogadása"
 
 # src/send.c:536
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "E-mail küldése"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Levél mentése a lemezen"
 
 # src/mainwindow.c:666
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Beállítás kész"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -21316,9 +21235,6 @@ msgstr ""
 "A Claws Mail használatra kész.\n"
 "Kattints a Mentésre a kezdéshez."
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Az aláírás nem ellenőrizhető - %s."
-
 # src/addressbook.c:630
 #~ msgid "Lookup name:"
 #~ msgstr "Keresendő név:"
@@ -21440,6 +21356,13 @@ msgstr ""
 #~ msgid "IMAP error on %s: stream error\n"
 #~ msgstr "IMAP hiba: %s: stream error\n"
 
+#~ msgid ""
+#~ "IMAP error on %s: parse error (very probably non-RFC compliance from the "
+#~ "server)\n"
+#~ msgstr ""
+#~ "IMAP hiba: %s: értelmezési hiba (nagy valószínűséggel nem RFC szerinti "
+#~ "válasz a szervertől)\n"
+
 # src/prefs_account.c:1523
 #~ msgid "IMAP error on %s: connection refused\n"
 #~ msgstr "IMAP hiba: %s: kapcsolat elutasítva\n"
@@ -21450,6 +21373,17 @@ msgstr ""
 #~ msgid "IMAP error on %s: fatal error\n"
 #~ msgstr "IMAP hiba: %s: végzetes hiba\n"
 
+#~ msgid ""
+#~ "IMAP error on %s: protocol error(very probably non-RFC compliance from "
+#~ "the server)\n"
+#~ msgstr ""
+#~ "IMAP hiba: %s: protokollhiba (nagy valószínűséggel nem RFC szerinti "
+#~ "válasz a szervertől)\n"
+
+# src/prefs_account.c:1523
+#~ msgid "IMAP error on %s: connection not accepted\n"
+#~ msgstr "IMAP hiba: %s: a kapcsolat nem elfogadott\n"
+
 #~ msgid "IMAP error on %s: APPEND error\n"
 #~ msgstr "IMAP hiba: %s: APPEND hiba\n"
 
@@ -21459,6 +21393,9 @@ msgstr ""
 #~ msgid "IMAP error on %s: LOGOUT error\n"
 #~ msgstr "IMAP hiba: %s: LOGOUT hiba\n"
 
+#~ msgid "IMAP error on %s: CAPABILITY error\n"
+#~ msgstr "IMAP hiba %s: CAPABILITY hiba\n"
+
 #~ msgid "IMAP error on %s: CHECK error\n"
 #~ msgstr "IMAP hiba: %s: CHECK hiba\n"
 
@@ -21486,6 +21423,9 @@ msgstr ""
 #~ msgid "IMAP error on %s: FETCH error\n"
 #~ msgstr "IMAP hiba: %s: FETCH hiba\n"
 
+#~ msgid "IMAP error on %s: UID FETCH error\n"
+#~ msgstr "IMAP hiba: %s: UID FETCH hiba\n"
+
 #~ msgid "IMAP error on %s: LIST error\n"
 #~ msgstr "IMAP hiba: %s: LIST hiba\n"
 
@@ -21501,6 +21441,9 @@ msgstr ""
 #~ msgid "IMAP error on %s: SEARCH error\n"
 #~ msgstr "IMAP hiba: %s: SEARCH hiba\n"
 
+#~ msgid "IMAP error on %s: UID SEARCH error\n"
+#~ msgstr "IMAP hiba: %s: UID SEARCH hiba\n"
+
 #~ msgid "IMAP error on %s: SELECT error\n"
 #~ msgstr "IMAP hiba: %s: SELECT hiba\n"
 
@@ -21510,12 +21453,24 @@ msgstr ""
 #~ msgid "IMAP error on %s: STORE error\n"
 #~ msgstr "IMAP hiba: %s: STORE hiba\n"
 
+#~ msgid "IMAP error on %s: UID STORE error\n"
+#~ msgstr "IMAP hiba: %s: UID STORE hiba\n"
+
+#~ msgid "IMAP error on %s: SUBSCRIBE error\n"
+#~ msgstr "IMAP hiba: %s: SUBSCRIBE hiba\n"
+
+#~ msgid "IMAP error on %s: UNSUBSCRIBE error\n"
+#~ msgstr "IMAP hiba: %s: UNSUBSCRIBE hiba\n"
+
 #~ msgid "IMAP error on %s: STARTTLS error\n"
 #~ msgstr "IMAP hiba: %s: STARTTLS hiba\n"
 
 #~ msgid "IMAP error on %s: INVAL error\n"
 #~ msgstr "IMAP hiba %s: INVAL hiba\n"
 
+#~ msgid "IMAP error on %s: EXTENSION error\n"
+#~ msgstr "IMAP hiba: %s: EXTENSION hiba\n"
+
 #~ msgid "IMAP error on %s: SASL error\n"
 #~ msgstr "IMAP hiba: %s: SASL hiba\n"
 
diff --git a/po/it.po b/po/it.po
index 47b170d..8b070f6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.13.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 17:52+0100\n"
 "PO-Revision-Date: 2015-12-14 17:53+0200\n"
 "Last-Translator: Luigi Votta <luigi.vtt at gmail.com>\n"
 "Language-Team: Italian <luigi.vtt at gmail.com>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -30,15 +30,15 @@ msgstr ""
 "Alcune finestre di composizione sono aperte.\n"
 "Chiudere tutte le finestre di composizione prima di modificare gli account."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Impossibile creare la cartella."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Modifica account"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -48,43 +48,43 @@ msgstr ""
 "checkbox nella colonna 'G' indica quali account saranno inclusi. Il testo in "
 "grassetto indica l'account predefinito."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr "_Imposta come account predefinito "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Gli account con cartelle remote non possono essere copiati."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia di %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Eliminare l'account '%s'?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Senza titolo)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Elimina account"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ricevi' preleva la posta dagli account selezionati"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -97,11 +97,11 @@ msgstr "'Ricevi' preleva la posta dagli account selezionati"
 msgid "Name"
 msgstr "Nome"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -154,10 +154,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -421,18 +421,18 @@ msgid "_Book"
 msgstr "_Rubrica"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "_Strumenti"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Aiuto"
 
@@ -471,13 +471,13 @@ msgstr "_Elimina rubrica"
 msgid "_Save"
 msgstr "_Salva"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "_Seleziona tutto"
 
@@ -486,7 +486,7 @@ msgid "C_ut"
 msgstr "_Taglia"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copia"
@@ -536,8 +536,8 @@ msgstr "Trova duplicati..."
 msgid "Edit custom attributes..."
 msgstr "Modifica attributi personalizzati..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_Info"
 
@@ -653,7 +653,7 @@ msgstr "È necessaria un'autenticazione (più) robusta"
 msgid "Sources"
 msgstr "Sorgenti"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Rubrica"
@@ -705,7 +705,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Eliminazione cartella"
 
@@ -818,7 +818,7 @@ msgid "Person"
 msgstr "Persona"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Cartella"
 
@@ -953,19 +953,20 @@ msgstr "Aggiorna indirizzo(i)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aggiornamento fallito. Cambiamenti non salvati in Directory."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9473
 msgid "Notice"
 msgstr "Avviso"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5680 src/compose.c:6203
+#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:750 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4892
 msgid "Warning"
 msgstr "Attenzione"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5621 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "Errore"
 
@@ -997,66 +998,66 @@ msgstr "Nome LDAP"
 msgid "Attribute Value"
 msgstr "Valore dell'attributo"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Nulla"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "un visualizzatore"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "un parser MIME"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "cartelle"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "filtraggio"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "un'interfaccia per la privacy"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "un notificatore"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "una utility"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "cose"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Questo plugin fornisce %s (%s), che è già fornito dal plugin %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "Plugin già caricato"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Errore durante l'allocazione di memoria per il plugin"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Questo modulo non è rilasciato con licenza compatibile GPL v3 o successiva."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Questo modulo è per Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1065,7 +1066,7 @@ msgstr ""
 "La versione di Claws Mail è più nuova della versione con cui il plugin '%s' "
 "è stato compilato."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1073,16 +1074,16 @@ msgstr ""
 "La versione di Claws Mail è più nuova della versione con cui il plugin è "
 "stato compilato."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "La versione di Claws Mail è troppo vecchia per il plugin '%s'"
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "La versione di Claws Mail è troppo vecchia per il plugin."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "Handshake SSL fallito\n"
 
@@ -1471,7 +1472,7 @@ msgstr "_Rimuovi"
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "M_essaggio"
 
@@ -1539,7 +1540,7 @@ msgstr "_A capo automatico"
 msgid "_Unwrapped"
 msgstr "_Non a capo automatico"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Seleziona tutto"
@@ -1604,7 +1605,7 @@ msgstr "Cancella riga"
 msgid "Delete to end of line"
 msgstr "Cancella fino alla fine della riga"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Trova"
@@ -1649,47 +1650,47 @@ msgstr "_Sistema di Privacy"
 msgid "_Priority"
 msgstr "_Priorità"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Codifica caratteri"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Europeo Occidentale"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltico"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Ebraico"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabo"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cirillico"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Cinese"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Thailandese"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Rubrica"
 
@@ -1697,7 +1698,7 @@ msgstr "_Rubrica"
 msgid "_Template"
 msgstr "_Modello"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Azio_ni"
 
@@ -1733,11 +1734,11 @@ msgstr "Mostra r_ighello"
 msgid "_Normal"
 msgstr "_Normale"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Tutti"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_Mittente"
 
@@ -1761,27 +1762,27 @@ msgstr "_Bassa"
 msgid "_Lowest"
 msgstr "_Minima"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automatico"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII a 7 bit (US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europeo Centrale (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Greco (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
@@ -1834,47 +1835,47 @@ msgstr "Il corpo del modello \"Inoltro\" contiene un errore alla riga %d."
 msgid "Fw: multiple emails"
 msgstr "I: email multiple"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Il corpo del modello \"Reindirizzo\" contiene un errore alla riga %d."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Ccn:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Rispondi a:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4935 src/compose.c:4937
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Newsgroup:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Followup-To:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "In Risposta a:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4932 src/compose.c:4940
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "A:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Non è stato possibile allegare un file (errore di conversione caratteri)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1889,73 +1890,73 @@ msgstr[1] ""
 "I seguenti file sono stati allegati: \n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Il \"Simbolo di citazione\" del modello non è valido."
 
-#: src/compose.c:3605
+#: src/compose.c:3602
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Impossibile ottenere la dimensione del file %s."
 
-#: src/compose.c:3616
+#: src/compose.c:3613
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Si sta per inserire un file di %s nel corpo del messaggio. Continuare?"
 
-#: src/compose.c:3619
+#: src/compose.c:3616
 msgid "Are you sure?"
 msgstr "Continuare?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3617 src/compose.c:10529 src/compose.c:11390
 msgid "_Insert"
 msgstr "_Inserisci"
 
-#: src/compose.c:3744
+#: src/compose.c:3741
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:3745
+#: src/compose.c:3742
 msgid "Empty file"
 msgstr "File vuoto"
 
-#: src/compose.c:3746
+#: src/compose.c:3743
 msgid "_Attach anyway"
 msgstr "_Allega comunque"
 
-#: src/compose.c:3755
+#: src/compose.c:3752
 #, c-format
 msgid "Can't read %s."
 msgstr "impossibile leggere %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3779
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4772 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Modificato]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4779 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composizione messaggio%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4782 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[nessun oggetto] - Composizione messaggio%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4784 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Composizione messaggio"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4811 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1963,51 +1964,51 @@ msgstr ""
 "Non è stato specificato un account da cui inviare posta.\n"
 "E` necessario selezionare un account di posta prima di inviare."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5031 src/compose.c:5063 src/compose.c:5105
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Invia"
 
-#: src/compose.c:5035
+#: src/compose.c:5032
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "L'unico destinatario è l'indirizzo CC predefinito. Inviare comunque?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5033 src/compose.c:5065 src/compose.c:5098 src/compose.c:5622
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Invia"
 
-#: src/compose.c:5067
+#: src/compose.c:5064
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "L'unico destinatario è l'indirizzo BCC predefinito. Inviare comunque?"
 
-#: src/compose.c:5084
+#: src/compose.c:5081
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5100 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Coda"
 
-#: src/compose.c:5104
+#: src/compose.c:5101
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Il campo Oggetto è vuoto. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5102 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Inviare comunque?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Accodare comunque?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5105 src/toolbar.c:425
 msgid "Send later"
 msgstr "Invia più tardi"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5158 src/compose.c:9993
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2017,7 +2018,7 @@ msgstr ""
 "\n"
 "Errore nella conversione del set di caratteri."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5161 src/compose.c:9996
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2027,7 +2028,7 @@ msgstr ""
 "\n"
 "Non è stato possibile ottenere la chiave di cifratura del destinatario."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5167 src/compose.c:9990
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2038,7 +2039,7 @@ msgstr ""
 "\n"
 "Errore nella firma: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5170
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2049,11 +2050,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5172
 msgid "Could not queue message for sending."
 msgstr "Non è stato possibile accodare il messaggio per l'invio."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5187 src/compose.c:5247
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2062,7 +2063,7 @@ msgstr ""
 "Utilizzare \"Invia messaggi in coda\" dalla finestra principale per "
 "riprovare."
 
-#: src/compose.c:5246
+#: src/compose.c:5243
 #, c-format
 msgid ""
 "%s\n"
@@ -2072,7 +2073,7 @@ msgstr ""
 "Utilizzare \"Invia messaggi in coda\" dalla finestra principale per "
 "riprovare."
 
-#: src/compose.c:5621
+#: src/compose.c:5618
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2083,7 +2084,7 @@ msgstr ""
 "nel set di caratteri %s specificato.\n"
 "Inviare come %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5676
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2096,72 +2097,73 @@ msgstr ""
 "\n"
 "Inviare comunque?"
 
-#: src/compose.c:5790
+#: src/compose.c:5787
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Non è stato possibile cifrare la mail: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5908
 msgid "Encryption warning"
 msgstr "Avviso di cifratura"
 
-#: src/compose.c:5912
+#: src/compose.c:5909
 msgid "C_ontinue"
 msgstr "_Continua"
 
-#: src/compose.c:5961
+#: src/compose.c:5958
 msgid "No account for sending mails available!"
 msgstr "Nessun account di posta disponibile!"
 
-#: src/compose.c:5970
+#: src/compose.c:5967
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "L'account selezionato non è NNTP: l'invio è impossibile."
 
-#: src/compose.c:6205
+#: src/compose.c:6202
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "L'allegato %s non esiste più. Ignorare?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6203 src/mainwindow.c:651 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Annulla invio"
 
-#: src/compose.c:6206
+#: src/compose.c:6203
 msgid "Ignore attachment"
 msgstr "Ignora allegato"
 
-#: src/compose.c:6246
+#: src/compose.c:6243
 #, c-format
 msgid "Original %s part"
 msgstr "Originale %s parti"
 
-#: src/compose.c:6824
+#: src/compose.c:6825
 msgid "Add to address _book"
 msgstr "Aggiungi alla _rubrica"
 
-#: src/compose.c:6985
+#: src/compose.c:6986
 msgid "Delete entry contents"
 msgstr "Elimina contenuti"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6990 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usare <tab> per completare automaticamente da rubrica"
 
-#: src/compose.c:7204
+#: src/compose.c:7212
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:7273
+#: src/compose.c:7281
 msgid "Save Message to "
 msgstr "Salva Messaggio in "
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7318 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2172,23 +2174,23 @@ msgstr "Salva Messaggio in "
 msgid "_Browse"
 msgstr "_Sfoglia"
 
-#: src/compose.c:7783
+#: src/compose.c:7791
 msgid "Hea_der"
 msgstr "Intes_tazione"
 
-#: src/compose.c:7788
+#: src/compose.c:7796
 msgid "_Attachments"
 msgstr "_Allegati"
 
-#: src/compose.c:7802
+#: src/compose.c:7810
 msgid "Othe_rs"
 msgstr "A_ltro"
 
-#: src/compose.c:7817
+#: src/compose.c:7825
 msgid "S_ubject:"
 msgstr "O_ggetto:"
 
-#: src/compose.c:8041
+#: src/compose.c:8049
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2197,19 +2199,19 @@ msgstr ""
 "Impossibile avviare il correttore ortografico.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8188
 msgid "_From:"
 msgstr "_Da:"
 
-#: src/compose.c:8197
+#: src/compose.c:8205
 msgid "Account to use for this email"
 msgstr "Account da usare per questo messaggio"
 
-#: src/compose.c:8199
+#: src/compose.c:8207
 msgid "Sender address to be used"
 msgstr "Indirizzo mittente da usare"
 
-#: src/compose.c:8365
+#: src/compose.c:8373
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2218,68 +2220,68 @@ msgstr ""
 "Non è possibile caricare il sistema di privacy '%s'. Non sarà possibile "
 "firmare o cifrare questo messaggio."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Nessuno"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8575 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Il corpo del modello contiene un errore alla riga %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8691
 msgid "Template From format error."
 msgstr "Errore di formato in From del modello."
 
-#: src/compose.c:8701
+#: src/compose.c:8709
 msgid "Template To format error."
 msgstr "Errore di formato in To del modello."
 
-#: src/compose.c:8719
+#: src/compose.c:8727
 msgid "Template Cc format error."
 msgstr "Errore di formato in Cc del modello."
 
-#: src/compose.c:8737
+#: src/compose.c:8745
 msgid "Template Bcc format error."
 msgstr "Errore di formato in Ccn del modello."
 
-#: src/compose.c:8755
+#: src/compose.c:8763
 msgid "Template Reply-To format error."
 msgstr "Errore di formato in In-Risposta-a del modello."
 
-#: src/compose.c:8774
+#: src/compose.c:8782
 msgid "Template subject format error."
 msgstr "Errore di formato in Oggetto del modello."
 
-#: src/compose.c:9043
+#: src/compose.c:9051
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:9058
+#: src/compose.c:9066
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:9132
+#: src/compose.c:9140
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:9149
+#: src/compose.c:9157
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:9190
+#: src/compose.c:9198
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:9210
+#: src/compose.c:9218
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:9211
+#: src/compose.c:9219
 msgid "File name"
 msgstr "Nome file"
 
-#: src/compose.c:9462
+#: src/compose.c:9470
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2290,16 +2292,16 @@ msgstr ""
 "Forzare la conclusione del processo?\n"
 "group id del processo: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9959 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Claws Mail necessita di una connessione di rete per poter inviare mail."
 
-#: src/compose.c:9977
+#: src/compose.c:9985
 msgid "Could not queue message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:9979
+#: src/compose.c:9987
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2310,15 +2312,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10165
 msgid "Could not save draft."
 msgstr "Impossibile salvare la bozza."
 
-#: src/compose.c:10161
+#: src/compose.c:10169
 msgid "Could not save draft"
 msgstr "Impossibile salvare la bozza"
 
-#: src/compose.c:10162
+#: src/compose.c:10170
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2326,24 +2328,24 @@ msgstr ""
 "Impossibile salvare la bozza.\n"
 "Annullare la chiusura o scartare il messaggio?"
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Cancel exit"
 msgstr "_Annulla chiusura"
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Discard email"
 msgstr "_Scarta messaggio"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10332 src/compose.c:10346
 msgid "Select file"
 msgstr "Seleziona file"
 
-#: src/compose.c:10352
+#: src/compose.c:10360
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Impossibile leggere il file '%s'."
 
-#: src/compose.c:10354
+#: src/compose.c:10362
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2352,54 +2354,54 @@ msgstr ""
 "Il file '%s' contiene caratteri non validi\n"
 "per la codifica corrente, l'inserzione potrebbe non essere corretta."
 
-#: src/compose.c:10441
+#: src/compose.c:10449
 msgid "Discard message"
 msgstr "Scarta messaggio"
 
-#: src/compose.c:10442
+#: src/compose.c:10450
 msgid "This message has been modified. Discard it?"
 msgstr "Il messaggio è stato modificato. Scartarlo?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Scarta"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10451 src/compose.c:10455
 msgid "_Save to Drafts"
 msgstr "_Salva nelle Bozze"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Salva modifiche"
 
-#: src/compose.c:10446
+#: src/compose.c:10454
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Il messaggio è stato modificato. Salvare le ultime modifiche?"
 
-#: src/compose.c:10447
+#: src/compose.c:10455
 msgid "_Don't save"
 msgstr "_Non salvare"
 
-#: src/compose.c:10518
+#: src/compose.c:10526
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Applicare il modello '%s'?"
 
-#: src/compose.c:10520
+#: src/compose.c:10528
 msgid "Apply template"
 msgstr "Applica modello"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10529 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:11379
+#: src/compose.c:11387
 msgid "Insert or attach?"
 msgstr "Inserire o allegare?"
 
-#: src/compose.c:11380
+#: src/compose.c:11388
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2407,16 +2409,16 @@ msgstr ""
 "Inserire il contenuto del (dei) file nel corpo del messaggio, o allegarlo "
 "alla mail?"
 
-#: src/compose.c:11382
+#: src/compose.c:11390
 msgid "_Attach"
 msgstr "_Allega"
 
-#: src/compose.c:11599
+#: src/compose.c:11607
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Errore di formato per carattere di citazione alla riga %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11902
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2633,8 +2635,8 @@ msgid " Check File "
 msgstr "Verifica File"
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "File"
 
@@ -2782,7 +2784,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2963,7 +2965,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Massimo numero di record da restituire nella ricerca."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Generale"
 
@@ -3097,15 +3099,15 @@ msgid "Stylesheet"
 msgstr "Foglio di stile"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Nessuno"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Predefinito"
 
@@ -3607,27 +3609,27 @@ msgstr "Cestino"
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Elaborazione in corso (%s)\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copia di %s in %s in corso.\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Spostamento di %s in %s in corso.\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aggiornamento cache per %s in corso"
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Elaborazione messaggi in corso."
 
@@ -3649,11 +3651,11 @@ msgstr "Seleziona cartella"
 msgid "NewFolder"
 msgstr "Nuova Cartella"
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215
+#: src/imap_gtk.c:271 src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:424 src/plugins/rssyl/rssyl_cb_menu.c:206
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' non può essere incluso nel nome di cartella."
@@ -3661,7 +3663,7 @@ msgstr "'%c' non può essere incluso nel nome di cartella."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La cartella '%s' esiste già."
@@ -3685,7 +3687,7 @@ msgstr "Contrassegna ricorsi_vamente tutti come letti"
 msgid "R_un processing rules"
 msgstr "Esegui reg_ole di elaborazione"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_Cerca cartella..."
 
@@ -3743,12 +3745,12 @@ msgstr "Contrassegnare come letti tutti i messaggi nella cartella?"
 msgid "Mark all as read"
 msgstr "Contrassegna tutti come letti"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Scansione cartella %s%c%s..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Analisi cartella %s..."
@@ -3795,7 +3797,7 @@ msgstr "Apertura cartella %s..."
 msgid "Folder could not be opened."
 msgstr "Non è stato possibile aprire la cartella."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
@@ -4013,7 +4015,6 @@ msgstr ""
 "Informazioni di Sistema\n"
 
 #: src/gtk/about.c:168
-#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
@@ -4022,7 +4023,6 @@ msgstr ""
 "Sistema Operativo: %s %s (%s)"
 
 #: src/gtk/about.c:177
-#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
@@ -4031,7 +4031,6 @@ msgstr ""
 "Sistema Operativo: %s"
 
 #: src/gtk/about.c:186
-#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
@@ -4039,7 +4038,7 @@ msgstr ""
 "Localizzazione: %s (set caratteri: %s)\n"
 "Sistema Operativo: sconosciuto"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "Il gruppo di Claws Mail"
 
@@ -4341,7 +4340,6 @@ msgid "Replace unknown word"
 msgstr "Sostituisci parola sconosciuta"
 
 #: src/gtk/gtkaspell.c:1460
-#, c-format
 msgid "Replace \"%s\" with: "
 msgstr "Sostituisci \"%s\" con: "
 
@@ -4930,8 +4928,8 @@ msgstr "Legenda Icone"
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr ""
-"Le seguenti icone sono utilizzate per mostrare lo stato di messaggi e "
-"cartelle:"
+"Le seguenti icone sono utilizzate per mostrare lo "
+"stato di messaggi e cartelle:"
 
 #: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
@@ -5035,9 +5033,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugin"
 
@@ -5054,11 +5052,10 @@ msgid "Description"
 msgstr "Descrizione"
 
 #: src/gtk/pluginwindow.c:374
-#, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr ""
-"Per maggiori informazioni sui plugin fare riferimento al %ssito di Claws Mail"
-"%s."
+"Per maggiori informazioni sui plugin fare riferimento al %ssito di "
+"Claws Mail%s."
 
 #: src/gtk/pluginwindow.c:415
 msgid "Click here to load one or more plugins"
@@ -5076,14 +5073,14 @@ msgstr "Plugin caricati"
 msgid "Page Index"
 msgstr "Indice pagina"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Nascondi"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5524,237 +5521,195 @@ msgstr "Dimensione file:"
 msgid "Load Image"
 msgstr "Carica Immagine"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "Connessione IMAP4 interrotta\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
-#, c-format
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 msgid "IMAP error on %s:"
 msgstr "Errore IMAP su %s:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr "autenticato\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr "non autenticato\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr "stato errato\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr "errore di stream\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 "Errore IMAP su %s: errore di parsing (molto probabilmente il server non "
 "rispetta la RFC)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr "connessione rifiutata\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr "errore di memoria\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr "errore fatale\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr ""
-"errore di protocollo (molto probabilmente il server non rispetta la RFC)\n"
+"errore di protocollo (molto probabilmente il server non "
+"rispetta la RFC)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr "connessione non accettata\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr "errore APPEND\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr "errore NOOP\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr "errore LOGOUT\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr "errore CAPABILITY\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr "errore CHECK\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr "errore CLOSE\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr "errore EXPUNGE\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr "errore COPY\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr "errore UID COPY\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr "errore CREATE\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr "errore DELETE\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr "errore EXAMINE\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr "errore FETCH\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr "errore UID FETCH\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr "errore LIST\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr "errore LOGIN\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr "errore LSUB\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr "errore RENAME\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr "errore SEARCH\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr "errore UID SEARCH\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr "errore SELECT\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr "errore STATUS\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr "errore STORE\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr "errore UID STORE\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr "errore SUBSCRIBE\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr "errore UNSUBSCRIBE\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr "errore STARTTLS\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr "errore INVAL\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr "errore EXTENSION\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr "errore SASL\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr "errore SSL\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+msgid " Unknown error [%d]\n"
 msgstr "Errore sconosciuto [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5766,7 +5721,7 @@ msgstr ""
 "Il login CRAM-MD5 funziona solo se libetpan è stata compilata con il "
 "supporto SASL, e se è installato il plugin CRAM-MD5 SASL."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5778,7 +5733,7 @@ msgstr ""
 "Il login DIGEST-MD5 funziona solo se libetpan è stata compilata con il "
 "supporto SASL, e se è installato il plugin DIGEST-MD5 SASL."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5790,51 +5745,38 @@ msgstr ""
 "Il login SCRAM-SHA-1 funziona solo se libetpan è stata compilata con il "
 "supporto SASL, e se è installato il plugin SCRAM SASL."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"Il login CRAM-MD5 funziona solo se libetpan è stata compilata con il "
-"supporto SASL, e se è installato il plugin CRAM-MD5 SASL."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Connessione con %s fallita: login rifiutato.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Connessione con %s fallita: login rifiutato.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Connessione con %s fallita"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "La connessione IMAP4 con %s è stata interrotta. Nuova connessione in corso.\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail richiede una connessione di rete per accedere al server IMAP."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Connessione non sicura"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5848,104 +5790,104 @@ msgstr ""
 "Continuare la connessione al server, nonostante la comunicazione sia "
 "insicura?"
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "Con_tinua la connessione"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Account '%s': Connessione con il server IMAP4: %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "Impossibile avviare una sessione TLS.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Non è stato possibile effettuare il login al server IMAP %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Non è stato possibile effettuare il login al server IMAP %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Aggiunta dei messaggi in corso."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Copia dei messaggi in corso."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "impossibile impostare flag eliminati\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "impossibile cancellare\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Ricerca cartelle non sottoscritte in %s in corso"
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Ricerca sotto-cartelle di %s in corso"
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "impossibile creare la casella di posta: fallito LIST\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "impossibile creare la casella di posta\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossibile rinominare la casella di posta %s in %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "impossibile eliminare la casella di posta\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "Fallito LIST\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Applicazione flag ai messaggi in corso."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "Il server richiede il TLS per il login.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Impossibile aggiornare le capabilities.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5954,20 +5896,20 @@ msgstr ""
 "La connessione con %s è fallita: il server richiede il TLS, ma Claws Mail è "
 "stato compilato senza supporto TLS.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Il login al server è disabilitato.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Prelievo del messaggio in corso."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "impossibile impostare i flag eliminati: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6019,7 +5961,7 @@ msgstr "S_ottoscrizioni"
 msgid "_Subscribe..."
 msgstr "_Sottoscrivi"
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "_Cancella sottoscrizione..."
 
@@ -6056,20 +5998,20 @@ msgstr "Eredita proprietà dalla cartella superiore"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Inserire il nuovo nome per '%s':"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Rinomina cartella"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6092,7 +6034,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella '%s'."
@@ -6119,7 +6061,7 @@ msgstr "_Cerca"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Scegliere una sotto-cartella di %s da sottoscrivere: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Sottoscrivi"
 
@@ -6154,8 +6096,8 @@ msgstr "sottoscrivere"
 msgid "unsubscribe"
 msgstr "annullare la sottoscrizione per"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428
+#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Applica alle sottocartelle"
 
@@ -6350,56 +6292,56 @@ msgstr "Seleziona file di Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importa file di Pine nella rubrica"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail richiede una connessione di rete per ricevere le mail."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s fallito\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Ricezione di nuovi messaggi"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Attesa"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Annullato"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Ricezione in corso"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Fatto (%d messaggio (%s) ricevuto)"
 msgstr[1] "Fatto (%d messaggi (%s) ricevuti)"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Fatto (nessun nuovo messaggio)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Bloccato"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Timeout"
 
@@ -6435,7 +6377,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
@@ -6460,7 +6402,7 @@ msgstr "Ricezione del numero di messaggi nuovi (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Chiusura"
 
@@ -6511,7 +6453,7 @@ msgstr "Errore del socket."
 msgid "Socket error on connection to %s:%d."
 msgstr "Errore del socket durante la connessione con %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto"
 
@@ -6533,11 +6475,11 @@ msgstr ""
 "La casella di posta è bloccata:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6546,7 +6488,7 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6900,815 +6842,810 @@ msgstr "NetworkManager: connesso alla rete.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: non connesso alla rete.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_File"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "_Visualizza"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Configurazione"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "_Aggiungi casella di posta"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Cambia l'ordine delle caselle di posta..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "_Importa file mbox..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "_Esporta verso file mbox..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "Esp_orta la selezione verso file mbox..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "S_vuota tutte le cartelle cestino"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "Salva _mail come..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "Salva _parte come..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Imposta pagina..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "S_tampa"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "Sincronizza cartelle"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "Es_ci"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "_Seleziona discussione"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "Cerca nel _messaggio corrente"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_Ricerca rapida"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "_Mostra o nascondi"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "_Barra degli strumenti"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "_Imposta colonne visualizzate"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "Nell'elenco _cartelle..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "Nell'elenco _messaggi..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "_Struttura"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Ordina"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "_Raggruppa per oggetto"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "_Espandi tutte le discussioni"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "_Compatta tutte le discussioni"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Vai a"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "Messaggio _precedente"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "Messaggio _seguente"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Precedente messaggio _non letto"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "_Successivo messaggio non letto"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Precedente messaggio nuo_vo"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Successivo messaggio nuov_o"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Pr_ecedente messaggio contrassegnato"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Success_ivo messaggio contrassegnato"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Precedente messaggio etic_hettato"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Successi_vo  messaggio etichettato"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Precedente messaggio _aperto"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Successivo messa_ggio aperto"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Messaggio s_uperiore"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Successiva _cartella con messaggi non letti"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Altra cartella..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Parte successiva"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Parte precedente"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Scorri messaggio"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Riga precedente"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Riga successiva"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Pagina precedente"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Pagina successiva"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Decodifica"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "Apri in una nuova _finestra"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "So_rgente del messaggio"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Parte del messaggio"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Mostra come testo"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Apri"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Apri con..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Testo con citazione"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "_Aggiorna sommario"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "Rice_zione"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Ricevi dall'account _corrente"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Ricevi da _tutti gli account"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "Annul_la la ricezione"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "_Invia i messaggi in coda"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "Componi _nuovo messaggio"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Componi messaggio newsgroup"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Rispondi"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Ris_pondi a"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Mailing _list"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Follow-up e rispondi a"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "I_noltra come allegato"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Re_dirigi"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "Mailing-_List"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Componi"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Cancella sottoscrizione"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Mostra archivio"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "Contatto responsabile"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "_Sposta..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "S_posta nel cestino"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "_Elimina..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Sposta discussione nel _cestino"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "Elimina _discussione"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Elimina un messaggio news"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "Contrasseg_na"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_Togli contrassegno"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Contra_ssegna come non letto"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Contrassegna come _letto"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Contrassegna tutti come letti"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignora discussione"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Segui discussione"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Osserva discussione"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Non osservare discussione"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Contrassegna come s_pam"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Contrassegna come _non-spam"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Blocca"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Sblocca"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "Colore etic_hetta"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Etiche_tte"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "Ri-_modifica"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Controlla firma"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Aggiungi mittente alla _rubrica"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "_Raccogli indirizzi"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "Dalla cartella _attuale..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "Dai messaggi _selezionati..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "_Filtra tutti i messaggi nella cartella"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Esegui regole di _elaborazione di cartella"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "_Crea filtro"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automaticamente"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "Dal campo _Da"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Dal campo _A"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "Dal campo _Oggetto"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Crea regola elaborazione"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Lista _URL.."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "_Controlla nuovi messaggi in tutte le cartelle"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Elimina messaggi _duplicati"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "Nella cartella selezionata"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "In tutte le cartelle"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "_Esegui"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "Sv_uota"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "Cer_tificati SSL"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "Log di _filtraggio"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "Log di _rete"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "_Dimentica tutte le password di sessione"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "_Dimentica tutte le password di sessione"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "Cambia _account attivo"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "_Preferenze per account attivo..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Crea _nuovo account..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "_Modifica account..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "P_referenze..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "Pre-_elaborazione..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "Post-e_laborazione..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Filtraggio..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "_Modelli..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Azioni..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "_Tag..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "_Plugin..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Manuale"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "FAQ _in linea creata dagli utenti"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "Legenda _icone"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Imposta come predefinito"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "Modalità offline"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "_Barra dei menu"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "_Vista messaggi"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "Barra di _stato"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Intestazioni colonne"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "_Visualizza discussione"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Nascondi discussioni lette"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "_Nascondi messaggi letti"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Nascondi messaggi eliminati"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "_Schermo intero"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Mostra tutte le _intestazioni"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Compatta tutto"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Compatta dal livello _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Compatta dal livello _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Testo _sotto le icone"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Testo _accanto alle icone"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Solo _icone"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "Solo _testo"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Standard"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Tre colonne"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "Messaggio _largo"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "L_ista messaggi larga"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "S_chermo piccolo"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "Per _numero"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "Per d_imensione"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "Per _data"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Per data di discussione"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "Per _Oggetto"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "per _etichetta colorata"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Per tag"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "Per _contrassegno"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "Per _stato"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "Per a_llegato"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Per punteggio"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Per bloccati"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "_Non ordinare"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Discendente"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_Rileva automaticamente"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Applica tag..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "Si sono verificati alcuni errori. Cliccare quì per visualizzare il log."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Modalità online. Cliccare per lavorare offline"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "Modalità offline. Cliccare per lavorare online"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Selezione account"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Log di rete"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Log di debug filtri/regole"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "log dei filtri abilitato\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "log dei filtri disabilitato\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "nessuno"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Eliminare tutti i messaggi nei cestini?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Non chiudere"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Aggiungi casella di posta"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7718,18 +7655,18 @@ msgstr ""
 "Se è specificata una casella esistente, essa sarà\n"
 "automaticamente analizzata."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La casella di posta '%s' esiste già."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Casella di posta"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7739,79 +7676,79 @@ msgstr ""
 "Può darsi che alcuni file esistano già, o che non si abbiano i permessi di "
 "scrittura."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "Non è consentito inviare messaggi"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "L'importazione di mbox non è riuscita."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "L'esportazione verso mbox non è riuscita."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Uscire da Claws Mail?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Sincronizzazione cartella"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Sincronizzare le cartelle?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Sincronizza"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione di messaggi duplicati..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Eliminato %d messaggio duplicato in %d cartella(e).\n"
 msgstr[1] "Eliminati %d messaggi duplicati in %d cartella(e).\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Elaborazioni da applicare prima dei filtri di cartella"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Elaborazioni da applicare dopo i filtri di cartella"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Configurazione filtri"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Impossibile impostare Claws Mail come client predefinito: percorso "
 "eseguibile non trovato."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail è stato impostato come client predefinito."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Impossibile impostare Claws Mail come client predefinito: impossibile "
 "scrivere nel registro."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7891,7 +7828,7 @@ msgstr "Sovrascrivi file mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Il file esiste già. Sovrascriverlo?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Sovrascrivi"
@@ -7937,19 +7874,19 @@ msgstr "Raggiunto la fine del messaggio: continuare dall'inizio?"
 msgid "Search finished"
 msgstr "Ricerca terminata"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Componi _nuovo messaggio"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista messaggio"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<Nessun Percorso-di-Ritorno trovato>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7964,11 +7901,11 @@ msgstr ""
 "Percorso di ritorno (Return Path): %s\n"
 "Si raccomanda di non inviare la ricevuta di ritorno."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Non inviare"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7980,47 +7917,47 @@ msgstr ""
 "indirizzato ufficialmente a te.\n"
 "Si raccomanda di non inviare la ricevuta di ritorno."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Prelievo del messaggio in corso (%s)."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Non è stato possibile decifrare: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Messaggio non conforme allo standard MIME. Potrebbe essere visualizzato male."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Salva come"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Sovrascrivere il file esistente?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Non è stato possibile salvare il file '%s'."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Mostra tutti %s."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Solo il primo megabyte di testo è mostrato."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8028,19 +7965,19 @@ msgstr ""
 "È arrivata la ricevuta di ritorno per questo messaggio: il destinatario l'ha "
 "visualizzato."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Per questo messaggio è stata richiesta una ricevuta di ritorno."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Questo messaggio richiede una ricevuta di ritorno"
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Invia ricevuta"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8048,7 +7985,7 @@ msgstr ""
 "Questo messaggio è stato ricevuto parzialmente,\n"
 "ed è stato cancellato dal server."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8057,15 +7994,15 @@ msgstr ""
 "Questo messaggio è stato ricevuto parzialmente;\n"
 "è %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Contrassegna per il download"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Contrassegna per l'eliminazione"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8074,12 +8011,12 @@ msgstr ""
 "Questo messaggio è stato ricevuto parzialmente;\n"
 "è %s e verrà scaricato."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Togli contrassegno"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8088,11 +8025,11 @@ msgstr ""
 "Questo messaggio è stato ricevuto parzialmente;\n"
 "è %s e verrà cancellato."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Ricevuta di ritorno"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8102,19 +8039,19 @@ msgstr ""
 "Più di un account usa l'indirizzo a cui è stato inviato il messaggio.\n"
 "Selezionare quale account utilizzare per inviare la ricevuta di ritorno:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Invia ricevuta"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Non è possibile stampare: il messaggio non contiene alcun testo."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8122,7 +8059,7 @@ msgstr ""
 "\n"
 "  Non ci sono messaggi in questa cartella"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8130,7 +8067,7 @@ msgstr ""
 "\n"
 "  Il messaggio è stato eliminato"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8138,16 +8075,16 @@ msgstr ""
 "\n"
 "  Il messaggio è stato eliminato o spostato  in un'altra cartella"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "Si è verificato un errore durante l'apprendimento.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Spostamento dei messaggi in corso"
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Eliminazione messaggi in corso"
 
@@ -8249,7 +8186,8 @@ msgid "Go back to email"
 msgstr "Torna alla mail"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190
+#: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Non è stato possibile salvare la parte di un messaggio multi-parte: %s"
@@ -8327,80 +8265,80 @@ msgstr "Dimensione:"
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "La connessione NNTP con %s:%d è stata interrotta.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Account '%s': Connessione in corso con il server NNTP: %s:%d.\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Errore d'accesso a %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan non supporta il codice di ritorno 480: per ora si decide di "
 "continuare\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Fallita modalità lettura, tuttavia si continua\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Errore nel creare la sessione con %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Errore di autenticazione a %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail richiede una connessione di rete per accedere al server News."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "non è stato possibile selezionare il gruppo: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "non è stato possibile impostare il gruppo: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervallo di articoli non valido: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "non è stato possibile ricevere l'xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "ricezione in corso di xover %d - %d in %s\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "non è stato possibile ricevere l'xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "riga xover non valida\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9115,7 +9053,6 @@ msgid "Attachment handling"
 msgstr "Gestione allegato"
 
 #: src/plugins/attachwarner/attachwarner.c:217
-#, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
 "attached. Mention appears on line %d, which begins with text: %s\n"
@@ -9191,7 +9128,8 @@ msgstr ""
 "Non controllare per allegati mancanti in caso di messaggi inoltrati o "
 "rediretti"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Firme"
 
@@ -9301,12 +9239,14 @@ msgstr ""
 "\n"
 "Le opzioni si trovano in /Configurazione/Preferenze/Plugins/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Rilevamento Spam"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Addestramento spam"
@@ -9907,7 +9847,7 @@ msgstr "Il CSS in questo file sarà applicato a tutte le parti di HTML"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "_Sfoglia"
@@ -9916,93 +9856,93 @@ msgstr "_Sfoglia"
 msgid "Select stylesheet"
 msgstr "Seleziona foglio di stile"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Il caricamento di contenuto remoto è disabilitato."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Carica immagini"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Abilita contenuto remoto"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Abilita javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Abilita plugin"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Abilita Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Apri collegamenti con browser esterno"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Si è verificato un errore: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s è un feed malformato o non supportato"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Cerca nel Web"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Apri in visualizzatore"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Apri in visualizzatore (abilitato contenuto remoto)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Apri nel browser"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Apri immagine"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Copia collegamento"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Download Link"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Salva immagine come"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Copia immagine"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Importa feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy Visualizzatore HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10095,11 +10035,11 @@ msgstr ""
 "Aggiunge l'intestazione X-FETCH-TIME contenente la data e l'ora di recupero "
 "del messaggio, in formato RCF822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "Plugin GData: Richiesta Autorizzazione"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10117,30 +10057,30 @@ msgstr ""
 "autorizzazione. Inserire il codice nel campo in basso per garantire a Claws "
 "Mail l'accesso alla lista dei contatti su Google."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Passo 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 "Cliccare quì per aprire in un browser, la pagina di autorizzazione di Google."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Passo 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Inserire il codice:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Plugin GData: Errore interrogando i contatti: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10148,50 +10088,50 @@ msgstr[0] "Aggiunto %d di"
 msgstr[1] "Aggiunti %d di"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "%d contatto nella cache"
 msgstr[1] "%d contatti nella cache"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Plugin GData: Avvio interrogazione asincrona dei contatti\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Plugin GData: Errore interrogando i gruppi: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "Plugin GData: Gruppi ricevuti\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Plugin GData: Avvio interrogazione asincrona dei gruppi\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Plugin GData: Errore di autorizzazione: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "Plugin GData: Autorizzazione riuscita\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Plugin GData: Avvio autorizzazione interattiva\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 "Plugin GData: Ottenuto codice di autorizzazione, avvio richiesta "
 "autorizzazione\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10199,26 +10139,26 @@ msgstr ""
 "Plugin GData: Nessun codice di autorizzazione ricevuto, richiesta "
 "autorizzazione cancellata\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Plugin GData: Errore di refresh autorizzazione: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Plugin GData: Refresh autorizzazione riuscito\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Plugin GData: Tentativo di refresh autorizzazione in corso\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autenticazione"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Nome utente:"
 
@@ -10261,7 +10201,7 @@ msgstr ""
 "\n"
 "Suggerimenti a <berndth at gmx.de> sono graditi."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "Integrazione di GData"
 
@@ -10322,7 +10262,6 @@ msgid "Error reading cache stats"
 msgstr "Errore durante la lettura della statistiche"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
-#, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr "Uso di %s in %d file, %d directory, %d altri e %d errori"
 
@@ -10486,7 +10425,7 @@ msgstr "Scadenza richiesta"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "secondi"
@@ -10776,28 +10715,28 @@ msgid "Specify authentication"
 msgstr "Specifica qutenticazione"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "ID utente"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Password"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automatico"
 
@@ -11429,8 +11368,8 @@ msgstr "Inserire password"
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr ""
-"Questo documento è bloccato e richiede una password prima di poter essere "
-"aperto."
+"Questo documento è bloccato e richiede una password "
+"prima di poter essere aperto."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1345
 #, c-format
@@ -11556,7 +11495,8 @@ msgstr "[nessun id utente]"
 
 #: src/plugins/pgpcore/passphrase.c:261
 msgid "Please enter the passphrase for the new key:"
-msgstr "Inserire la passphrase per la nuova chiave:"
+msgstr ""
+"Inserire la passphrase per la nuova chiave:"
 
 #: src/plugins/pgpcore/passphrase.c:264
 msgid "Passphrases did not match.\n"
@@ -11564,7 +11504,8 @@ msgstr "Le passphrase non coincidono.\n"
 
 #: src/plugins/pgpcore/passphrase.c:268
 msgid "Please re-enter the passphrase for the new key:"
-msgstr "Reinserire la passphrase per la nuova chiave:"
+msgstr ""
+"Reinserire la passphrase per la nuova chiave:"
 
 #: src/plugins/pgpcore/passphrase.c:273
 msgid "Please enter the passphrase for:"
@@ -11711,7 +11652,8 @@ msgstr "Scadenza dopo"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Impostando a '0' manterrà la passphrase per l'intera sessione"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minuti"
@@ -11830,7 +11772,6 @@ msgid "Encrypt to %s <%s>"
 msgstr "Cifra %s <%s>"
 
 #: src/plugins/pgpcore/select-keys.c:607
-#, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
 "If you choose to encrypt the message with this key, you don't\n"
@@ -11872,160 +11813,164 @@ msgstr ""
 "PGP Core: Non è stato possibile recuperare la chiave - nessun gpg-agent in "
 "esecuzione."
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "La firma non può essere controllata - %s."
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Firma valida, da \"%s\" [definitiva]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Firma valida, da \"%s\" [totale]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Firma valida, da \"%s\" [parziale]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida, da \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "Chiave 0x%s non disponibile per verificare questa firma"
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Firma valida da \"%s\", ma la chiave è scaduta"
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Firma valida da \"%s\", ma la chiave è stata revocata"
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Firma errata, da \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "Chiave 0x%s non disponibile per verificare questa firma"
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "La firma non è stata controllata"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "Errore nel controllo della firma: nessuno stato\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Errore nel controllo della firma: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Firma realizzata su %s usando %s ID chiave %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Firma valida da uid \"%s\" (Validità: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Chiave di uid \"%s\" scaduta\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Firma scaduta da uid \"%s\" (Validità: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Chiave di uid \"%s\" revocata\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Firma ERRATA da \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
-#, c-format
+#: src/plugins/pgpcore/sgpgme.c:370
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid \"%s\" (Validità: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "Revocata"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Fuducia proprietario: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "Nessuna chiave!"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale chiave primaria:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "ATTENZIONE: L'indirizzo \"%s\" del firmatario non corrisponde all'elemento "
 "nel DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "L'indirizzo verificato del firmatario è \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Non è stato possibile ottenere i dati dal messaggio, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Non è stato possibile inizializzare i dati, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "La specifica della chiave privata è ambigua"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Chiave privata non trovata (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Errore nell'impostare la chiave privata: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Il protocollo '%s' di gpgme è inutilizzabile: il motore '%s' non è "
 "installato correttamente."
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12034,12 +11979,12 @@ msgstr ""
 "Il protocollo '%s' di gpgme è inutilizzabile: è installato il motore '%s' "
 "versione %s, ma è richiesta la versione %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Il protocollo '%s' di gpgme è inutilizzabile (problema sconosciuto)"
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12047,7 +11992,7 @@ msgstr ""
 "GnuPG non è installato correttamente, o necessita di un upgrade.\n"
 "Il supporto per OpenPGP è disabilitato."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12055,11 +12000,11 @@ msgstr ""
 "È necessario salvare le informazioni dell'account con \"OK\" prima di poter "
 "generare un nuovo paio di chiavi.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "Nessuna chiave PGP trovata"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -12069,12 +12014,12 @@ msgstr ""
 "che non sarà possibile firmare le mail o ricevere mail cifrate.\n"
 "Creare ora un nuovo paio di chiavi?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Non è stato possibile generare un nuovo paio di chiavi: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12082,12 +12027,12 @@ msgstr ""
 "Generazione del nuovo paio di chiavi in corso. Muovere il mouse per "
 "contribuire alla generazione di entropia..."
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr ""
 "Non è stato possibile generare un nuovo paio di chiavi: errore sconosciuto"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12100,19 +12045,19 @@ msgstr ""
 "\n"
 "Esportare verso un keyserver?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "Chiave generata"
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "Chiave esportata."
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "Non è stato possibile esportare la chiave."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "L'esportazione chiave non è implementata in Windows."
 
@@ -12346,9 +12291,9 @@ msgstr "Mostra terminale di Python..."
 msgid "Refresh"
 msgstr "Refresh"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Sfoglia"
 
@@ -12643,7 +12588,8 @@ msgstr "Contrassegna sempre come nuovo"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:344
 msgid "Only mark it as new if its text has changed"
-msgstr "Contrassegna come nuovo solo se il testo è stato modificato"
+msgstr "Contrassegna come nuovo solo se il testo "
+"è stato modificato"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "Never mark it as new"
@@ -12666,7 +12612,7 @@ msgstr ""
 "feed modifichi il titolo del feed."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Verifica la validità del certificato SSL"
 
@@ -12705,7 +12651,8 @@ msgstr "Intervallo di refresh"
 #: src/plugins/rssyl/rssyl_feed_props.c:476
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr ""
-"Impostare a 0 per disabilitare l'aggiornamento automatico di questo feed"
+"Impostare a 0 per disabilitare l'aggiornamento automatico di questo "
+"feed"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:528
 msgid "_OK"
@@ -12827,17 +12774,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Aggiornamento dei commenti per '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Richiesta autorizzazione)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (Non autorizzato)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (Non trovato)"
 
@@ -12874,7 +12821,6 @@ msgid "Untitled feed"
 msgstr "Feed senza titolo"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:154
-#, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSS: Probabile feed non valido senza titolo, in %s.\n"
 
@@ -12976,21 +12922,21 @@ msgstr ""
 "Notare che le intestazioni di email, come Oggetto, non sono cifrati dal "
 "sistema S/MIME."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Segnalazione spam in corso"
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Segnala sul web come spam..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "Segnalazione spam"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13006,19 +12952,19 @@ msgstr ""
 " * spamcop.net\n"
 " * sistema di nomina di lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Segnalazione spam"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Inoltra a:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Password:"
 
@@ -13223,7 +13169,8 @@ msgid "Show"
 msgstr "Mostra"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "giorni"
 
@@ -13316,7 +13263,7 @@ msgid "Next month"
 msgstr "Mese successivo"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13350,7 +13297,7 @@ msgstr ""
 "calendari, rendere disponibili informazioni sul proprio stato (libero/"
 "occupato) e prelevare queste informazioni da altri."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -13416,7 +13363,8 @@ msgstr "(evento ricorrente)"
 
 #: src/plugins/vcalendar/vcalendar.c:572
 msgid "(this event is part of a recurring event)"
-msgstr "(questo evento è parte di un evento ricorrente)"
+msgstr ""
+"(questo evento è parte di un evento ricorrente)"
 
 #: src/plugins/vcalendar/vcalendar.c:752
 msgid "You have received an answer to an unknown meeting proposal."
@@ -13532,63 +13480,63 @@ msgstr "Inivitati:"
 msgid "Action:"
 msgstr "Da fare:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Nuovo incontro..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Esporta calendario..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_Sottoscrivi webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "_Rinomina..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "_Aggiorna sottoscrizioni"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "Visualizzazione _lista"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "Visualizzazione _settimana"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "Visualizzazione _mese"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Incontri"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "nel passato"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "oggi"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "domani"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "questa settimana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "più tardi"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13597,17 +13545,17 @@ msgstr ""
 "\n"
 "Questi sono gli eventi pianificati %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Scadenza (%d secondi) della connessione a %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Errore %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13620,7 +13568,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13633,7 +13581,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13644,7 +13592,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13655,46 +13603,46 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Non è stato possibile creare la directory %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws Mail richiede un accesso alla rete per poter aggiornare il feed di "
 "Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Prelievo di calendar per %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "nuova sottoscrizione"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 "Claws Mail richiede un accesso alla rete per poter aggiornare la "
 "sottoscrizione."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Sottoscrivi WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Inserire l'URL di WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Non è stato possibile effettuare il parsing dell'URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Cancellare la sottoscrizione?"
 
@@ -14071,83 +14019,83 @@ msgstr ""
 "Non è stato possibile esportare le informazioni sullo stato (libero/"
 "occupato) in '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Promemoria"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Mostra un avviso"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "minuti prima di un evento"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Esportazione calendario"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Esporta automaticamente calendario verso"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Si può esportare verso un file o verso un URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Specificare un file locale o URL (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Includi sottoscrizioni webcal nell'esportazione"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Comando da eseguire dopo l'esportazione del calendario"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registra il calendario di Claws Mail nell'orologio Orage di XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Permette ad Orage (>4.4) di vedere il calendario di Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Esporta come server calendario di GNOME shell"
 
-# messaggio di debug
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#messaggio di debug
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Informazione sullo stato Libero/Occupato"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Esporta automaticamente stato libero/occupato verso"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Specificare un file locale o URL (http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Comando da eseguire dopo l'esportazione dello stato libero/occupato"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Preleva lo stato (libero/occupato) di altri da"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14156,7 +14104,7 @@ msgstr ""
 "Specificare un file locale o URL (http://server/path/file.ifb). Utilizzare "
 "%u per la parte sinistra dell'indizzo email, %d per il dominio"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "Opzioni SSL"
 
@@ -14213,12 +14161,12 @@ msgstr "errore durante la sessione POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "comando TOP non supportato\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14226,7 +14174,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "File di casella di posta locale"
 
@@ -14254,11 +14202,11 @@ msgstr "Nome completo"
 msgid "Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Auto-configura"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Cancella"
 
@@ -14348,7 +14296,7 @@ msgstr ""
 "I messaggi che superano questo limite verranno ricevuti parzialmenti. "
 "Selezionandoli sarà possibile scaricarli completamente o cancellarli."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14360,71 +14308,66 @@ msgstr "Numero massimo di articoli da scaricare"
 msgid "unlimited if 0 is specified"
 msgstr "senza limite se è specificato 0"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Cerca testo:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Directory server IMAP"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(solitamente vuoto)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Mostra solo le cartelle sottoscritte"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Modalità banda-efficiente (impedisce il prelievo dei tag remoti)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Questa modalità utilizza meno banda, ma può essere più lenta con alcuni "
 "server."
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Filtra messaggi in ricezione"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permetti filtraggio in ricezione usando i plugin"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ricevi Mail' controlla se ci sono nuove mail su questo account"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Intestazione"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Genera ID di messaggio"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Invia indirizzo e-mail dell'account nell'ID di messaggio"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Aggiungi intestazione dello user agent"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Aggiungi intestazione definita da utente"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticazione SMTP (SMTP AUT)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14432,181 +14375,181 @@ msgstr ""
 "Se si lasciano vuoti questi campi, verranno usati lo stesso ID utente e "
 "password della ricezione."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentica con POP3 prima dell'invio"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "Scadenza autenticazione POP: "
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "minuti"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Inserisci automaticamente la firma"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Separatore firma"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Command output"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Dizionari per controllo ortografico"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Dizionario predefinito"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Dizionario alternativo predefinito"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Composizione"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Risposta"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Inoltro"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Sistema di privacy predefinito"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Firma sempre i messaggi"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Cifra sempre i messaggi"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "Firma sempre i messaggi in risposta ad un messaggio firmato"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Cifra sempre i messaggi in risposta ad un messaggio cifrato"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Cifra i messaggi inviati con la propria chiave oltre a quella del "
 "destinatario."
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salva in chiaro, i messaggi cifrati inviati"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Non usare SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Usa SSL per connessione POP3"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usa il comando STARTTLS per avviare sessione SSL"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usa SSL per connessione IMAP4"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Usa SSL per connessione NNTP"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Invio (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Non usare SSL (ma, se necessario usa STARTTLS)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Usa SSL per connessione SMTP"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Certificati client"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Certificati per ricezione"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "File di certificato del client come un file PKCS12 o PEM"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Certificato per invio"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Accetta automaticamente certificati SSL validi"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Usa SSL non-bloccante"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Disabilitare se si hanno problemi di connessione SSL"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "Porta SMTP"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "Porta POP3"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "Porta IMAP4"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "Porta NNTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Nome dominio"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14614,15 +14557,15 @@ msgstr ""
 "Il nome dominio verrà usato nell'ID di messaggio generato, e nelle "
 "connessioni con server SMTP."
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Usa comando per comunicare col server"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Sposta nel cestino i messaggi eliminati e rimuovili immediatamente"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14630,108 +14573,108 @@ msgstr ""
 "Sposta nel cestino i messaggi eliminati invece di utilizzare il flag "
 "\\Eliminato senza rimuoverli."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Contrassegna i messaggi cross-posted come letti e con colore:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Metti messaggi inviati in"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Metti messaggi in coda in"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Metti bozze in"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Metti messaggi eliminati in"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Non è stato inserito il nome account."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "Non è stato inserito l'indirizzo di posta."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "Non è stato inserito il server SMTP."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Non è stato inserito l'ID utente."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "Non è stato inserito il server POP3."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "Non esiste la cartella predefinita 'In arrivo'."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "Non è stato inserito il server IMAP4."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "Non è stato inserito il server NNTP."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "Non è stato inserito il nome di file della cartella di posta."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "Non è stato inserito il comando mail."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Ricezione"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modelli"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Preferenze per nuovo account"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferenze account"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Fallito (indirizzo errato)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Selezionare file di firma"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Selezionare file di certificato"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin non caricato)"
@@ -14853,20 +14796,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Eliminare tutte le azioni?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
+#: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Elemento non salvato"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "L'elemento non è stato salvato. Chiudere comunque?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Continua con la modifica"
 
@@ -15208,7 +15152,7 @@ msgstr "Questa intestazione è già nella lista."
 msgid "%s will be replaced with file name / URI"
 msgstr "%s verrà sostituito con il nome di file / URI"
 
-# messaggio di debug
+#messaggio di debug
 #: src/prefs_ext_prog.c:110
 msgid "For the text editor, %w will be replaced with GtkSocket ID"
 msgstr "For the text editor, %w will be replaced with GtkSocket ID"
@@ -15776,7 +15720,7 @@ msgstr "Visualizzazione"
 msgid "Fonts"
 msgstr "Set di caratteri"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -15923,7 +15867,7 @@ msgstr "Messaggi di errore"
 msgid "Status messages for filtering/processing log"
 msgstr "Messaggi di stato per il log di filtraggio/elaborazione"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Altro"
 
@@ -16552,15 +16496,15 @@ msgstr "Scegli colore per cartella"
 msgid "Colors"
 msgstr "Colori"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Scegli scorciatoie da tastiera preimpostata"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Seleziona preimpostata:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16568,35 +16512,35 @@ msgstr ""
 "È possibile modificare ogni scorciatoia di menu premendo\n"
 "la combinazione voluta quando il cursore del mouse è sulla voce."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Aggiungi indirizzo al destinatario con un doppio click"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "In uscita"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Chiedi conferma per uscire"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Svuota cestino all'uscita"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Avvisa se ci sono messaggi in coda"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Abilita scorciatoie da tastiera personalizzabili"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16607,15 +16551,15 @@ msgstr ""
 "combinazione di caratteri.\n"
 "Disabilitare quest'opzione per bloccare le attuali scorciatoie."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr " Scegli le scorciatoie da tastiera predefinita... "
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Gestione metadati"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16623,33 +16567,33 @@ msgstr ""
 "In modalità sicura il SO scrive i metadati direttamente su disco;\n"
 "evita la perdita di dati dopo i crash ma è più lento."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Sicura"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Veloce"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Scadenza I/0 del socket"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Chiedi prima di svuotare il cestino"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Chiedi se applicare le regole di filtraggio specifiche per account durante "
 "il filtraggio manuale"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Usa eliminazione di file sicura, se possibile"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16657,7 +16601,7 @@ msgstr ""
 "Usa eliminazione dei file sicura se possibile\n"
 "(il programma 'shred' non è disponibile)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16666,32 +16610,11 @@ msgstr ""
 "eliminarli. Ciò rallenta l'eliminazione. Leggere la pagina di manuale di "
 "shred per maggiori informazioni."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronizza le cartelle offline prima possibile"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Inserire password"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Inserire password"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Inserire password"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Miscellanea"
 
@@ -16948,8 +16871,8 @@ msgstr ""
 "Specifica la codifica-di-trasferimento-del-contenuto (Content-Transfer-"
 "Encoding) usata, quando il corpo del messaggio contiene caratteri non-ASCII."
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Invio"
 
@@ -17685,28 +17608,28 @@ msgstr "Nessuna informazione disponibile"
 msgid "No recipient keys defined."
 msgstr "Nessuna chiave destinatario definita."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Errore di decodifica BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Tentativo di invio già in corso."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Non è stato possibile aprire il file %s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "L'intestazione di un messaggio in coda non è valida."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "Si è verificato un errore durante la sessione SMTP."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -17714,7 +17637,7 @@ msgstr ""
 "Non è stato trovato alcun account specifico per inviare, e si è verificato "
 "un errore durante la sessione SMTP."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17722,20 +17645,20 @@ msgstr ""
 "Non è stato possibile determinare le informazioni di invio. Forse il "
 "messaggio non è stato creato con Claws Mail."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "Non è stato possibile creare il file temporaneo per l'invio di news."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "Errore nello scrivere il file temporaneo per l'invio di news."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Errore durante il post del messaggio in %s."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Filtraggio messaggi...\n"
 
@@ -18045,88 +17968,88 @@ msgstr "Inserire testo da sostituire con '%s'"
 msgid "Enter variable"
 msgstr "Inserire variabile"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Invio messaggio usando il comando: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Non è stato possibile eseguire il comando: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Errore durante l'esecuzione del comando: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "POP prima di SMTP in corso"
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP prima di SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Account '%s': Connessione al server SMTP: %s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "Mail inviata con successo."
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Invio di HELO in corso."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Autenticazione"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Invio messaggio in corso."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "Invio di EHLO in corso."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "Invio di MAIL FROM in corso."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "Invio di RCPT TO in corso."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "Invio di DATA in corso."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Chiusura in corso"
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Invio messaggio (%d di %d byte)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Invio messaggio"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Errore durante l'invio del messaggio."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18683,7 +18606,8 @@ msgstr "Tag: "
 
 #: src/textview.c:2894
 msgid "The real URL is different from the displayed URL."
-msgstr "L'URL reale è diverso dall'URL mostrato."
+msgstr ""
+"L'URL reale è diverso dall'URL mostrato."
 
 #: src/textview.c:2895
 msgid "Displayed URL:"
@@ -19009,12 +18933,12 @@ msgstr "Selezionare l'URL da aprire."
 msgid "Select All"
 msgstr "Seleziona tutti"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Benvenuti in Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -19107,47 +19031,47 @@ msgstr ""
 "all'indirizzo <%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Inserire il nome della casella di posta."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Inserire il nome e l'indirizzo email."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Inserire il server di ricezione ed il nome utente"
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Inserire il nome utente"
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Inserire il server SMTP."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Inserire il nome utente su SMTP."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Il tuo nome:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Il tuo indirizzo e-mail:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Organizzazione:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Nome casella di posta:"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19155,7 +19079,7 @@ msgstr ""
 "È anche possibile specificare un percorso assoluto, come ad esempio\"/home/"
 "pippo/Documenti/Posta\""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19163,55 +19087,56 @@ msgstr ""
 "È possibile specificare il numero di porta aggiungendolo alla fine: \"posta."
 "esempio.it:25\""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "Indirizzo del server SMTP:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Usa autenticazione"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
-msgstr "(lasciare vuoto per usare lo stesso della ricezione)"
+msgstr ""
+"(lasciare vuoto per usare lo stesso della ricezione)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "Nome utente per SMTP:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "Password per SMTP:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Usa SSL per la connessione al server SMTP"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Usa SSL via STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Certificato SSL del client (opzionale)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Indirizzo del server:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Casella postale locale:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Tipo di server:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19219,19 +19144,19 @@ msgstr ""
 "È possibile specificare il numero di porta aggiungendolo alla fine: \"posta."
 "esempio.it:110\""
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Usa SSL per la connessione al server ricevente"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "Directory del server IMAP:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Mostra solo cartelle sottoscritte"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19239,15 +19164,15 @@ msgstr ""
 "Attenzione: questa versione di Claws Mail\n"
 "è stata compilata senza supporto IMAP."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Configurazione guidata di Claws Mail"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Benvenuto in Claws Mail"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19261,31 +19186,31 @@ msgstr ""
 "opzioni riguardanti gli account e-mail, in modo da poter iniziare ad "
 "utilizzare Claws Mail in meno di cinque minuti."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Su di te"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "I campi in grassetto devono essere riempiti"
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Ricezione mail"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Invio mail"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Salvataggio mail su disco"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Configurazione terminata"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19293,9 +19218,6 @@ msgstr ""
 "Claws Mail è pronto.\n"
 "Clicca su 'Salva' per iniziare."
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "La firma non può essere controllata - %s."
-
 #~ msgid "+_Insert"
 #~ msgstr "_Inserisci"
 
diff --git a/po/lt.po b/po/lt.po
index 865f6f3..33d62a9 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 11:20+0000\n"
 "PO-Revision-Date: 2015-12-20 14:36+0200\n"
 "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba at gmail.com>\n"
 "Language-Team: lt <opensuse-translation at opensuse.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -29,15 +29,15 @@ msgstr ""
 "Yra atvertų laiško rašymo langų.\n"
 "Prieš redaguodami paskyras turite užverti visus laiškų rašymo langus."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Nepavyksta sukurti aplanko."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Redaguoti paskyras"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -47,43 +47,43 @@ msgstr ""
 "nurodyta eilės tvarka. Varnelė „T“ stulpelyje nurodo, kurias paskyras "
 "tikrinti. Pusjuodžiu šriftu parašyta paskyra yra numatytoji."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " Padaryti _numatytąja paskyra "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Paskyrų su nuotoliniais aplankais kopijuoti negalima."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Nukopijuota iš %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Tikrai pašalinti paskyrą „%s“?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Bevardė)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Pašalinti paskyrą"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "T"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Nuspaudus „Tikrinti paštą“, parsiunčiami laiškai iš pažymėtų paskyrų"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -96,11 +96,11 @@ msgstr "Nuspaudus „Tikrinti paštą“, parsiunčiami laiškai iš pažymėtų
 msgid "Name"
 msgstr "Vardas"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protokolas"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Serveris"
 
@@ -153,10 +153,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Nežinoma klaida"
 
@@ -417,18 +417,18 @@ msgid "_Book"
 msgstr "_Knyga"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "Redaguo_ti"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "Įran_kiai"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Pagalba"
 
@@ -467,13 +467,13 @@ msgstr "_Šalinti knygą"
 msgid "_Save"
 msgstr "Į_rašyti"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Užverti"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "Pažymėti _viską"
 
@@ -482,7 +482,7 @@ msgid "C_ut"
 msgstr "_Iškirpti"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopijuoti"
@@ -532,8 +532,8 @@ msgstr "Ieškoti pasikartojančiųjų..."
 msgid "Edit custom attributes..."
 msgstr "Keisti savitus atributus"
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_Apie"
 
@@ -649,7 +649,7 @@ msgstr "Reikia saugesnio tapatumo nustatymo"
 msgid "Sources"
 msgstr "Ištekliai"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adresų knyga"
@@ -700,7 +700,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Šalinti aplanką"
 
@@ -813,7 +813,7 @@ msgid "Person"
 msgstr "Asmuo"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Aplankas"
 
@@ -949,19 +949,20 @@ msgstr "Atnaujinti adresą(-us)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Nepavyko atnaujinti. Pakeitimai į aplanką nebuvo įrašyti."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "Pranešimas"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:750 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4892
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "Klaida"
 
@@ -993,66 +994,66 @@ msgstr "LDAP vardas"
 msgid "Attribute Value"
 msgstr "Atributo reikšmė"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Nieko"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "žiūryklė"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "MIME analizatorius"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "aplankai"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "filtruojama"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "privatumo sąsaja"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "pranešimas apie įteikimą"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "įrankis"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "dalykai"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Papildinys pateikia %s (%s), kurį jau pateikė papildinys %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "Papildinys jau įkeltas"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Nepavyko paskirti atminties papildiniui"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Šis modulis nėra platinamas pagal GPL v3 ar vėlesnę derančią licenciją."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Šis modulis skirtas Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1060,23 +1061,23 @@ msgid ""
 msgstr ""
 "Jūsų Claws Mail versija yra naujesnė nei ta, kuriai skirtas „“%s papildinys."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr ""
 "Jūsų Claws Mail versija yra naujesnė nei ta, kuriai skirtas papildinys."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Jūsų Claws Mail versija yra per sena papildiniui „%s“."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Jūsų Claws Mail versija yra per sena papildiniui."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "SSL prisijungimo klaida\n"
 
@@ -1465,7 +1466,7 @@ msgstr "Pa_šalinti"
 msgid "_Properties..."
 msgstr "_Savybės..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_Laiškas"
 
@@ -1533,7 +1534,7 @@ msgstr "_Apgaubiant"
 msgid "_Unwrapped"
 msgstr "_Neapgaubiant"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Pažymėti _viską"
@@ -1598,7 +1599,7 @@ msgstr "Šalinti eilutę"
 msgid "Delete to end of line"
 msgstr "Šalinti iki eilutės pabaigos"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Ieškoti"
@@ -1643,47 +1644,47 @@ msgstr "Privatumo _sistema"
 msgid "_Priority"
 msgstr "_Prioritetas"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Rašmenų _koduotė"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Vakarų Europos"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltų"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebrajų"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabų"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Kirilica"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonų"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Kinų"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Korėjiečių"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Tajų"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adresų knyga"
 
@@ -1691,7 +1692,7 @@ msgstr "_Adresų knyga"
 msgid "_Template"
 msgstr "Ša_blonas"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "_Veiksmai"
 
@@ -1727,11 +1728,11 @@ msgstr "Rodyti _liniuotę"
 msgid "_Normal"
 msgstr "_Paprastas"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Visiems"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_Siuntėjui"
 
@@ -1755,27 +1756,27 @@ msgstr "_Žemas"
 msgid "_Lowest"
 msgstr "Že_miausias"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automatinė"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7 bitų ASCII (US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unikodas (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centrinės Europos (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Graikų (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turkų (ISO-8859-_9)"
 
@@ -1822,46 +1823,46 @@ msgstr "Persiuntimo šablono pagrindinėje dalyje yra klaida ties %d eilute."
 msgid "Fw: multiple emails"
 msgstr "Persiunčiama: keletas adresų"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Peradresavimo šablono pagrindinėje dalyje yra klaida ties %d eilute."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Nematoma kopija:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Kam atsakyti:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Naujienų grupė:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Kam peradresuoti:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Kam atsakant:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Kam:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nepavyksta pridėti rinkmenos (ženklų rinkinio konvertavimo klaida)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1879,73 +1880,73 @@ msgstr[2] ""
 "Pridedamos rinkmenos: \n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Netinkama šablono „citavimo žymė“."
 
-#: src/compose.c:3605
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nepavyksta nustatyti rinkmenos „%s“ dydžio."
 
-#: src/compose.c:3616
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Ketinate į laiško turinį įterpti rinkmeną %s. Tęsti?"
 
-#: src/compose.c:3619
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "Tikrai?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "Į_terpti"
 
-#: src/compose.c:3744
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "Rinkmena %s yra tuščia."
 
-#: src/compose.c:3745
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "Tuščias failas"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "_Vis tiek prisegti"
 
-#: src/compose.c:3755
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "Nepavyksta perskaityti %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "Laiškas: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [redaguota]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Laiško rašymas %s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[be temos] - Laiško rašymas %s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Rašyti laišką"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4820 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1953,51 +1954,51 @@ msgstr ""
 "Nenurodyta paskyra, kuria siunčiama.\n"
 "Prieš siųsdami, pasirinkite paskyrą."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Siųsti"
 
-#: src/compose.c:5035
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Vienintelis gavėjas yra ties kopijos adresu. Vis tiek siųsti?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Siųsti"
 
-#: src/compose.c:5067
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Vienintelis gavėjas yra ties slaptos kopijos adresu. Vis tiek siųsti?"
 
-#: src/compose.c:5084
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "Į siuntimo _eilę"
 
-#: src/compose.c:5104
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Nenurodyta tema. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Vis tiek siųsti?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Vis tiek įtraukti į siuntimo eilę?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "Siųsti vėliau"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2007,7 +2008,7 @@ msgstr ""
 "\n"
 "Nepavyko konvertuoti koduotės."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2017,7 +2018,7 @@ msgstr ""
 "\n"
 "Nepavyko gauti gavėjo šifravimo rakto."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2028,7 +2029,7 @@ msgstr ""
 "\n"
 "Nepavyko pasirašyti: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2039,11 +2040,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "Laiško nepavyko įtraukti į siuntimo eilę."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5196 src/compose.c:5256
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2052,7 +2053,7 @@ msgstr ""
 "Norėdami vėl bandyti išsiųsti, pagrindiniame lange rinkitės „siųsti eilės "
 "laiškus“."
 
-#: src/compose.c:5246
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2062,7 +2063,7 @@ msgstr ""
 "Norėdami vėl bandyti išsiųsti, pagrindiniame lange rinkitės „siųsti eilės "
 "laiškus“."
 
-#: src/compose.c:5621
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2073,7 +2074,7 @@ msgstr ""
 "pakeisti į nurodytą %s.\n"
 "Siųsti kaip %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2086,72 +2087,73 @@ msgstr ""
 "\n"
 "Tikrai išsiųsti?"
 
-#: src/compose.c:5790
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Nepavyksta užšifruoti laiško: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "Įspėjimas apie šifravimą"
 
-#: src/compose.c:5912
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "_Tęsti"
 
-#: src/compose.c:5961
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "Nėra paskyrų, sukonfigūruotų laiškų siuntimui!"
 
-#: src/compose.c:5970
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Pasirinkta paskyra nėra NNTP: siųsti neįmanoma."
 
-#: src/compose.c:6205
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Priedo %s nebėra. Nepaisyti?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Atsisakyti siuntimo"
 
-#: src/compose.c:6206
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "Nepaisyti priedo"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "Originali %s dalis"
 
-#: src/compose.c:6824
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "Įtraukti į adresų _knygą"
 
-#: src/compose.c:6985
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "Šalinti įrašo turinį"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Norėdami užbaigti pagal adresų knygą, spauskite <tab>"
 
-#: src/compose.c:7204
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "MIME tipas"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:7273
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "Laišką įrašyti į"
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7327 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2162,23 +2164,23 @@ msgstr "Laišką įrašyti į"
 msgid "_Browse"
 msgstr "_Naršyti"
 
-#: src/compose.c:7783
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "_Antraštė"
 
-#: src/compose.c:7788
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "_Priedai"
 
-#: src/compose.c:7802
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "_Kita"
 
-#: src/compose.c:7817
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "_Tema:"
 
-#: src/compose.c:8041
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2187,19 +2189,19 @@ msgstr ""
 "Nepavyksta paleisti rašybos tikrintuvės.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "_Nuo:"
 
-#: src/compose.c:8197
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "Šiam laiškui naudotina paskyra"
 
-#: src/compose.c:8199
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "Naudotinas siuntėjo adresas"
 
-#: src/compose.c:8365
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2208,68 +2210,68 @@ msgstr ""
 "Nepavyksta įkelti privatumo sistemos „%s“. Todėl laiško negalėsite nei "
 "pasirašyti, nei užšifruoti."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Nieko"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8584 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Šablono pagrindinėje dalyje yra klaida ties %d eilute."
 
-#: src/compose.c:8683
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "Šablone yra siuntėjo formato klaida."
 
-#: src/compose.c:8701
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "Šablone yra gavėjo formato klaida."
 
-#: src/compose.c:8719
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "Šablone yra laiško kopijos formato klaida."
 
-#: src/compose.c:8737
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "Šablone yra laiško nematomosios kopijos formato klaida."
 
-#: src/compose.c:8755
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "Šablone yra atgalinio adreso formato klaida."
 
-#: src/compose.c:8774
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "Šablone yra laiško temos formato klaida."
 
-#: src/compose.c:9043
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "Netinkamas MIME tipas."
 
-#: src/compose.c:9058
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "Rinkmenos nėra arba ji tuščia."
 
-#: src/compose.c:9132
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:9149
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "MIME tipas"
 
-#: src/compose.c:9190
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:9210
+#: src/compose.c:9227
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:9211
+#: src/compose.c:9228
 msgid "File name"
 msgstr "Rinkmenos vardas"
 
-#: src/compose.c:9462
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2280,16 +2282,16 @@ msgstr ""
 "Priverstinai nutraukti šį procesą?\n"
 "proceso grupės id: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9968 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Tam, kad galėtų išsiųsti šį laišką, Claws Mail turi prisijungti prie tinklo."
 
-#: src/compose.c:9977
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "Nepavyksta laiško įtraukti į siuntimo eilę."
 
-#: src/compose.c:9979
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2300,15 +2302,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "Nepavyksta įrašyti juodraščio."
 
-#: src/compose.c:10161
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "Nepavyksta įrašyti juodraščio"
 
-#: src/compose.c:10162
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2316,24 +2318,24 @@ msgstr ""
 "Nepavyksta įrašyti juodraščio.\n"
 "Neišeiti ar sunaikinti atmetant šį laišką?"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "_Neišeiti"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "_Atmesti laišką"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "Pasirinkite rinkmeną"
 
-#: src/compose.c:10352
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Nepavyksta perskaityti rinkmenos „%s“."
 
-#: src/compose.c:10354
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2342,54 +2344,54 @@ msgstr ""
 "Rinkmena „%s“ turi šiai koduotei\n"
 "netinkančių rašmenų. Įterpimas gali būti netinkamas."
 
-#: src/compose.c:10441
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "Atmesti laišką"
 
-#: src/compose.c:10442
+#: src/compose.c:10459
 msgid "This message has been modified. Discard it?"
 msgstr "Šis laiškas pakeistas. Atmesti jį?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Atmesti"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "Į_rašyti kaip juodraštį"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Įrašyti pakeitimus"
 
-#: src/compose.c:10446
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Šis laiškas pakeistas. Įrašyti paskutinius pakeitimus?"
 
-#: src/compose.c:10447
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "_Neįrašyti"
 
-#: src/compose.c:10518
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Pritaikyti šabloną „%s“?"
 
-#: src/compose.c:10520
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "Pritaikyti šabloną"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10538 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "Pa_keisti"
 
-#: src/compose.c:11379
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "Įterpti ar pridėti?"
 
-#: src/compose.c:11380
+#: src/compose.c:11397
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2397,16 +2399,16 @@ msgstr ""
 "Ar rinkmenos(-ų) turinį įtraukti į laiško pagrindinę dalį, ar prisegti kaip "
 "priedą prie laiško?"
 
-#: src/compose.c:11382
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "_Pridėti"
 
-#: src/compose.c:11599
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Citavimo formato klaida ties %d eilute."
 
-#: src/compose.c:11894
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2621,8 +2623,8 @@ msgid " Check File "
 msgstr " Tikrinti rinkmeną "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Rinkmena"
 
@@ -2770,7 +2772,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2939,7 +2941,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Didžiausias grąžintinas paieškos rezultatų kiekis."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Pagrindai"
 
@@ -3074,15 +3076,15 @@ msgid "Stylesheet"
 msgstr "Stilius"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Nėra"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Numatytasis"
 
@@ -3564,27 +3566,27 @@ msgstr "Šiukšlės"
 msgid "Drafts"
 msgstr "Juodraščiai"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Apdorojama (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopijuojama: %s į %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Perkeliama: %s į %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Atnaujinamas podėlis: %s..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Apdorojami laiškai..."
 
@@ -3606,11 +3608,11 @@ msgstr "Pasirinkite aplanką"
 msgid "NewFolder"
 msgstr "NaujasAplankas"
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215
+#: src/imap_gtk.c:271 src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:424 src/plugins/rssyl/rssyl_cb_menu.c:206
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Aplanko pavadinime negali būti „%c“."
@@ -3618,7 +3620,7 @@ msgstr "Aplanko pavadinime negali būti „%c“."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Aplankas „%s“ jau yra."
@@ -3642,7 +3644,7 @@ msgstr "Visus rekursyviai pažymėti skaitytais"
 msgid "R_un processing rules"
 msgstr "Vyk_dyti apdorojimo taisykles"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_Ieškoti aplanke"
 
@@ -3698,12 +3700,12 @@ msgstr "Tikrai visus šio aplanko laiškus pažymėti skaitytais?"
 msgid "Mark all as read"
 msgstr "Visus pažymėti skaitytais"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Peržvelgiamas aplankas %s%c%s ..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Peržvelgiamas aplankas %s ..."
@@ -3748,7 +3750,7 @@ msgstr "Atveriamas aplankas %s..."
 msgid "Folder could not be opened."
 msgstr "Nepavyksta atverti aplanko."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
@@ -3986,7 +3988,7 @@ msgstr ""
 "Lokalė: %s (koduotė: %s)\n"
 "Operacinė sistema: nežinoma"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "Claws Mail komanda"
 
@@ -4969,9 +4971,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Papildiniai"
 
@@ -5008,14 +5010,14 @@ msgstr "Įkelti papildiniai"
 msgid "Page Index"
 msgstr "Turinys"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Slėpti"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5452,234 +5454,193 @@ msgstr "Rinkmenos dydis:"
 msgid "Load Image"
 msgstr "Įkelti paveikslą"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4 ryšys nutrūko\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP klaida: %s:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr " tapatybės atpažinta\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr " tapatybė neatpažinta\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr " bloga būsena\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr " srauto klaida\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr " nagrinėjimo klaida (greičiausiai serveris nepalaiko RFC)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr " prisijungti nepavyko\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr " atminties klaida\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr " lemtingoji klaida\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr " protokolo klaida (greičiausiai serveris nepalaiko RFC)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr " ryšys nepriimtas\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " komandos „APPEND“ klaida\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " komandos „NOOP“ klaida\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " komandos „LOGOUT“ klaida\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " komandos „CAPABILITY“ klaida\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " komandos „CHECK“ klaida\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " komandos „CLOSE“ klaida\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " komandos „EXPUNGE“ klaida\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " komandos „COPY“ klaida\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " komandos „UID COPY“ klaida\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " komandos „CREATE“ klaida\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " komandos „DELETE“ klaida\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " komandos „EXAMINE“ klaida\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " komandos „FETCH“ klaida\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " komandos „UID FETCH“ klaida\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " komandos „LIST“ klaida\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " komandos „LOGIN“ klaida\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr " komandos „LBUS“ klaida\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " komandos „RENAME“ klaida\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " komandos „SEARCH“ klaida\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " komandos „UID SEARCH“ klaida\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " komandos „SELECT“ klaida\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " komandos „STATUS“ klaida\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " komandos „STORE“ klaida\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " komandos „UID STORE“ klaida\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " komandos „SUBSCRIBE“ klaida\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " komandos „UNSUBSCRIBE“ klaida\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " komandos „STARTTLS“ klaida\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " komandos „INVAL“ klaida\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " komandos „EXTENSION“ klaida\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " komandos „SASL“ klaida\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " SSL klaida\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr " Nežinoma klaida [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5691,7 +5652,7 @@ msgstr ""
 "CRAM-MD5 prisijungimas veikia tik tada, jei „libetpan“ biblioteka "
 "sukompiliuota su SASL palaikymu ir įdiegtas CRAM-MD5 SASL papildinys."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5703,7 +5664,7 @@ msgstr ""
 "DIGEST-MD5 prisijungimas veikia tik tada, jei „libetpan“ biblioteka "
 "sukompiliuota su SASL palaikymu ir įdiegtas DIGEST-MD5 SASL papildinys."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5715,51 +5676,38 @@ msgstr ""
 "SCRAM-SHA-1 prisijungimas veikia tik tada, jei „libetpan“ biblioteka "
 "sukompiliuota su SASL palaikymu ir įdiegtas SCRAM SASL papildinys."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"CRAM-MD5 prisijungimas veikia tik tada, jei „libetpan“ biblioteka "
-"sukompiliuota su SASL palaikymu ir įdiegtas CRAM-MD5 SASL papildinys."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Nepavyko prisijungti prie %s: prisijungimo vardas atmestas.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Nepavyko prisijungti prie %s: prisijungimo vardas atmestas.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Nepavyko prisijungti prie %s"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 prisijungimas prie %s nutrūko. Jungiamasi iš naujo...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Tam, kad galėtų pasiekti IMAP serverį, Claws Mail turi prisijungti prie "
 "tinklo."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Nesaugus ryšys"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5772,104 +5720,104 @@ msgstr ""
 "\n"
 "Vis tiek jungtis prie šio serverio? Ryšys nebus saugus."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "_Tęsti prisijungimą"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "„%s“ paskyra: jungiamasi prie IMAP4 serverio: %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Nepavyksta prisijungti prie IMAP4 serverio: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nepavyksta prisijungti prie IMAP4 serverio: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "Nepavyksta pradėti TLS sesijos.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepavyksta prisijungti prie IMAP serverio %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepavyksta prisijungti prie IMAP serverio %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Pridedami laiškai..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Kopijuodami laiškai..."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "nepavyksta pažymėti pašalinimui\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "negaliu išbraukti\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Ieškoma %s neprenumeruotų aplankų..."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Ieškoma %s paaplankių..."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nepavyksta sukurti pašto dėžutės: LIST klaida\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "nepavyksta sukurti pašto dėžutės\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nepavyksta pervadinti pašto dėžutės %s į %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "nepavyksta pašalinti pašto dėžutės\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST klaida\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Žymimi laiškai..."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nepavyksta pasirinkti aplanko: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "Prisijungimui serveris reikalauja TLS.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepavyksta atnaujinti charakteristikų.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5878,20 +5826,20 @@ msgstr ""
 "Nepavyko prisijungti prie %s: serveris reikalauja TLS, tačiau Claws Mail "
 "sukompiliuotas be TLS palaikymo.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Prisijungimas prie serverio uždraustas.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Gaunamas laiškas..."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nepavyksta pažymėti pašalinimui: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5938,7 +5886,7 @@ msgstr "Pren_umeratos"
 msgid "_Subscribe..."
 msgstr "_Prenumeruoti..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "Atsisakyti p_renumeratos..."
 
@@ -5975,20 +5923,20 @@ msgstr "Taikyti aukštesnio lygio aplanko savybes"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Įveskite naują „%s“ pavadinimą:"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Pervadinti aplanką"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6011,7 +5959,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nepavyksta pašalinti „%s“ aplanko."
@@ -6038,7 +5986,7 @@ msgstr "_Ieškoti"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Pasirinkite %s poaplankį, kurį norite prenumeruoti: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Prenumeruoti"
 
@@ -6071,8 +6019,8 @@ msgstr "prenumeruoti"
 msgid "unsubscribe"
 msgstr "atsisakyti prenumeratos"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428
+#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Pritaikyti paaplankiams"
 
@@ -6259,33 +6207,33 @@ msgstr "Pasirinkite Pine rinkmeną"
 msgid "Import Pine file into Address Book"
 msgstr "Importuoti Pine rinkmeną į adresų knygelę"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr ""
 "Tam, kad galėtų parsiųsti laiškus, Claws Mail turi prisijungti prie tinklo."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s nepavyko\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Gaunami nauji laiškai"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Pristabdyti"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Atsisakoma"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Gaunama"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6293,24 +6241,24 @@ msgstr[0] "Atlikta (gautas %d laiškas (%s))"
 msgstr[1] "Atlikta (gauti %d laiškai (%s))"
 msgstr[2] "Atlikta (gauta %d laiškų (%s))"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Atlikta (naujų laiškų nėra)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Prisijungti nepavyko"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Nepavyko patvirtinti tapatybės"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Baigėsi laikas"
 
@@ -6347,7 +6295,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepavyksta prisijungti prie POP3 serverio: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Tikrinamas tapatumas..."
 
@@ -6372,7 +6320,7 @@ msgstr "Gaunamas naujų laiškų skaičius (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Gaunamas naujų laiškų dydis (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Baigiama"
 
@@ -6424,7 +6372,7 @@ msgstr ""
 msgid "Socket error on connection to %s:%d."
 msgstr ""
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Nuotolinis serveris nutraukė ryšį."
 
@@ -6446,11 +6394,11 @@ msgstr ""
 "Pašto dėžutė užrakinta:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Nepavyko nustatyti tapatumo."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6459,7 +6407,7 @@ msgstr ""
 "Nepavyko nustatyti tapatumo:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6785,815 +6733,810 @@ msgstr "NetworkManager: prisijungta prie tinklo.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: atsijungta.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Rinkmena"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "Ro_dymas"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Nuostatos"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "_Pridėti pašto dėžutę"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "PD..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Keisti pašto dėžučių tvarką..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "_Importuoti mbox rinkmeną..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "_Eksportuoti į mbox rinkmeną..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "_Eksportuoti pasirinktus į mbox rinkmeną..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Išvalyti visas _šiukšlines"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "Laišką įrašyti _kaip..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "Įrašyti _dalį kaip..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Puslapio nuostatos..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "_Spausdinti"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "Suvienodinti aplankus"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "_Baigti"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "_Pažymėti giją"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_Ieškoti veikiamajame laiške..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_Sparčioji paieška"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "Ro_dyti arba slėpti"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "Į_rankinė"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "R_odytini stulpeliai"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "_Aplankų sąraše..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "_Laiškų sąraše..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "_Išdėstymas"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Rikiuoti"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "_Grupuoti pagal temą"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "Išskleisti _visas gijas"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "Susk_leisti visas gijas"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Eiti į"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Ankstesnis laiškas"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "_Tolesnis laiškas"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "A_nkstesnis neskaitytas laiškas"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "T_olesnis neskaitytas laiškas"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "An_kstesnis naujas laiškas"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "To_lesnis naujas laiškas"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Ank_stesnis pažymėtas laiškas"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Tol_esnis pažymėtas laiškas"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Ankstesnis laiškas s_u etikete"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Tolesn_is laiškas su etikete"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Ankstesnis atvertas laiškas"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Tolesnis atvertas laiškas"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Aukštesnis gijos laiškas"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Tolesnis _neskaitytas aplankas"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Kitas aplankas"
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Tolesnė dalis"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Ankstesnė dalis"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Laiško slinkimas"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Ankstesnė eilutė"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Tolesnė eilutė"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Ankstesnis puslapis"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Tolesnis puslapis"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Iškoduoti"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "Atverti naujame _lange"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Laiško pradinis _tekstas"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Laiško dalis"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Rodyti kaip tekstą"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Atverti"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Atverti su..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Citatos"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "Atna_ujinti santrauką"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "T_ikrinti"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "_Tikrinti veikiamojoje paskyroje"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Tikrinti _visose paskyrose"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "_Nutraukti parsiuntimą"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "_Siųsti eilės laiškus"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "_Rašyti el. laišką"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Rašyti naujienų laišką"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Atsakyti"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "A_tsakyti..."
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_el. pašto grupei"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Peradresuoti ir atsakyti"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Persiųsti"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Persiųsti kaip prie_dą"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Per_adresuoti"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "_El. pašto grupė"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Siųsti"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "Pagalba"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Atsisakyti prenumeratos"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Rodyti archyvą"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "susisiekti su valdytoju"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "_Perkelti..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Kopijuoti"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Perkelti į _šiukšlinę"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "Paša_linti..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Giją perkelti į _šiukšlinę"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "_Šalinti giją"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Atsisakyti naujienų laiškų"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "Pa_žymėti"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_Atžymėti"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Pažymėtu kaip _neskaitytą"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Pažymėti kaip _skaitytą"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Visus pažymėti skaitytais"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Nepaisyti gijos"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Paisyti gijos"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Stebėti giją"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Nestebėti gijos"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Pažymėti kaip _brukalą"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Pažymėti _kaip pageidaujamą"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Užrakinti"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Atrakinti"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "Spal_vota etiketė"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "_Gairės"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "Vėl re_daguoti"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Tikrinti parašą"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Siuntėją įtraukti į adresų _knygą"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "Surinkti adresus"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "iš _veikiamojo aplanko..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "iš pasirinktų _laiškų..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "Filtruoti visus apla_nko laiškus"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Filtruoti pasi_rinktus laiškus"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Vykdyti aplankų apd_orojimo taisykles"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "_Sukurti filtro taisyklę"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatiškai"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "Pagal „_Nuo“"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Pagal „_Kam“"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "Pagal _temą"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Sukurti apdorojimo taisyklę"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "_URL adresų sąrašas..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "Visuos_e aplankuose tikrinti, ar yra naujų laiškų"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Šalinti besi_dubliuojančius laiškus"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "Pasirinktame aplanke"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "Visuose aplankuose"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "_Vykdyti"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "_Išvalyti"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "SSL _liudijimai"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "_Filtravimo žurnalas"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "Tinklo _žurnalas"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "Pa_miršti visus sesijos slaptažodžius"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "Pa_miršti visus sesijos slaptažodžius"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "_Keisti veikiamąją paskyrą"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "_Veikiamosios paskyros parinktys..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Sukurti _naują paskyrą..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "_Redaguoti paskyras"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "_Nuostatos..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "P_irminis apdorojimas..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "G_alutinis apdorojimas..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Filtravimas..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "Ša_blonai..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Veiksmai..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "_Gairės"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "_Papildiniai"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Žinynas"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "_Naudotojų klausimai ir atsakymai"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "Ženkliukų _legenda"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Padaryti numatytuoju klientu"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "_Dirbti neprisijungus"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Meniu juosta"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "_Laiško rodinys"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "_Būsenos juosta"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Stulpelių antraštės"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "_Gijų rodinys"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Slėpti skaitytas gijas"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "_Slėpti skaitytus laiškus"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Slėpti pašalintus laiškus"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "_Visame ekrane"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Rodyti visas _antraštes"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Susk_leisti viską"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Suskleisti nuo _antro lygio"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Suskleisti nuo _trečio lygio"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "T_ekstas po ženkliukais"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Te_kstas šalia ženkliukų"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Tik _ženkliukai"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "Tik _tekstas"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Standartinis"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Trimis stulpeliais"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "_Platus laiškas"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "Platus _laiškų sąrašas"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "_Mažas ekranas"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "pagal n_umerį"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "pagal _dydį"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "pagal d_atą"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "pagal gijos datą"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "Pagal _temą"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "pagal spa_lvos etiketę"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Bet gairę"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "pagal žy_mę"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "pagal _būseną"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "pagal p_riedą"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "pagal įvertį"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "pagal užrakinimą"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "_Nerikiuoti"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Didėjančiai"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Mažėjančiai"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_Automatiškai aptikti"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Pritaikyti gaires..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "Įvyko tam tikrų klaidų. Norėdami peržiūrėti žurnalą, spragtelėkite čia."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Esate prisijungę. Norėdami atsijungti, spragtelėkite ženkliuką"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "Esate atsijungę Norėdami prisijungti, spragtelėkite ženkliuką"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Pasirinkti paskyrą"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Tinklo žurnalas"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Filtravimo / apdorojimo žurnalas"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filtravimo žurnalas įgalintas\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filtravimo žurnalas uždraustas\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Be vardo"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "nieko"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Pašalinti visus laiškus šiukšlinės aplankuose?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Neišeiti"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Pridėti pašto dėžutę"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7603,18 +7546,18 @@ msgstr ""
 "Jei nurodoma esama pašto dėžutė, ji\n"
 "bus išanalizuota automatiškai."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Pašto dėžutė „%s“ jau yra."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Pašto dėžutė"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7623,43 +7566,43 @@ msgstr ""
 "Nepavyko sukurti pašto dėžutės.\n"
 "Galbūt kai kurios rinkmenos jau yra arba jūs neturite leidimo ten rašyti."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "Siųsti neleidžiama"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Nepavyko importuoti mbox."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "Nepavyko eksportuoti mbox."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Baigti"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Baigti darbą su Claws Mail programa?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Aplankų sinchronizavimas"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Sinchronizuoti aplankus dabar?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Sinchronizuoti"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Šalinami besidubliuojantys laiškai..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -7667,36 +7610,36 @@ msgstr[0] "Pašalintas %d besiduliuojantis laiškas %d aplanke(-uose).\n"
 msgstr[1] "Pašalinti %d besiduliuojantys laiškai %d aplanke(-uose).\n"
 msgstr[2] "Pašalinta %d besiduliuojančių laiškų %d aplanke(-uose).\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Apdorojimo taisyklės taikomos prieš aplankų taisykles"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Apdorojimo taisyklės taikomos po aplankų taisyklių"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Filtravimo konfigūracija"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Nepavyksta įregistruoti kaip pagrindinio kliento: neįmanoma gauti vykdomojo "
 "kelio."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail įregistruotas kaip pagrindinis klientas."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nepavyksta įregistruoti kaip pagrindinio kliento: neįmanoma rašyti į "
 "registrą."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7778,7 +7721,7 @@ msgstr "Perrašyti mbox rinkmeną"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Rinkmena jau yra. Perrašyti ją?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Perrašyti"
@@ -7824,19 +7767,19 @@ msgstr "Pasiekta laiško pabaiga; tęsti nuo pradžios?"
 msgid "Search finished"
 msgstr "Paieška baigta"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Rašyti _naują laišką"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Laiško rodinys"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<Atgalinis kelias nerastas>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7846,11 +7789,11 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Nesiųsti"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7862,65 +7805,65 @@ msgstr ""
 "laiškas nebuvo oficialiai Jums siųstas.\n"
 "Patariama nesiųsti pranešimo apie laiško gavimą."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Gaunamas laiškas (%s)"
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nepavyksta iššifruoti: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Laiškas neatitinka MIME standarto. Jis gali būti blogai atvaizduojamas."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Įrašyti kaip"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Perrašyti esamą rinkmeną?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nepavyksta įrašyti rinkmenos „%s“."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Rodyti visus %s"
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Rodomas tik pirmasis teksto megabaitas."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "Gavote pranešimą apie išsiųstą laišką: gavėjui laiškas buvo parodytas."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Jūs prašėte pranešimo apie laiško gavimą."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Šio laiško siuntėjas norėtų gauti patvirtinimą apie laiško gavimą."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Siųsti patvirtinimą apie gavimą"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7928,7 +7871,7 @@ msgstr ""
 "Šis laiškas gautas tik dalinai\n"
 "ir buvo pašalintas iš serverio."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7937,15 +7880,15 @@ msgstr ""
 "Šis laiškas gautas tik dalinai;\n"
 "jo yra %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Pažymėti parsiuntimui"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Pažymėti šalinimui"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7954,12 +7897,12 @@ msgstr ""
 "Šis laiškas gautas tik dalinai;\n"
 "jo yra %s ir bus parsiųstas."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Panaikinti žymėjimą"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7968,11 +7911,11 @@ msgstr ""
 "Šis laiškas gautas tik dalinai;\n"
 "jo yra %s ir bus pašalintas."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Pranešimas apie laiško gavimą"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -7982,19 +7925,19 @@ msgstr ""
 "Laiškas buvo siųstas adresu, sutampančiu jūsų paskyros adresu.\n"
 "Pasirinkite paskyrą, į kurią norite gauti pranešimą apie gautą laišką."
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Siųsti pranešimą"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Negalima spausdinti: laiške nėra teksto."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8002,7 +7945,7 @@ msgstr ""
 "\n"
 "  Šiame aplanke laiškų nėra"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8010,7 +7953,7 @@ msgstr ""
 "\n"
 "  Laiškas pašalintas"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8018,16 +7961,16 @@ msgstr ""
 "\n"
 "  Laiškas perkeltas į šiukšlinę ar kitą aplanką"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "Apmokant įvyko klaida.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Laiškai perkeliami..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Laiškai šalinami..."
 
@@ -8129,7 +8072,8 @@ msgid "Go back to email"
 msgstr "Grįžti prie laiško"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190
+#: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nepavyksta įrašyti daugiadalio laiško dalies: %s"
@@ -8204,79 +8148,79 @@ msgstr "Dydis:"
 msgid "Description:"
 msgstr "Aprašas:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "NNTP prisijungimas prie %s:%d nutrūko.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "„%s“ paskyra: jungiamasi prie NNTP serverio: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Prisijungimo prie %s:%d klaida ...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr ""
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Klaida kuriant sesiją su %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Tapatumo nustatymo klaida jungiantis prie %s:%d ...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Tam, kad galėtų pasiekti naujienų serverį, Claws Mail turi prisijungti prie "
 "tinklo."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "nepavyksta parinkti grupės: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "nepavyksta nustatyti grupės: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "netinkamas naujienų grupės laiškų intervalas: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "nepavyksta gauti xhd\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "gaunamas xover %d - %d, %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "nepavyksta gauti xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "netinkama xover eilutė\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -8994,7 +8938,8 @@ msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Parašai"
 
@@ -9083,12 +9028,14 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Brukalo aptikimas"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Mokymasis atpažinti brukalą"
@@ -9611,7 +9558,7 @@ msgstr ""
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "_Naršyti"
@@ -9620,93 +9567,93 @@ msgstr "_Naršyti"
 msgid "Select stylesheet"
 msgstr "Pasirinkite stiliaus rinkmeną"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Nuotolinio turinio įkėlimas uždraustas."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Įkelti paveikslėlius"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Įgalinti išorinį turinį"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Įgalinti Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Įgalinti papildinius"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Įgalinti Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Nuorodas atverti išorinėje naršyklėje"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Įvyko klaida: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Ieškoti saityne"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Atverti žiūryklėje"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Atverti žiūryklėje (įgalinti nuotolinio turinio rodymą)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Atverti naršyklės lange"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Atverti paveikslėlį"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Kopijuoti nuorodą"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Parsiuntimo nuoroda"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Paveikslėlį įrašyti kaip"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Kopijuoti paveikslėlį"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Importuoti kanalą"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML rodinys"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9792,11 +9739,11 @@ msgid ""
 "RFC822 format"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "GData papildinys: reikia nustatyti tapatybę"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -9807,29 +9754,29 @@ msgid ""
 "list."
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Pirmas žingsnis:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Antras žingsnis:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Įveskite kodą:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr ""
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -9838,7 +9785,7 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
@@ -9846,66 +9793,66 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr ""
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Tapatybės nustatymas"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Naudotojo vardas:"
 
@@ -9941,7 +9888,7 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "GData integracija"
 
@@ -10138,7 +10085,7 @@ msgstr "Užklausai skirtasis laikas baigėsi"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "sek."
@@ -10423,28 +10370,28 @@ msgid "Specify authentication"
 msgstr "Nurodyti tapatybės atpažinimą"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Naudotojo ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Slaptažodis"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Tapatybės nustatymo būdas"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automatinis"
 
@@ -11328,7 +11275,8 @@ msgstr "Galioja iki"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nustačius į „0“, slaptafrazės bus laikomos visos sesijos metu."
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "min"
@@ -11485,157 +11433,162 @@ msgstr "Parašas nepatikrintas"
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "Parašo negalima patikrinti - %s."
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Geras „%s“ parašas"
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "Neturima 0x%s rakto parašo patikrinimui"
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Nebegaliojantis „%s“ parašas"
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Geras „%s“ parašas, tačiau raktas nebegalioja"
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Geras „%s“ parašas, bet raktas atšauktas"
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Blogas „%s“ parašas"
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "Neturima 0x%s rakto parašo patikrinimui"
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "Parašas nepatikrintas"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "Parašo tikrinimo klaida: jokios būsenos\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Parašo tikrinimo klaida: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Parašas sukurtas %s naudojant %s raktą ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Geras uid „%s“ parašas (patikimumas: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Nebegaliojantis „%s“ raktas\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Nebegaliojantis uid „%s“ parašas (patikimumas: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Blogas „%s“ parašas\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid „%s“ parašas (patikimumas: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "Atšauktas"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Savininkas patikimas: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "Pirminio rakto kontrolinis kodas:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nepavyksta iš laiško gauti duomenų, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nepavyksta paruošti duomenų, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "Asmeninio rakto specifikacija yra neaiški"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Nerastas asmeninis raktas (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Klaida nustatant asmeninį raktą: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme protokolas „%s“ yra netinkamas: variklis „%s“ neįdiegtas tinkamai."
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -11644,12 +11597,12 @@ msgstr ""
 "Gpgme protokolas „%s“ yra netinkamas: yra įdiegta variklio „%s“ versija %s, "
 "bet reikia %s versijos.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme protokolas „%s“ yra netinkamas (nežinoma problema)"
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11657,7 +11610,7 @@ msgstr ""
 "GnuPG nėra tinkamai įdiegtas arba jį reikia atnaujinti.\n"
 "OpenPGP palaikymas uždraustas."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -11665,11 +11618,11 @@ msgstr ""
 "Prieš kurdami naują raktų porą, turite įrašyti paskyros informaciją "
 "nuspausdami mygtuką „Gerai“.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "PGP raktų nerasta"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -11679,12 +11632,12 @@ msgstr ""
 "gauti užšifruotųjų.\n"
 "Norėtumėte dabar sukurti naują raktų porą?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nepavyksta sukurti naujos raktų poros: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -11692,11 +11645,11 @@ msgstr ""
 "Kuriama nauja raktų pora... Tam, kad būtų surinkta daugiau atsitiktinių "
 "duomenų, judinkite pelę..."
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Nepavyksta sukurti naujos raktų poros: nežinoma klaida"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -11709,19 +11662,19 @@ msgstr ""
 "\n"
 "Eksportuoti į raktų serverį?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "Raktas sukurtas"
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "Raktas eksportuotas"
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "Negalima eksportuoti rakto"
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "Raktų eksportavimas nėra realizuotas Windows sistemoje"
 
@@ -11931,9 +11884,9 @@ msgstr "Rodyti Python konsolę..."
 msgid "Refresh"
 msgstr "Atnaujinti"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Naršyti"
 
@@ -12191,7 +12144,7 @@ msgid ""
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Tikrinti SSL galiojimą"
 
@@ -12348,17 +12301,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Atnaujinami „%s“ komentarai..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (reikia nustatyti tapatybę)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (neautorizuota)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (nerasta)"
 
@@ -12469,21 +12422,21 @@ msgstr ""
 "Atminkite, kad laiškų antraštės, pvz. tema, nėra užšifruojamos naudojant S/"
 "MIME sistemą."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Pranešimas apie brukalą..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Pranešti apie brukalą internete..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "Pranešimas apie brukalą"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12499,19 +12452,19 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Pranešimas apie brukalą"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Įgalinta"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Persiųsti:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Slaptažodis:"
 
@@ -12702,7 +12655,8 @@ msgid "Show"
 msgstr "Rodyti"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "d."
 
@@ -12795,7 +12749,7 @@ msgid "Next month"
 msgstr "Tolesnis mėnuo"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -12816,7 +12770,7 @@ msgid ""
 "information from others."
 msgstr ""
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Kalendorius"
 
@@ -12994,63 +12948,63 @@ msgstr "Dalyviai:"
 msgid "Action:"
 msgstr "Veiksmas:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Naujas susitikimas"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Eksportuoti kalendorių..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_Prenumeruoti webCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "Pe_rvadinti..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "_Atnaujinti prenumeratas"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "_Sąrašo rodinys"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "_Savaitės rodinys"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "_Mėnesio rodinys"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Susitikimai"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "anksčiau"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "dabar"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "rytoj"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "ši savaitė"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "vėliau"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13059,17 +13013,17 @@ msgstr ""
 "\n"
 "Suplanuoti įvykiai %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Baigėsi (%d s) laikas jungiantis prie %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "%ld klaida"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13082,7 +13036,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13095,7 +13049,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13106,7 +13060,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13117,44 +13071,44 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nepavyksta sukurti katalogo %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Gaunamas %s kalendorius..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "Nauja prenumerata"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 "Tam, kad galėtų atnaujinti prenumeravimo parinktis, Claws Mail turi "
 "prisijungti prie tinklo."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Prenumeruoti WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Nepavyksta išnagrinėti URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Tikrai atsisakyti prenumeratos?"
 
@@ -13517,89 +13471,89 @@ msgstr "Nepavyksta eksportuoti užimtumo būsenos."
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Užimtumo būsenos nepavyko eksportuoti į „%s“\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Priminimai"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Įspėti mane"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Kalendoriaus eksportas"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Automatiškai eksportuoti kalendorių į"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Komanda, paleistina po kalendoriaus eksporto"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Užimtumo informacija"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Automatiškai siųsti užimtumo būseną į "
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr ""
 "Nurodykite vietinę rinkmeną arba URL (http://serveris/kelias/rinkmena.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Komanda, paleistina po kalendoriaus būsenos eksporto"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Gauti informaciją apie kitų užimtumą"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
 "left part of the email address, %d for the domain"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "SSL parinktys"
 
@@ -13654,12 +13608,12 @@ msgstr "klaida POP3 sesijoje\n"
 msgid "TOP command unsupported\n"
 msgstr "Komanda TOP nėra palaikoma\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -13667,7 +13621,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Naujienos (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Vietinė mbox rinkmena"
 
@@ -13695,11 +13649,11 @@ msgstr "Pilnas vardas"
 msgid "Mail address"
 msgstr "El. pašto adresas"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Automatinis konfigūravimas"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Atsisakyti"
 
@@ -13787,7 +13741,7 @@ msgid ""
 "you will be able to download them fully or delete them."
 msgstr ""
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -13799,70 +13753,65 @@ msgstr "Didžiausias parsiunčiamų naujienų grupės laiškų skaičius"
 msgid "unlimited if 0 is specified"
 msgstr "neribota, jei nurodoma 0 sekundžių"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Ieškomas tekstas:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "IMAP serverio katalogas"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(paprastai tuščias)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Rodyti tik prenumeruojamus aplankus"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Filtruoti gaunamus laiškus"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Leidimas filtruoti gavimo metu naudojant papildinius"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "Nuspaudus „Tikrinti paštą“, tikrinama, ar šioje paskyroje nėra naujų laiškų"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Antraštė"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Generuoti laiško ID"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Pridėti naudotojo programos antraštes"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Pridėti naudotojo apibrėžtas antraštes"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP tapatumo nustatymas (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -13870,301 +13819,301 @@ msgstr ""
 "Jei paliksite šiuos laukus tuščius, bus naudojamas tas pats naudotojo ID ir "
 "slaptažodis kaip ir gaunant."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Prieš siunčiant patikrinti tapatumą su POP3"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "POP tapatybės nustatymo skirtasis laikas: "
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "min"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Parašas"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Automatiškai įterpti parašą"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Prierašo skirtukas"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Komandos išvestis"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Automatiškai nustatyti šiuos adresus"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Rašybos tikrinimo žodynai"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Numatytasis žodynas"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Numatytasis alternatyvus žodynas"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Rašyti"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Persiųsti"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Numatytoji privatumo sistema"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Visada pasirašyti laiškus"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Visada užšifruoti laiškus"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "Visada pasirašyti laiškus, jei atsakoma į pasirašytą laišką"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Visada užšifruoti laiškus, jei atsakoma į užšifruotą laišką"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Siunčiamus laiškus užšifruoti ne tik gavėjo raktu, bet ir jūsų nuosavu raktu"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Išsiųstą užšifruotą laišką įrašyti kaip paprastą tekstinį"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Nenaudoti SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 prisijungimui naudoti SSL"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Naudoti STARTTLS komandą SSL sesijos pradėjimui"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 prisijungimui naudoti SSL"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP prisijungimui naudoti SSL"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Siuntimas (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nenaudoti SSL (bet, jei reikia, naudoti STARTTLS)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP prisijungimui naudoti SSL"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Kliento liudijimai"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Liudijimas gaunant"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Kliento liudijimo rinkmena - PKCS12 arba PEM rinkmena"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Liudijimas siunčiant"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Savaime priimti galiojančius SSL liudijimus"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Išjunkite, jei kyla SSL ryšio nesklandumų"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "SMTP prievadas"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "POP3 prievadas"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "IMAP4 prievadas"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "NNTP prievadas"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Srities vardas"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr ""
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Naudoti išorinę komandą komunikavimui su serveriu"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Pašalintus laiškus perkelti į šiukšlinę ir iš karto išvalyti."
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
 msgstr ""
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr ""
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Išsiųstus laiškus dėti į"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Siuntimo eilės laukiančius laiškus dėti į"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Juodraščius dėti į"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Pašalintus laiškus dėti į"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Neįvestas paskyros pavadinimas."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "Neįvestas el. pašto adresas."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "Neįvestas SMTP serveris."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Neįvestas naudotojo identifikatorius."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "Neįvestas POP3 serveris."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "Numatytojo gaunamų laiškų aplanko nėra."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "Neįvestas IMAP4 serveris."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "Neįvestas NNTP serveris."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "Neįvestas vietinės pašto dėžutės rinkmenos vardas."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "Neįvestas pašto komanda."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Gauti"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablonai"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Privatumas"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Sudėtingiau"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Naujos paskyros parinktys"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - paskyros parinktys"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Nepavyko (netinkamas adresas)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Pasirinkite parašo rinkmeną"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Pasirinkite liudijimo rinkmeną"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protokolas:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (papildinys neįkeltas)"
@@ -14286,20 +14235,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Tikrai šalinti visus veiksmus?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
+#: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Elementas neįrašytas"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Elementas nebuvo įrašytas. Vis tiek užverti?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Tęsti redagavimą"
 
@@ -15187,7 +15137,7 @@ msgstr "Rodymas"
 msgid "Fonts"
 msgstr "Šriftai"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Parinktys"
 
@@ -15319,7 +15269,7 @@ msgstr "Pranešimai apie klaidas"
 msgid "Status messages for filtering/processing log"
 msgstr ""
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Kita"
 
@@ -15940,49 +15890,49 @@ msgstr "Pasirinkite aplankų spalvą"
 msgid "Colors"
 msgstr "Spalvos"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Pasirinkite sparčiųjų klavišų rinkinį"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Pasirinkite rinkinį"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Jei dukart spragtelėta pele, adresą įtraukti į paskirties sąrašą"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Baigiant darbą su programa"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Patvirtinti programos užvėrimą"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Užveriant programą išvalyti šiukšlinę"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Įspėti, jei siuntimo eilėje yra laiškų"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Klaviatūros spartieji klavišai"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Leisti pakeisti klaviatūros sparčiuosius klavišus"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -15993,45 +15943,45 @@ msgstr ""
 "nuspauskite klavišų kombinaciją.\n"
 "Norėdami užrakinti esamą sparčiųjų klavišų rinkinį, atžymėkite šią parinktį."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr " Pasirinkite sparčiųjų klavišų rinkinį... "
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Metaduomenų dorojimas"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
 msgstr ""
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Saugiau"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Greičiau"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr ""
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Klausti prieš išvalant šiukšlinę"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "Jei filtruojama rankiniu būdu, klausti apie taikymą paskyroms"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Jei įmanoma, naudoti saugų rinkmenų šalinimą"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16039,7 +15989,7 @@ msgstr ""
 "Jei įmanoma, naudoti saugų rinkmenų šalinimą\n"
 "(„shred“ programa nepasiekiama)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16048,32 +15998,11 @@ msgstr ""
 "perrašyti atsitiktiniu turiniu. Tai sulėtina šalinimo eigą. Norėdami "
 "sužinoti daugiau, skaitykite „shred“ programos „man“ puslapius."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Nuotolinius aplankus sinchronizuoti kaip galima greičiau"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Įveskite slaptažodį"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Įveskite slaptažodį"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Įveskite slaptažodį"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Įvairūs"
 
@@ -16329,8 +16258,8 @@ msgstr ""
 "Nurodykite turinio perdavimo koduotę, naudojamą tada, kai laiške yra ne "
 "ASCII koduotės rašmenų"
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Siuntimas"
 
@@ -17059,53 +16988,53 @@ msgstr "Informacija neprieinama"
 msgid "No recipient keys defined."
 msgstr "Nenurodytas gavėjo raktas."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Klaidas iškoduojant BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Jau bandoma siųsti."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Nepavyksta atverti rinkmenos %s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "Eilėje esančio laiško antraštė sugadinta."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "SMTP sesijos metu įvyko klaida."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr "Nerasta konkrečios paskyros siuntimui, SMTP sesijos klaida."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "Nepavyksta sukurti laikinosios rinkmenos naujienų siuntimui."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "Klaida kuriant laikinąją rinkmeną naujienų siuntimui."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Klaida siunčiant laišką į %s."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Filtruojami laiškai...\n"
 
@@ -17395,88 +17324,88 @@ msgstr "Įveskite tekstą, kuris pakeis „%s“"
 msgid "Enter variable"
 msgstr "Kintamojo įvedimas"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Laiškas siunčiamas naudojant komandą: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nepavyksta įvykdyti komandos: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Klaida vykdant komandą: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Prisijungimas prie POP prieš SMTP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP prieš SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "„%s“ paskyra: jungiamasi prie SMTP serverio: %s:%d ..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "Paštas sėkmingai išsiųstas"
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Siunčiamas HELO..."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Tikrinamas tapatumas..."
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Siunčiamas laiškas..."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "Siunčiamas EHLO..."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "Siunčiamas MAIL FROM..."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "Siunčiamas RCPT TO..."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "Siunčiamas DATA..."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Baigiama..."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Siunčiamas laiškas (%d / %d baitų)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Siunčiamas laiškas"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Siunčiant laišką įvyko klaida."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18356,12 +18285,12 @@ msgstr "Pasirinkite atvertiną URL."
 msgid "Select All"
 msgstr "Pažymėti viską"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Jus sveikina Claws pašto programa"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -18454,128 +18383,130 @@ msgstr ""
 "<%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Įveskite pašto dėžutės pavadinimą."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Įveskite savo vardą ir el. pašto adresą."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Įveskite gaunamo pašto serverį ir naudotojo vardą."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Įveskite naudotojo vardą."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Įveskite SMTP serverį."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Įveskite SMTP naudotojo vardą."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Jūsų vardas:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Jūsų el. pašto adresas:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Įstaiga:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Pašto dėžutės pavadinimas:"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 "Galima nurodyti ir pilną kelią, pvz., „/home/vardenis/Dokumentai/Paštas“"
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 "Prievado numerį galite nurodyti po dvitaškio, pvz., „mail.pavyzdys.lt:25“"
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "SMTP serverio adresas:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Naudoti tapatybės atpažinimą"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
-msgstr "(palikus tuščią, bus naudojamas gavimo serverio slaptažodis)"
+msgstr ""
+"(palikus tuščią, bus naudojamas gavimo serverio "
+"slaptažodis)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "SMTP naudotojo vardas:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "SMTP slaptažodis:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Jungiantis prie SMTP serverio naudoti SSL"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Naudoti SSL per STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Kliento SSL liudijimas (neprivaloma)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Serverio adresas:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Vietinė pašto dėžutė:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Serverio tipas:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 "Prievado numerį galite nurodyti po dvitaškio, pvz., „mail.pavyzdys.lt:110“"
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Jungiantis prie gavimo serverio naudoti SSL"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "IMAP serverio katalogas:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Rodyti tik prenumeruojamus aplankus"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -18583,15 +18514,15 @@ msgstr ""
 "Dėmesio: ši Claws Mail versija\n"
 "sukompiliuota be IMAP palaikymo."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws pašto vediklis"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Jus sveikina Claws pašto programa"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -18604,31 +18535,31 @@ msgstr ""
 "Pirmiausia nurodykite asmeninius duomenis ir bendriausias pašto parinktis. "
 "Taip galėsite pradėti naudoti Claws Mail greičiau nei per penkias minutes."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Apie Jus"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Reikia užpildyti abu laukelius"
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Laiškų gavimas"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Laiškų siuntimas"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Laiškų įrašymas diske"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Konfigūracija baigta"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -18636,9 +18567,6 @@ msgstr ""
 "Claws Mail programa paruošta.\n"
 "Norėdami pradėti, spauskite „Įrašyti“."
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Parašo negalima patikrinti - %s."
-
 #~ msgid "%s: unknown host.\n"
 #~ msgstr "%s: nežinomas serveris.\n"
 
diff --git a/po/nb.po b/po/nb.po
index 1d4636d..1acf0d9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 2.4.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 11:20+0000\n"
 "PO-Revision-Date: 2015-12-19 08:08+0100\n"
 "Last-Translator: Petter Adsen <petter at synth.no>\n"
 "Language-Team: Bokmål, Norwegian; Norwegian Bokmål <>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -30,15 +30,15 @@ msgstr ""
 "Du har åpne redigeringsvinduer.\n"
 "Disse må lukkes før du kan gjøre endringer i kontoinnstillingene."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Mappen kan ikke opprettes."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Endre kontoinnstillinger"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -48,43 +48,43 @@ msgstr ""
 "er oppført. Avkrysningsfeltet angir hvilke kontoer som regnes med. "
 "Standardkontoen står i fetstil. "
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr "Bruk som _standardkonto"
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Kontoer med fjernmapper kan ikke kopieres."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopi av %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Vil du virkelig slette kontoen '%s'?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Slett konto"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hent epost' henter epost fra de avkryssede kontoer"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -97,11 +97,11 @@ msgstr "'Hent epost' henter epost fra de avkryssede kontoer"
 msgid "Name"
 msgstr "Navn"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Tjener"
 
@@ -154,10 +154,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -421,18 +421,18 @@ msgid "_Book"
 msgstr "_Bok"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Endre"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "V_erktøy"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -471,13 +471,13 @@ msgstr "_Slett bok"
 msgid "_Save"
 msgstr "_Lagre"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Lukk"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "Velg _alt"
 
@@ -486,7 +486,7 @@ msgid "C_ut"
 msgstr "_Klipp ut"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopier"
@@ -536,8 +536,8 @@ msgstr "Finn dubletter..."
 msgid "Edit custom attributes..."
 msgstr "Rediger tilpassede attributter..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_Om"
 
@@ -653,7 +653,7 @@ msgstr "Sterk(ere) autentisering kreves"
 msgid "Sources"
 msgstr "Kilder"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adressebok"
@@ -704,7 +704,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Slett mappe"
 
@@ -817,7 +817,7 @@ msgid "Person"
 msgstr "Person"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Mappe"
 
@@ -953,19 +953,20 @@ msgstr "Oppdatering av adresse(r)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Oppdatering mislyktes. Endringer ble ikke lagret i registeret."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "NB"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:750 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4892
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "Feil"
 
@@ -997,43 +998,43 @@ msgstr "LDAP-navn"
 msgid "Attribute Value"
 msgstr "Attributtverdi"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Ingenting"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "fremviser"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "MIME-fortolker"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "mapper"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "filtrering"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "et "
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "en varsler"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "et verktøy"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "ting"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1041,25 +1042,25 @@ msgstr ""
 "Dette programtillegg muliggjøre %s (%s), som allerede tilbys av "
 "programtillegget %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "Programtillegget er allerede innlest"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Kunne ikke allokere minne for programtillegget"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Denne modulen er ikke utgitt under en lisens kompatibel med GPL v3 eller "
 "senere."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Denne modulen er for Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1068,7 +1069,7 @@ msgstr ""
 "Din versjon av Claws Mail er nyere enn den versjon programtillegget '%s' ble "
 "bygget for."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1076,16 +1077,16 @@ msgstr ""
 "Din versjon av Claws Mail er nyere enn den versjonen programtillegget ble "
 "bygget for."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Din versjon av Claws Mail er for gammel for programtillegget '%s'."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Din versjon av Claws Mail er for gammel for programtillegget."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "Feil ved SSL-oppkobling\n"
 
@@ -1474,7 +1475,7 @@ msgstr "_Slett"
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_Melding"
 
@@ -1542,7 +1543,7 @@ msgstr "Med _ombrytning"
 msgid "_Unwrapped"
 msgstr "_Uten ombrytning"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Velg alt"
@@ -1607,7 +1608,7 @@ msgstr "Slett linje"
 msgid "Delete to end of line"
 msgstr "Slett til linjeslutt"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Finn"
@@ -1652,47 +1653,47 @@ msgstr "Personverns_ystem"
 msgid "_Priority"
 msgstr "_Prioritet"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Tegn_koding"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Vesteuropeisk"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japansk (EUC-JP)"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Koreansk"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adressebok"
 
@@ -1700,7 +1701,7 @@ msgstr "_Adressebok"
 msgid "_Template"
 msgstr "_Mal"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "_Handlinger"
 
@@ -1736,11 +1737,11 @@ msgstr "Vis linjal"
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Alle"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "Av_sender"
 
@@ -1764,27 +1765,27 @@ msgstr "Lav"
 msgid "_Lowest"
 msgstr "Lavest"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automatisk"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7 bits asc_ii (US-ASCII)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Sentraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Gresk (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Tyrkisk (ISO-8859-_9)"
 
@@ -1832,46 +1833,46 @@ msgstr "Hovedteksten i malen \"Videresend\" har en feil på linje %d."
 msgid "Fw: multiple emails"
 msgstr "Sv: flere meldinger"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Hovedteksten i malen \"Omdiriger\" har en feil på linje %d."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopi-Til:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Blindkopi-Til:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Svar-Til:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Nyhetsgrupper:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Oppfølger-Til:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Som-Svar-På:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Til:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Kunne ikke vedlegge fil (feil i tegnsettkonvertering)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1886,16 +1887,16 @@ msgstr[1] ""
 "Følgende filer er blitt vedlagt: \n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Malens \"Anførselstegn\" er ugyldig."
 
-#: src/compose.c:3605
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kunne ikke avgjøre størrelsen på filen '%s'."
 
-#: src/compose.c:3616
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1904,57 +1905,57 @@ msgstr ""
 "Du er i ferd med å sette inn en fil på %s i meldingsteksten. Er du sikker på "
 "at det er det du vil?"
 
-#: src/compose.c:3619
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: src/compose.c:3744
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:3745
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "Tom fil"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "_Vedlegg likevel"
 
-#: src/compose.c:3755
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan ikke lese %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "Melding: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Endret]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Skriv melding%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[intet tema] - Skriv melding%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Skriv ny melding"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4820 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1962,51 +1963,51 @@ msgstr ""
 "Det er ikke angitt hvilken konto meldingen skal sendes fra.\n"
 "Velg konto før du går videre."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Send"
 
-#: src/compose.c:5035
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Eneste mottaker er forvalgt 'Kopi-Til'-adresse. Send likevel?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Send"
 
-#: src/compose.c:5067
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Eneste mottaker er forvalgt 'Blindkopi-Til'-adresse. Send likevel?"
 
-#: src/compose.c:5084
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "Mottaker er ikke angitt."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Kø"
 
-#: src/compose.c:5104
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Emnefeltet er tomt. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Send likevel?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Sett i køen likevel?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2016,7 +2017,7 @@ msgstr ""
 "\n"
 "Tegnsettkonvertering mislyktes."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2026,7 +2027,7 @@ msgstr ""
 "\n"
 "Fant ikke mottagerens krypteringsnøkkel."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2037,7 +2038,7 @@ msgstr ""
 "\n"
 "Signatur mislyktes: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2048,11 +2049,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "Kunne ikke legge meldingen i sendekøen."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5196 src/compose.c:5256
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2060,7 +2061,7 @@ msgstr ""
 "Meldingen er lagt i køen, men kunne ikke sendes.\n"
 "Velg \"Send meldinger i køen\" fra hovedvinduet for å forsøke på nytt."
 
-#: src/compose.c:5246
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2069,7 +2070,7 @@ msgstr ""
 "%s\n"
 "Velg \"Send meldinger i køen\" fra hovedvinduet for å forsøke på nytt."
 
-#: src/compose.c:5621
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2080,7 +2081,7 @@ msgstr ""
 "tegnsettet %s.\n"
 "Send meldingen som %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2093,73 +2094,74 @@ msgstr ""
 "\n"
 "Send likevel?"
 
-#: src/compose.c:5790
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Kunne ikke kryptere meldingen: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "Krypteringsadvarsel"
 
-#: src/compose.c:5912
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "_Fortsett"
 
-#: src/compose.c:5961
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "Ingen konto tilgjengelig å sende epost fra!"
 
-#: src/compose.c:5970
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Den valgte konto er ikke NNTP: det er ikke mulig å poste."
 
-#: src/compose.c:6205
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Vedlegget %s finnes ikke lenger. Ignorer?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Avbryt sending"
 
-#: src/compose.c:6206
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "Ignorer vedlegg"
 
 # Context or note needed
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "Opprinnelig %s del"
 
-#: src/compose.c:6824
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "Føy til i adresse_boken"
 
-#: src/compose.c:6985
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "Slett innhold"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Bruk <tab> for autofullføring ut fra adresseboken"
 
-#: src/compose.c:7204
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "MIME-type"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:7273
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "Lagre melding i"
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7327 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2170,23 +2172,23 @@ msgstr "Lagre melding i"
 msgid "_Browse"
 msgstr "_Bla"
 
-#: src/compose.c:7783
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "Brevho_de"
 
-#: src/compose.c:7788
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "_Vedlegg"
 
-#: src/compose.c:7802
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "_Andre"
 
-#: src/compose.c:7817
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "_Emne:"
 
-#: src/compose.c:8041
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2195,19 +2197,19 @@ msgstr ""
 "Stavekontroll kunne ikke startes.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "_Fra:"
 
-#: src/compose.c:8197
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "Konto som skal brukes for denne meldingen"
 
-#: src/compose.c:8199
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "Tjeneradresse for sending"
 
-#: src/compose.c:8365
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2216,68 +2218,68 @@ msgstr ""
 "Personvernsystemet '%s' kan ikke innlastes. Du vil ikke kunne signere eller "
 "kryptere denne meldingen."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Ingen"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8584 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Hovedteksten i malen har en feil ved linje %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "Formatfeil i malens 'Fra'-felt."
 
-#: src/compose.c:8701
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "Formatfeil i malens 'Til'-felt."
 
-#: src/compose.c:8719
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "Formatfeil i malens 'Kopi-Til'-felt."
 
-#: src/compose.c:8737
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "Formatfeil i malens 'Blindkopi-Til'-felt."
 
-#: src/compose.c:8755
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "Formatfeil i malens 'Svar-Til'-felt."
 
-#: src/compose.c:8774
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "Formatfeil i malens emnefelt."
 
-#: src/compose.c:9043
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME-type."
 
-#: src/compose.c:9058
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "Filen eksisterer ikke, eller den er tom."
 
-#: src/compose.c:9132
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:9149
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: src/compose.c:9190
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "Tegnkoding"
 
-#: src/compose.c:9210
+#: src/compose.c:9227
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:9211
+#: src/compose.c:9228
 msgid "File name"
 msgstr "Filnavn"
 
-#: src/compose.c:9462
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2288,15 +2290,15 @@ msgstr ""
 "Skal prosessen tvangsavbrytes?\n"
 "Prosessens gruppe-id: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9968 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail må ha nettadgang for å kunne sende epost."
 
-#: src/compose.c:9977
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "Kunne ikke sette meldingen i kø."
 
-#: src/compose.c:9979
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2307,15 +2309,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "Kunne ikke lagre utkast."
 
-#: src/compose.c:10161
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "Kunne ikke lagre utkast"
 
-#: src/compose.c:10162
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2323,24 +2325,24 @@ msgstr ""
 "Kunne ikke lagre utkast.\n"
 "Vil du avbryte lukningen eller kassere denne meldingen? "
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "_Avbryt lukning."
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "_Kassér epost"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "Velg fil"
 
-#: src/compose.c:10352
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunne ikke leses."
 
-#: src/compose.c:10354
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2349,54 +2351,54 @@ msgstr ""
 "Filen '%s' inneholder tegn som ikke er gyldige i\n"
 "den aktuelle tegnkodingen; de kan ha blitt feilaktig innsatt."
 
-#: src/compose.c:10441
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "Kassér melding"
 
-#: src/compose.c:10442
+#: src/compose.c:10459
 msgid "This message has been modified. Discard it?"
 msgstr "Meldingen er endret. Skal den kasseres?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Kassér"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "Lagre til _Utkast"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "_Lagre endringer"
 
-#: src/compose.c:10446
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Meldingen er endret. Skal endringene lagres?"
 
-#: src/compose.c:10447
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "_Ikke lagre"
 
-#: src/compose.c:10518
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vil du bruke malen '%s'?"
 
-#: src/compose.c:10520
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "Bruk mal"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10538 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Erstatt"
 
-#: src/compose.c:11379
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "Sett inn eller vedlegg?"
 
-#: src/compose.c:11380
+#: src/compose.c:11397
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2404,16 +2406,16 @@ msgstr ""
 "Vil du sette innholdet av filen(e) direkte inn i meldingsteksten, eller skal "
 "det sendes som separate vedlegg?"
 
-#: src/compose.c:11382
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "_Vedlegg"
 
-#: src/compose.c:11599
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Feil format på siteringstegnet i linje %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2630,8 +2632,8 @@ msgid " Check File "
 msgstr " Kontroller fil "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Fil"
 
@@ -2778,7 +2780,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2955,7 +2957,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Det maksimale antall poster som skal returneres i søkeresultatet."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Grunnleggende"
 
@@ -3090,15 +3092,15 @@ msgid "Stylesheet"
 msgstr "Stilsett"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Ingen"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Standardverdi"
 
@@ -3601,27 +3603,27 @@ msgstr "Papirkurv"
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bearbeider (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopierer %s til %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Flytter %s til %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Oppdaterer mellomlager for %s..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Bearbeider meldinger..."
 
@@ -3643,11 +3645,11 @@ msgstr "Velg mappe"
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215
+#: src/imap_gtk.c:271 src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:424 src/plugins/rssyl/rssyl_cb_menu.c:206
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Et mappenavn kan ikke inneholde '%c'."
@@ -3655,7 +3657,7 @@ msgstr "Et mappenavn kan ikke inneholde '%c'."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Mappen '%s' finnes allerede."
@@ -3679,7 +3681,7 @@ msgstr "Marker alt som lest rekursi_vt"
 msgid "R_un processing rules"
 msgstr "_Kjør bearbeidelsesregler"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_Let i mappe..."
 
@@ -3736,12 +3738,12 @@ msgstr "Vil du virkelig merke all epost i denne mappen som lest?"
 msgid "Mark all as read"
 msgstr "Marker alt som lest"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Ser igjennom mappen %s%c%s"
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Ser igjennom mappen %s ..."
@@ -3788,7 +3790,7 @@ msgstr "Åpner mappen %s..."
 msgid "Folder could not be opened."
 msgstr "Mappen kunne ikke åpnes."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Tøm papirkurven"
 
@@ -4030,7 +4032,7 @@ msgstr ""
 "Lokalisering: %s (tegnsett: %s)\n"
 "Operativsystem: ukjent"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "Claws-teamet"
 
@@ -5019,9 +5021,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Programtillegg"
 
@@ -5058,14 +5060,14 @@ msgstr "Innleste programtillegg"
 msgid "Page Index"
 msgstr "Sideindeks"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Skjul"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5503,234 +5505,193 @@ msgstr "Filstørrelse:"
 msgid "Load Image"
 msgstr "Last bilde"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4-forbindelsen brutt\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP-feil ved %s:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr " autentisert\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr " ikke autentisert\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr " feil status\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr " feil i strøm\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr " lesefeil (antakelig en ikke RFC-kompatibel tjener)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr " forbindelse nektet\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr " minnefeil\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr " fatal feil\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr " protokollfeil (antakelig en ikke RFC-kompatibel tjener)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr " forbindelse ikke godkjent\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " APPEND-feil\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " NOOP-feil\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " LOGOUT-feil\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " CAPABILITY-feil\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " CHECK-feil\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " CLOSE-feil\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " EXPUNGE-feil\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " COPY-feil\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " UID COPY-feil\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " CREATE-feil\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " DELETE-feil\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " EXAMINE-feil\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " FETCH-feil\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " UID FETCH-feil\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " LIST-feil\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " LOGIN-feil\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr " LSUB-feil\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " RENAME-feil\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " SEARCH-feil\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " UID SEARCH-feil\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " SELECT-feil\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " STATUS-feil\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " STORE-feil\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " UID STORE-feil\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " SUBSCRIBE-feil\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " UNSUBSCRIBE-feil\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " STARTTLS-feil\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " INVAL-feil\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " EXTENSION-feil\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " SASL-feil\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " SSL-feil\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr " Ukjent feil [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5742,7 +5703,7 @@ msgstr ""
 "CRAM-MD5-innlogging vil kun fungere hvis libetpan er kompilert med støtte "
 "forSASL, og programtillegget CRAM-MD5 er installert."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5754,7 +5715,7 @@ msgstr ""
 "Innlogging med DIGEST-MD5 kan kun skje hvis libetpan er kompilert med støtte "
 "for SASL og programtillegget DIGEST-MD5 er installert."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5766,49 +5727,36 @@ msgstr ""
 "SCRAM-SHA-1-innlogging vil kun fungere hvis libetpan er kompilert med støtte "
 "for SASL, og programtillegget SCRAM SASL er installert."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"CRAM-MD5-innlogging vil kun fungere hvis libetpan er kompilert med støtte "
-"forSASL, og programtillegget CRAM-MD5 er installert."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Oppkobling mot %s feilet: innlogging avvist.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Oppkobling mot %s feilet: innlogging avvist.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Oppkobling til %s feilet"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-tilkobling til %s har avbrutt. Kobler til på nytt...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail må ha nettadgang for å kunne kontakte IMAP-tjeneren."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5822,104 +5770,104 @@ msgstr ""
 "Vil du beholde forbindelsen til denne tjeneren? Kommunikasjonen vil ikke "
 "være sikker."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "Fortsett tilkobling"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Konto '%s': Forbinder med IMAP4-tjener: %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Får ikke forbindelse til IMAP4-tjener: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Får ikke forbindelse til IMAP4-tjener: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "Kan ikke starte TLS-sesjon.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kunne ikke logge inn på IMAP-tjeneren %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kunne ikke logge inn på LDAP-tjeneren %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Legger til meldinger..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Kopierer meldinger..."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "kan ikke sette sletteflagg: %d\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "kan ikke rense opp\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Leter etter uabonnerte mapper i %s..."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Ser etter undermapper under %s..."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke opprette postkasse: LIST mislyktes\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "kan ikke opprette postkasse\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke endre navn på postkasse: %s til %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette postkasse\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST mislyktes\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Merker meldinger..."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke velge mappe: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "Tjeneren krever innlogging med TLS.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan ikke gjeninnlese muligheter.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5928,20 +5876,20 @@ msgstr ""
 "Forbindelsen til %s mislyktes: tjeneren krever TLS, men Claws Mail er blitt "
 "kompilert uten TLS-funksjonalitet.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Login til tjeneren er deaktivert.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Henter melding..."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan ikke sette slettet flagg: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5992,7 +5940,7 @@ msgstr "_Abonnementer"
 msgid "_Subscribe..."
 msgstr "_Abonner..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "_Stopp abonnement..."
 
@@ -6029,20 +5977,20 @@ msgstr "Arv egenskaper fra overordnet mappe"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Angi nytt navn for '%s':"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Bytt navn på mappe"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6065,7 +6013,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappen '%s'."
@@ -6092,7 +6040,7 @@ msgstr "_Søk"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Velg en undermappe under %s å abonnere på:"
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Abonner"
 
@@ -6126,8 +6074,8 @@ msgstr "abonner"
 msgid "unsubscribe"
 msgstr "stopp abonnement"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428
+#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Utfør på undermapper"
 
@@ -6319,56 +6267,56 @@ msgstr "Velg Pine-fil"
 msgid "Import Pine file into Address Book"
 msgstr "Importer Pine-fil til adressebok"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail må ha nettadgang for å kunne hente epost."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s mislyktes\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Henter nye meldinger"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Henter"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Ferdig (%d melding (%s) mottatt)"
 msgstr[1] "Ferdig (%d meldinger (%s) mottatt)"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Ferdig (ingen nye meldinger)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Forbindelse mislyktes"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Autentisering mislyktes"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Tidsavbrudd"
 
@@ -6404,7 +6352,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Får ikke forbindelse til POP3-tjener: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Autentisering..."
 
@@ -6429,7 +6377,7 @@ msgstr "Finner antall nye meldinger (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Finner meldingenes størrelser (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Avslutter"
 
@@ -6480,7 +6428,7 @@ msgstr "Socket-feil."
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-feil ved oppkobling til %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Forbindelsen lukket av nettverksvert."
 
@@ -6502,11 +6450,11 @@ msgstr ""
 "Postkassen er låst:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Autentisering mislyktes."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6515,7 +6463,7 @@ msgstr ""
 "Autentisering mislyktes:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6868,814 +6816,809 @@ msgstr "NetworkManager: nettverket er tilkoblet.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: nettverket er frakoblet.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Fil"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "_Vis"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Innstillinger"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "_Ny postkasse"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Endre _rekkefølge på postkassene..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "_Importer mbox-fil..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "_Eksportér til _mbox-fil..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "_Eksportér utvalg til mbox-fil..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Tøm alle _Papirkurver"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Lagre melding som..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "Lagre _del som..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Sideoppsetning..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "S_ynkroniser mapper"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "_Velg tråd"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_Finn i nåværende melding..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_Hurtigsøk"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "_Vis eller skjul"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "_Verktøylinje"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "_Angi kolonner som skal vises"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "I _mappeliste... "
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "I m_eldingsliste..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "Vindus_plassering"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Sorter"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "Tråd også etter emne"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "Fold _ut alle tråder"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "Slå sa_mmen alle tråder"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Gå til"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Forrige melding"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "_Neste melding"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Forrige u_leste melding"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Neste _uleste melding"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Fo_rrige nye melding"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Neste n_ye melding"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Forrige mar_kerte melding"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Neste _markerte melding"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "F_orrige fargemerkede melding"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Neste far_gemerkede melding"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Forrige åpnede melding"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Neste åpnede melding"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Overordnet melding"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Neste uleste _mappe"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Annen mappe..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Neste del"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Forrige del"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Rulling i meldingsvindu"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Forrige linje"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Neste linje"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Forrige side"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Neste side"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Avkod"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "Åpne i _nytt vindu"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Meldingens _kildekode"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Meldingsinnhold"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Vis som _tekst"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Åpne"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Åpne med..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Sitater"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "_Oppdater sammendrag"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "_Hent"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Hent fra _aktiv konto"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Hent fra a_lle kontoer"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "Av_bryt henting"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "Send meldinger i _køen"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "_Ny epost"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Ny melding til _nyhetsgruppe"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Svar _til"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_Postliste"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "_Oppfølgning og svar til"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "V_ideresend som vedlegg"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Om_diriger"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "Post_liste"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Send"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Avbryt abonnement"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Vis arkiv"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "Kontakt eier"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "_Flytt..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Flytt til _papirkurven"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "_Slett..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Flytt t_råd til papirkurven"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "S_lett tråd"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Avbryt nyhetsgruppemelding"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_Marker"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_Fjern markering"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Marker som _ulest"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Marker som _lest"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Marker _alt som lest"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorer tråd"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Ignorer ikke tråd"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Overvåk tråd"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Overvåk ikke tråd"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Marker som _spam"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Marker som _ham"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Lås"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Lås opp"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "F_argemerkning"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Ta_gger"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "R_ediger igjen"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Kontroller signatur"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "_Legg avsenderen til i adresseboken"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "_Hent adresser"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "Fra aktuell _mappe..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "Fra _valgte meldinger..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "_Filtrer alle meldinger i mappen"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Filtrer _valgte meldinger"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Kjør bearbeidningsregler"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "_Opprett filterregel"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatisk"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "Etter _Fra"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Etter _Til"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "Etter _Emne"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Opprett _bearbeidingsregel"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "V_is URL-er..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "Se etter n_ye meldinger i alle mapper"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Slett _dubletter"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "I den valgte mappen"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "I alle mapper"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "_Utfør"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "_Rens"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "SSL-sertifikater"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "Filterlo_gg"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "_Nettverkslogg"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "Glem alle _passord fra sesjonen"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "Glem alle _passord fra sesjonen"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "_Bytt aktiv konto"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "Innstillinger for _aktiv konto..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "_Ny konto..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "Endre kontoinnstillinger..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "_Oppsetning..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "_Forbearbeider..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "_Etterbearbeider..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "Fi_ltrerer..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "_Maler..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Handlinger..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "Ta_gger..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "_Programtillegg..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Håndbok..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "_Brukerskrevet OSS (nettbasert)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "Ikon_forklaring"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Sett som standard epostprogram"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "Frakoblet tilstand"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Men_yer"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "_Meldingsvisning"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "Status_linje"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Kolonneoverskrifter"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "_Trådet visning"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Sk_jul leste tråder"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "Skjul _leste meldinger"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Skjul slette_de meldinger"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "_Fullskjerm"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Vis hele _brevhodet"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "_Slå sammen alle"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Fold sammen fra nivå _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Fold sammen fra nivå _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Tekst _under ikoner"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Tekst _ved siden av ikoner"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Kun _ikoner "
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "Kun _tekst"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Standard"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Tre kolonner"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "Bredt _meldingsvindu"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "_Bredt listevindu"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "_Liten skjerm"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "Etter _nummer"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "Etter _størrelse"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "Etter _dato"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Etter t_råd-dato"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "Etter _emne"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "Etter f_argemerkning"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Etter ta_gg"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "Etter _merke"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "Etter stat_us"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "Etter _vedlegg"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Etter poeng"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Etter låsning"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "Sorter _ikke"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Stigende"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Fallende"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "Finn _automatisk"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Bruk tagger..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "En eller flere feil inntraff. Klikk her for å se loggen. "
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Du er tilkoblet. Klikk på ikonet for å koble fra"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "Du er frakoblet. Klikk på ikonet for å opprette nettforbindelse"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Velg konto"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Nettverkslogg"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Logg for filtrering/bearbeidning"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filterlogg aktivert\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filterlogg deaktivert\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Uten tittel"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "ingenting"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Slett alle meldinger i Papirkurvene?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Ikke avslutt"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Ny postkasse"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7685,18 +7628,18 @@ msgstr ""
 "Hvis en eksisterende postkasse angis, blir den\n"
 "automatisk gjennomsøkt."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Postkassen '%s' finnes allerede."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Postkasse"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7705,77 +7648,77 @@ msgstr ""
 "Kunne ikke opprette postkasse.\n"
 "Enkelte filer finnes kanskje allerede, eller du har ikke skriveadgang der."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "Ingen postinger tillates"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Mbox-import mislyktes."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr " Mbox-eksport vellykket."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Avslutt"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Avslutt Claws Mail?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Mappesynkronisering"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Ønsker du å synkronisere mappene dine nå?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Synkroniser"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dubletter..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Slettet %d dublettmelding i %d mapper.\n"
 msgstr[1] "Slettet %d dublettmeldinger i %d mapper.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Bearbeidingsregler som skal brukes før mappereglene"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Bearbeidingsregler som skal brukes etter mappereglene"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Konfigurasjon av filtrering"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "Kan ikke registrere som standardprogram: finner ikke programstien."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail er registrert som standardprogram."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Kan ikke registrere som standardprogram: kan ikke skrive til "
 "registerdatabasen."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7855,7 +7798,7 @@ msgstr "Overskriv mboxfil"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Filen finnes allerede. Vil du overskrive den?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Overskriv"
@@ -7901,19 +7844,19 @@ msgstr "Slutten av meldingen nådd; Fortsett fra begynnelsen?"
 msgid "Search finished"
 msgstr "Søk ferdig"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "_Ny melding"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Meldingsvisning"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<Ingen Retur-Path funnet>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7928,11 +7871,11 @@ msgstr ""
 "Returadresse: %s\n"
 "Det anbefales å ikke sende noen returkvittering."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Ikke send"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7944,48 +7887,48 @@ msgstr ""
 "offisielt adressert til deg.\n"
 "Det anbefales å ikke sende noen returkvittering."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Henter melding (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Kunne ikke dekryptere: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Meldingen overensstemmer ikke med MIME-standarden. Det vil kanskje vises "
 "feil."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Lagre som"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Overskriv eksisterende fil?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kunne ikke lagre filen '%s'."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Vis alle %s."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Bare den første megabyte med tekst vises."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -7993,19 +7936,19 @@ msgstr ""
 "Du har fått en returkvittering for denne meldingen: den er blitt sett av "
 "mottageren."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Du har bedt om returkvittering i denne meldingen."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Meldingen ber om returkvittering."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Send kvittering"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8013,7 +7956,7 @@ msgstr ""
 "Meldingen er bare delvis mottatt,\n"
 "og er blitt slettet fra tjeneren."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8022,15 +7965,15 @@ msgstr ""
 "Meldingen er delvis mottatt;\n"
 "den er %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Merk for nedlastning"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Merk for sletting"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8039,12 +7982,12 @@ msgstr ""
 "Denne meldingen er bare delvis mottatt;\n"
 "den er %s og vil bli lastet ned."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Fjern markering"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8053,11 +7996,11 @@ msgstr ""
 "Denne meldingen er bare delvis mottatt;\n"
 "den er %s og vil bli slettet."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Varsling om returkvittering"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8067,19 +8010,19 @@ msgstr ""
 "Du har flere kontoer som bruker adressen denne meldingen er sendt til.\n"
 "Velg hvilken konto du vil bruke for returkvitteringen:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "Av_bryt"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Send beskjed"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan ikke skrive ut: meldingern inneholder ikke tekst."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8087,7 +8030,7 @@ msgstr ""
 "\n"
 "  Det er ingen meldinger i denne mappen"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8095,7 +8038,7 @@ msgstr ""
 "\n"
 "  Meldingen er slettet"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8103,16 +8046,16 @@ msgstr ""
 "\n"
 "  Meldingen er blitt slettet eller flyttet til en annen mappe"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "En feil oppsto ved læring.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Flytter meldinger..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Sletter meldinger..."
 
@@ -8213,7 +8156,8 @@ msgid "Go back to email"
 msgstr "Gå tilbake til epost"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190
+#: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kunne ikke lagre denne delen av flerdelt melding: %s"
@@ -8291,77 +8235,77 @@ msgstr "Størrelse:"
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "NNTP-forbindelse til %s:%d er blitt avbrutt.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Konto '%s': Forbinder til NNTP-tjener: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Feil ved innlogging til %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr "Libetpan kan ikke behandle returkoden 480, så vi velger å fortsette\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Mode reader mislyktes, vi fortsetter likevel\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Feil under opprettelse av sesjon med %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Feil ved autentisering på %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Claws Mail må ha nettadgang for å få adgang til nyhetsgruppetjeneren."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "kan ikke velge gruppe: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "kan ikke angi gruppe: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ugyldig artikelintervall: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "kan ikke hente xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "henter xover %d - %d i %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "kan ikke hente xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "ugyldig xover-linje\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9133,7 +9077,8 @@ msgstr ""
 "Gjør ikke kontroll av manglende vedlegg ved videresendelse eller "
 "omdirigering av meldinger"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Signatur"
 
@@ -9242,12 +9187,14 @@ msgstr ""
 "Innstillinger finnes under /Innstillinger/Oppsetning/Programtillegg/"
 "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Spamgransker"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Spamopplæring"
@@ -9839,7 +9786,7 @@ msgstr "CSS i denne filen vil brukes på alle HTML-deler"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "_Bla"
@@ -9848,93 +9795,93 @@ msgstr "_Bla"
 msgid "Select stylesheet"
 msgstr "Velg stilsett"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Innlasting av fjerninnhold er deaktivert."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Innles bilder"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Aktiver fjerninnhold"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Aktiver Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Aktiver programtillegg"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Aktiver Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Åpne lenker i nettleser"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Det oppsto en feil: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s er en misformet eller ikke gjenkjent kanal"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Søk på nettet"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Åpne i Fremviser"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Åpne i Fremviser (aktiver fjerninnhold)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Åpne i nettleser"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Åpne bilde"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Kopier lenke"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Last ned lenke"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Lagre bilde som"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Kopier bilde"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Importer feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML-fremviser"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10027,11 +9974,11 @@ msgstr ""
 "Legg til X-FETCH-TIME-brevhode med dato og tid for når neldingen ble hentet, "
 "i RFC822-format"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "GData-tillegg: Autentisering kreves"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10049,29 +9996,29 @@ msgstr ""
 "inn i feltet nedenfor for å gi Claws Mail tilgang til din Google kontakt-"
 "liste."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Trinn 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr "Klikk her for å åpne Google's autentiserings-side i en nettleser."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Trinn 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Legg inn kode:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "GData-programtillegg: feil ved søkning etter kontakter: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10079,74 +10026,74 @@ msgstr[0] "Lagt %d av"
 msgstr[1] "Lagt %d av"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 kontakt til hurtiglageret"
 msgstr[1] "%d kontakter til hurtiglageret"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "GData-tillegg: Starter asynkron kontaktsøkning\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "GData-tillegg: Feil ved søkning etter grupper %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "GData-tillegg: Grupper mottatt\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "GData-tillegg: starter asynkron gruppesøkning\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "GData-tillegg: Autoriseringsfeil: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData-tillegg: Vellykket autorisering\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "GData-tillegg: starter interaktiv autorisering\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "GData-tillegg: Mottatt autoriserings-kode, ber om autorisering\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
 "GData-tillegg: Ingen autoriseringskode mottatt, autorisering avbrutt.\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData-tillegg: Feil ved oppfriskning av autorisering: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData-tillegg: Vellykket oppfriskning av autorisering\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-tillegg: Forsøker å oppfriske autorisasjon\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autorisering"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Brukernavn:"
 
@@ -10189,7 +10136,7 @@ msgstr ""
 "\n"
 "Feedback til <berndth at gmx.de> mottas med takk."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "GData-integrasjon"
 
@@ -10412,7 +10359,7 @@ msgstr "Tidsavbrudd på sesjonen"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "sekund(er)"
@@ -10700,28 +10647,28 @@ msgid "Specify authentication"
 msgstr "Spesifiser autentisering"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Bruker-ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Passord"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Autentiseringsmetode"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -11630,7 +11577,8 @@ msgstr "La utløpe etter"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Sett denne til '0' for å lagre adgangsfrasen for hele sesjonen"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minutt(er)"
@@ -11787,159 +11735,164 @@ msgstr "Signaturen er ikke verifisert."
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Kan ikke finne nøkkel - ingen gpg-agent kjører."
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "Signaturen kan ikke verifiseres - %s."
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Gyldig signatur fra \"%s\" [ultimat]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Gyldig signatur fra \"%s\" [full]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Gyldig signatur fra \"%s\" [marginal]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Gyldig signatur fra \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "Nøkkel 0x%s er ikke tilgjengelig for verifisering av denne signaturen"
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utløpt signatur fra \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Gyldig signatur fra \"%s\", men nøkkelen er utløpt"
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Gyldig signatur fra \"%s\", men nøkkelen er blitt tilbakekalt"
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Ugyldig signatur fra \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "Nøkkel 0x%s er ikke tilgjengelig for verifisering av denne signaturen"
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "Signaturen er ikke verifisert"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "Feil ved kontroll av signatur: ingen status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Feil ved kontroll av signatur: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Signatur laget på %s med %s nøkkel-ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Gyldig signatur fra uid \"%s\" (Gyldighet: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Utløpt nøkkel uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Utløpt signatur fra uid \"%s\" (Gyldighet: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Tilbakekalt nøkkel-uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "DÅRLIG signatur fra \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr " uid \"%s\" (Gyldighet: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "Opphevet"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Eier-tillitt: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "Ingen nøkkel!"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "Primærnøkkel fingeravtrykk:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "ADVARSEL: Underskrivers adresse \"%s\" stemmer ikke overens med DNS-"
 "oppføringen\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Avsenders adresse brekreftet som \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Kunne ikke hente data fra melding, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Kan ikke initalisere data, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "Angivelse av privat nøkkel er tvetydig"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Privat nøkkel ikke funnet (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Feil angivelse av privat nøkkel: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme protokoll '%s' kan ikke brukes: Motoren '%s' er ikke installert riktig."
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -11948,12 +11901,12 @@ msgstr ""
 "Gpgpme protokoll '%s' kan ikke brukes: Motoren '%s' versjon %s er "
 "installert, men versjon %s påkreves.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme protokoll '%s' kan ikke brukes (ukjent problem)"
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11961,7 +11914,7 @@ msgstr ""
 "GnuPG er ikke installert skikkelig, eller må oppgraderes.\n"
 "OpenPGP-støtte deaktivert."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -11969,11 +11922,11 @@ msgstr ""
 "Kontoinformasjonen må lagres med \"OK\" før et nytt nøkkelpar kan "
 "opprettes.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "Ingen PGP-nøkkel funnet"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -11983,23 +11936,23 @@ msgstr ""
 "kan signere meldinger eller motta krypterte meldinger.\n"
 "Vil du opprette et nytt nøkkelpar nå?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Kunne ikke danne nytt nøkkelpar: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
 "Oppretter ditt nye nøkkelpar... Flytt musen rundt for å skape entropi..."
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Kunne ikke opprette nytt nøkkelpar: ukjent feil"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12012,19 +11965,19 @@ msgstr ""
 "\n"
 "Vil du eksportere det til en nøkkeltjener?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "Nøkkel opprettet"
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "Nøkkel eksportert."
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "Kunne ikke eksportere nøkkel."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "Nøkkeleksport er ikke implementert i Windows."
 
@@ -12255,9 +12208,9 @@ msgstr "Vis Python-konsoll..."
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Bla"
 
@@ -12563,7 +12516,7 @@ msgstr ""
 "kilden."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Verifiser SSL-sertifikatets gyldighet"
 
@@ -12724,17 +12677,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Oppdaterer kommentarer for '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Autorisering kreves)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (Uautorisert)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (Ikke funnet)"
 
@@ -12872,21 +12825,21 @@ msgstr ""
 "Vær oppmerksom på at brevhodefelter, som Emne, ikke krypteres med S/MIME-"
 "systemet."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Rapporterer spam..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Rapporter spam online..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "SpamRapport"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12902,19 +12855,19 @@ msgstr ""
 " * spamcop.net\n"
 " * nominasjonssystemet på lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Spam-rapportering"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Videresend til:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Passord:"
 
@@ -13119,7 +13072,8 @@ msgid "Show"
 msgstr "Vis"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "dager"
 
@@ -13212,7 +13166,7 @@ msgid "Next month"
 msgstr "Neste måned"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13246,7 +13200,7 @@ msgstr ""
 "kalendre, offentliggjøre din opptatt/ledig-status og hente tilsvarende fra "
 "andre."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -13428,63 +13382,63 @@ msgstr "Deltagere:"
 msgid "Action:"
 msgstr "Handling:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Nytt møte..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Eksporter kalender..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_Abonner på webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "_Omdøp..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "_Oppdater abonnementer"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "_Listevisning"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "_Ukevisning"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "_Månedsvisning"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Møter"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "tidligere"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "i dag"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "i morgen"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "denne uken"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "senere"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13493,17 +13447,17 @@ msgstr ""
 "\n"
 "Dette er de planlagte begivenheter %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Tidsavbrudd (%d sekunder) ved forbindelse til %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Feil %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13516,7 +13470,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13529,7 +13483,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13540,7 +13494,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13551,42 +13505,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Kunne ikke opprette mappen %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail må ha nettadgang for å kunne oppdatere Webcal-feeden."
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Henter kalender for %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "nytt abonnement"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail må ha nettadgang for å kunne oppdatere abonnementet."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Abonner på WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Angi WebCal-URLen:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Kunne ikke tolke URLen"
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Vil du virkelig avbryte abonnementet?"
 
@@ -13957,83 +13911,83 @@ msgstr "Kunne ikke eksportere ledig/opptatt-info."
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Kunne ikke eksportere ledig/opptatt-info til '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Påminnelser"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Varsle meg"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "minutter før en begivenhet"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Kalendereksport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Eksporter kalenderen automatisk til"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Du kan eksportere til en lokal fil eller en URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Angi en lokal fil eller en URL (http://tjener/sti/fil.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Ta med webcal-abonnementer i eksport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Kommando som skal kjøres etter kalendereksport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registrer Claws Mails kalender i XFCEs Orage-klokke"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "La Orage (versjon 4.4 eller høyere) se Claws Mails kalender"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Eksporter som GNOME shell kalender-tjener"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Registrer D-Bus kalender-tjener grensesnitt for å eksportere Claws Mails "
 "kalender"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Eksporter automatisk ledig/opptatt-info til"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Angi en lokal fil eller en URL (http://tjener/sti/fil.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Kommando som skal kjøres etter eksport av ledig/opptatt-status"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Hent andres ledig/opptatt-status fra"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14042,7 +13996,7 @@ msgstr ""
 "Angi en lokal fil eller en URL (http://tjener/sti/fil.ifb). Bruk %u for "
 "venstre side av epost-adressen, %d for domenet"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "SSL-valgmuligheter"
 
@@ -14097,12 +14051,12 @@ msgstr "feil oppsto i POP3-sesjon\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-kommandoen støttes ikke\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14110,7 +14064,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Nyhetsgruppe (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Lokal mbox-fil"
 
@@ -14138,11 +14092,11 @@ msgstr "Fullt navn"
 msgid "Mail address"
 msgstr "Epostadresse"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Innstill automatisk"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -14232,7 +14186,7 @@ msgstr ""
 "Meldinger over denne grensen vil bare delvis hentes ned. Når de velges vil "
 "du kunne laste ned hele meldinger eller slette dem."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14244,71 +14198,66 @@ msgstr "Maksimalt antall artikler som skal lastes ned"
 msgid "unlimited if 0 is specified"
 msgstr "ubegrenset dersom 0 angis"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Finn tekst:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Mappe på IMAP-tjeneren"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(vanligvis tom)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Vis bare mapper du abonnerer på"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Båndbredde-effektivt modus (laster ikke ned fjerne tagger)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Dette modus bruker mindre båndbredde, men kan være langsommere med noen "
 "tjenere."
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Filtrer meldinger idet de mottas"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Tillat filtrering med programtillegg ved mottakelse"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Hent Epost' ser etter meldinger på denne kontoen"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Brevhode"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Generer Meldings-ID"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Send kontoens epost-adresse i Meldings-ID"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Legg til brevhodefelt for user agent"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Legg til brukerdefinert brevhode"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentisering (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14316,180 +14265,180 @@ msgstr ""
 "Hvis du lar disse stå tomme, vil samme\n"
 "bruker-ID og passord som ved mottak brukes."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentiser med POP3 før sending"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "Tidsavbrudd for POP-autentisering: "
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "minutter"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Sett inn signatur automatisk"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Resultat fra kommando"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Sett automatisk følgende adresser"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Ordbøker for stavekontroll"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Forvalgt ordliste"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Forvalgt sekundær ordbok"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Svar"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Send videre"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Forvalgt system for integritet"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Signer alltid meldinger"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Krypter alltid meldinger"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "Signer alltid meldinger ved svar på signert melding"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Krypter alltid meldinger ved svar på krypterte meldinger"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Krypter sendte meldinger med din egen nøkkel i tillegg til mottakerens."
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Lagre krypterte, sendte meldinger i klartekst"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Ikke bruk SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Bruk SSL for POP3-tilkoblinger"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Bruk STARTTLS-kommando til å starta SSL-sessjoner"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Bruk SSL for IMAP4-tilkoblinger"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Bruk SSL for SMTP-tilkoblinger"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Send (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Ikke bruk SSL (men bruk STARTTLS om nødvendig)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Bruk SSL for SMTP-tilkobling"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Klient-sertifikater"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Sertifikat for mottagelse"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Klient-sertifikatet som en PKCS12- eller PEM-fil"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Sertifikat for avsendelse"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Godkjenn automatisk gyldige SSL-sertifikater"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Bruk ikke-blokkerende SSL"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Deaktiver dette hvis du har problemer med tilkobling over SSL"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "SMTP-port"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "POP3-port"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "IMAP4-port"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "NNTP-port"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Domenenavn"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14497,15 +14446,15 @@ msgstr ""
 "Domenenavnet vil bli brukt i den Meldings-ID som opprettes, og ved "
 "oppkobling til SMTP-tjenere."
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Bruk kommando for å kommunisere med tjener"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Flytt slettede meldinger til papirkurven og rens den med en gang"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14513,108 +14462,108 @@ msgstr ""
 "Flytter slettede meldinger til papirkurven i stedet for å bruke \\Deleted-"
 "flagget uten å rense."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Merk krysspostede meldinger som lest og med farve:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Legg sendte meldinger i"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Legg køede meldinger i"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Legg utkast i"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Legg slettede meldinger i"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Kontonavn ikke angitt."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "Epostadresse ikke angitt."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "SMTP-tjener ikke angitt."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Bruker ID ikke angitt."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "POP3-tjener ikke angitt."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "Den forvalgte Innboks-mappen finnes ikke."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-tjener ikke angitt."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "NNTP-tjener ikke angitt."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "lokal postkassefil ikke angitt."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "mailkommando ikke angitt."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Motta"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Maler"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Personvern"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Avansert"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Innstillinger for ny konto"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Kontoinnstillinger"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Mislykket (feil adresse)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Velg signaturfil"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Velg sertifikatfil"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (programtillegg er ikke innlest)"
@@ -14736,20 +14685,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Vil du virkelig slette alle handlinger?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
+#: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Posten er ikke lagret"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Posten ble ikke lagret. Lukk likevel?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Fortsett redigering"
 
@@ -15643,7 +15593,7 @@ msgstr "Vis"
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -15788,7 +15738,7 @@ msgstr "Feilmeldinger"
 msgid "Status messages for filtering/processing log"
 msgstr "Statusmeldinger for filter-/bearbeidingsloggen"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Andre"
 
@@ -16415,15 +16365,15 @@ msgstr "Velg farge for mappe"
 msgid "Colors"
 msgstr "Farger"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Velg en forinnstilt oppsetning med hurtigtaster"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Velg forvalgt:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16431,35 +16381,35 @@ msgstr ""
 "Hurtigtaster for menypunktene kan endres ved å trykke tasten(e)\n"
 "mens menypunktet er i fokus under muspekeren."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Dobbelklikk for å legge adressen til blant mottakerne"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Ved avsluttning"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Bekreft avsluttning"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Tøm papirkurven ved avslutning"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Varsle hvis det fortsatt er meldinger i køen"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Hurtigtaster"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Tillat endring av hurtigtaster"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16469,15 +16419,15 @@ msgstr ""
 "ved å sette fokus på menypunktet og skrive inn en ny tastekombinasjon.\n"
 "Fjern avkrysningen hvis du vil låse alle eksisterende hurtigtaster."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Velg blant forinstilte hurtigtaster..."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Håndtering av metadata"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16485,31 +16435,31 @@ msgstr ""
 "Sikrere modus anmoder OS om å skrive metadata direkte til disken;\n"
 "dermed unngås tap av data ved sammenbrudd, men det kan ta noe tid."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Sikrere"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Raskere"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Socket I/O tidsavbrudd"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Spør før papirkurven tømmes"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "Spør om kontospesifikke filtreringsregler ved manuell filtrering"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Bruk sikker filsletting hvis mulig"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16517,7 +16467,7 @@ msgstr ""
 "Bruk sikker filsletting hvis mulig\n"
 "(programmet 'shred' er ikke tilgjengelig)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16525,32 +16475,11 @@ msgstr ""
 "Bruk programmet 'shred' for å overskrive filer med tilfeldig data før de "
 "slettes. Det gjør slettingen langsommere. Les advarslene i shreds man-side."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synkroniser mapper for frakoblet tilstand så snart som mulig"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Skriv inn passord"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Skriv inn passord"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Skriv inn passord"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Diverse"
 
@@ -16807,8 +16736,8 @@ msgstr ""
 "Angi hvilken Content-Transfer-Encoding som skal brukes når meldingskroppen "
 "inneholder ikke-ASCII tegn"
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Sender"
 
@@ -17537,35 +17466,35 @@ msgstr "Ingen informasjon tilgjengelig"
 msgid "No recipient keys defined."
 msgstr "Ingen mottaksnøkler definert."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Feil ved dekoding av BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Forsøker allerede å sende."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Kunne ikke åpne fil %s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "Sitert meldingshode er ødelagt."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "En feil oppsto under SMTP-sesjonen."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 "Ingen bestemt konto funnet for sending og en feil oppsto i SMTP-sesjonen."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17573,20 +17502,20 @@ msgstr ""
 "Kunne ikke finne avsenderinformasjon. Meldingen er kanskje ikke opprettet av "
 "Claws."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "Kunne ikke opprette midlertidig fil for sending til postliste."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "Kunne ikke skrive til midlertidig fil for sending til nyhetsgruppe."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Feil oppsto under posting av melding til %s."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Filtrerer melding...\n"
 
@@ -17892,88 +17821,88 @@ msgstr "Angi tekst som skal erstatte '%s'"
 msgid "Enter variable"
 msgstr "Angi variabel"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Sender melding med følgende kommando: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Kunne ikke utføre komando: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "En feil oppsto under utføring av kommando: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Forbinder"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Gjør POP før SMTP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP før SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Konto '%s': Forbinder til SMTP-tjener: %s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "Melding sendt ok."
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Sender HELO..."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Autentisering"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Sender melding..."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "Sender EHLO..."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "Sender MAIL FROM..."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "Sender RCPT TO..."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "Send DATA..."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Avslutter..."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sender melding (%d / %d byte)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Feil oppstod under avsending av meldingen."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18852,12 +18781,12 @@ msgstr "Velg hvilken URL som skal åpnes."
 msgid "Select All"
 msgstr "Velg alt"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Velkommen til Claws"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -18947,54 +18876,54 @@ msgstr ""
 "gjøres på <%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Angi navn på postkassen."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Angi fullt navn og epostadresse."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Angi tjener for innkommende epost og ditt brukernavn på denne"
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Angi ditt brukernavn"
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Angi tjener for utgående epost (SMTP)."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Angi brukernavn på utgående tjener (SMTP)."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Ditt navn:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Din epostadresse:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Organisasjon:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Postkasse-navn:"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 "Du kan også angi en absolutt sti, f.eks.: \"/home/john/Dokumenter/Epost\""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19002,55 +18931,55 @@ msgstr ""
 "Du kan spesifisere portnummeret ved å føye det til i slutten: \"mail."
 "eksempel.com:25\""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "Adresse til SMTP-tjener:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Bruk autentisering"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(hvis tomt brukes samme som ved mottak)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "SMTP brukernavn:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "SMPT-passord:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Bruk SSL for å forbinde til SMTP-tjener"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Bruk SSL via STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "SSL-sertifikat for mottageren (valgfritt)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Adresse til tjener:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Lokal postkasse:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Tjener-type:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19058,19 +18987,19 @@ msgstr ""
 "Du kan spesifisere portnummeret ved å føye det til i slutten: \"mail."
 "eksempel.com:110\""
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Bruk SSL for å forbinde til innkommende tjener"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "Mappe på IMAP-tjeneren:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Vis bare mapper det abonneres på"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19078,15 +19007,15 @@ msgstr ""
 "Advarsel: denne versjonen av Claws Mail\n"
 "er bygd uten støtte for IMAP."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail konfigurasjonsveiviser"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Velkommen til Claws"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19099,31 +19028,31 @@ msgstr ""
 "Vi begynner med å legge inn dine grunnopplysninger og dine vanligste "
 "epostinnstillinger så du kan ta Claws Mail i bruk i løpet av noen minutter."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Om deg selv"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Felter i fete typer må utfylles"
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Mottar epost"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Sender epost"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Lagrer melding til disk"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Oppsetning fullført"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19131,9 +19060,6 @@ msgstr ""
 "Claws Mail er nå klar.\n"
 "Klikk Lagre for å starte."
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Signaturen kan ikke verifiseres - %s."
-
 #~ msgid "+_Insert"
 #~ msgstr "+Sett _inn"
 
diff --git a/po/nl.po b/po/nl.po
index eb000fa..d38c7d5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.11.1\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 12:58+0100\n"
 "PO-Revision-Date: 2015-12-14 12:58+0100\n"
 "Last-Translator: Marcel Pol <marcel at timelord.nl>\n"
 "Language-Team: translators at lists.claws-mail.org\n"
@@ -29,7 +29,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.8.6\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -38,15 +38,15 @@ msgstr ""
 "Deze moeten gesloten worden voordat je de accountinstellingen kunt "
 "veranderen."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Kan map niet aanmaken."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Accountbeheer"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -56,43 +56,43 @@ msgstr ""
 "in de kolom 'O' geeft aan voor welke accounts dit wordt gedaan. Vetgedrukte "
 "tekst geeft het standaardaccount aan."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " _Instellen als standaard account "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Accounts met mappen op de server kunnen niet worden gekopieerd."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie van %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Wil je werkelijk het account '%s' verwijderen?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Naamloos)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Verwijder account"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "O"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -105,11 +105,11 @@ msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 msgid "Name"
 msgstr "Naam"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -162,10 +162,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -424,18 +424,18 @@ msgid "_Book"
 msgstr "_Boek"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "B_ewerken"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Help"
 
@@ -474,13 +474,13 @@ msgstr "_Verwijder boek"
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "_Alles selecteren"
 
@@ -489,7 +489,7 @@ msgid "C_ut"
 msgstr "K_nippen"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopiëren"
@@ -539,8 +539,8 @@ msgstr "Vind dubbele adressen..."
 msgid "Edit custom attributes..."
 msgstr "Bewerk aangepaste eigenschappen..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_Over"
 
@@ -656,7 +656,7 @@ msgstr "Sterkere authenticatie vereist"
 msgid "Sources"
 msgstr "Bronnen"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adresboek"
@@ -707,7 +707,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Verwijder map"
 
@@ -820,7 +820,7 @@ msgid "Person"
 msgstr "Persoon"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Map"
 
@@ -955,19 +955,19 @@ msgstr "Adressen update"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Update mislukt. Wijzigingen niet opgeslagen naar map."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868 src/plugins/pgpcore/sgpgme.c:750
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "Fout"
 
@@ -999,43 +999,43 @@ msgstr "LDAP-naam"
 msgid "Attribute Value"
 msgstr "Eigenschapwaarde"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Niets"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "een weergever"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "een MIME-verwerker"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "mappen"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "filteren"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "privacy-bescherming"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "een aankondiger"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "een utility"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "dingen"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1043,24 +1043,24 @@ msgstr ""
 "Deze plugin levert ondersteuning voor %s (%s), dat reeds ondersteund wordt "
 "door de plugin %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "Plugin is reeds geladen"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Geheugen reserveren voor plugin mislukt"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Deze module heeft geen licentie die verenigbaar is met de GPL v3 of nieuwer."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Deze module is voor Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1069,7 +1069,7 @@ msgstr ""
 "Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin '%s' "
 "gecompileerd is."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1077,16 +1077,16 @@ msgstr ""
 "Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin "
 "gecompileerd is."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Je versie van Claws Mail is te oud voor de '%s'-plugin."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Je versie van Claws Mail is te oud voor de plugin."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "SSL-handdruk mislukt\n"
 
@@ -1475,7 +1475,7 @@ msgstr "_Verwijderen"
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "Be_richt"
 
@@ -1543,7 +1543,7 @@ msgstr "Afge_broken"
 msgid "_Unwrapped"
 msgstr "Niet afgeb_roken"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Alles selecteren"
@@ -1608,7 +1608,7 @@ msgstr "Verwijder deze regel"
 msgid "Delete to end of line"
 msgstr "Verwijder tot eind van regel"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Vinden"
@@ -1653,47 +1653,47 @@ msgstr "Privacy-_systeem"
 msgid "_Priority"
 msgstr "_Prioriteit"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Tekenset_codering"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "West-Europees"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cyrillisch"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japans"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Chinees"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Koreaans"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adresboek"
 
@@ -1701,7 +1701,7 @@ msgstr "_Adresboek"
 msgid "_Template"
 msgstr "_Sjabloon"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Ac_ties"
 
@@ -1737,11 +1737,11 @@ msgstr "_Lineaal weergeven"
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Allen"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_Afzender"
 
@@ -1765,27 +1765,27 @@ msgstr "Laa_g"
 msgid "_Lowest"
 msgstr "_Laagste"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automatisch"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraal-Europees (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grieks (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turks (ISO-8859-_9)"
 
@@ -1838,46 +1838,46 @@ msgid "Fw: multiple emails"
 msgstr "Doorsturen: meerdere e-mails"
 
 # TPTD
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "De tekst van het \"Herverwijzen\" sjabloon heeft en fout op regel %d."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Nieuwsgroepen:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Followup-To:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "In antwoord aan:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Aan:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Kan bestand niet toevoegen (omzetten van de tekenset is mislukt)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1888,16 +1888,16 @@ msgid_plural ""
 msgstr[0] "Het bestand '%s' is toegevoegd:"
 msgstr[1] "De bestanden '%s' zijn toegevoegd:"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "De \"Citatie-markering\" van het sjabloon is ongeldig."
 
-#: src/compose.c:3605
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kon grootte van bestand '%s' niet opvragen"
 
-#: src/compose.c:3616
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1906,57 +1906,57 @@ msgstr ""
 "Je staat op het punt een bestand van %s in de berichttekst in te voegen. Wil "
 "je doorgaan?"
 
-#: src/compose.c:3619
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "Wil je doorgaan?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: src/compose.c:3744
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg."
 
-#: src/compose.c:3745
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "Leeg bestand"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "Voeg toch bij"
 
-#: src/compose.c:3755
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet lezen."
 
-#: src/compose.c:3782
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[geen onderwerp] - Bericht opstellen%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Bericht opstellen"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4820 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1964,51 +1964,51 @@ msgstr ""
 "Geen account opgegeven voor het verzenden van berichten.\n"
 "Selecteer eerst een account."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:5035
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "De enige ontvanger is het standaard CC-adres. Toch verzenden?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Verzenden"
 
-#: src/compose.c:5067
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "De enige ontvanger is het standaard BCC-adres. Toch verzenden?"
 
-#: src/compose.c:5084
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "Geen ontvanger opgegeven."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Wachtrij"
 
-#: src/compose.c:5104
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Het onderwerp is leeg. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Toch verzenden?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Toch in de wachtrij zetten?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2018,7 +2018,7 @@ msgstr ""
 "\n"
 "Omzetten van de tekenset mislukt."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2028,7 +2028,7 @@ msgstr ""
 "\n"
 "Kon de sleutel van de ontvanger, nodig voor versleutelen, niet vinden."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2039,7 +2039,7 @@ msgstr ""
 "\n"
 "Ondertekenen mislukt: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2050,11 +2050,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "Kon bericht niet in de wachtrij zetten."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5196 src/compose.c:5256
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2063,7 +2063,7 @@ msgstr ""
 "Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5246
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2073,7 +2073,7 @@ msgstr ""
 "Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5621
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2084,7 +2084,7 @@ msgstr ""
 "naar de opgegeven tekenset '%s'.\n"
 "Verzenden met tekenset %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2097,72 +2097,72 @@ msgstr ""
 "worden.\n"
 "Toch verzenden?"
 
-#: src/compose.c:5790
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Decoderen van e-mail mislukt: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "Versleutel-waarschuwing"
 
-#: src/compose.c:5912
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "Ga _door met bewerken"
 
-#: src/compose.c:5961
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "Geen account beschikbaar voor het verzenden!"
 
-#: src/compose.c:5970
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Geselecteerd account is geen NNTP: Plaatsen is niet mogelijk."
 
-#: src/compose.c:6205
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bijvoegsel %s bestaat niet meer. Negeren?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Verzenden annuleren"
 
-#: src/compose.c:6206
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "Negeer bijvoegsel"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "Origineel %s gedeelte"
 
-#: src/compose.c:6824
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "Toevoegen aan adres_boek"
 
-#: src/compose.c:6985
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "Verwijder inhoud"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Gebruik <tab> om adressen automatisch af te maken"
 
-#: src/compose.c:7204
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "MIME-type"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:7273
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "Bericht bewaren in"
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7327 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2173,23 +2173,23 @@ msgstr "Bericht bewaren in"
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: src/compose.c:7783
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "Hea_der"
 
-#: src/compose.c:7788
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "_Bijvoegsels"
 
-#: src/compose.c:7802
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "Anderen"
 
-#: src/compose.c:7817
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "_Onderwerp:"
 
-#: src/compose.c:8041
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2198,19 +2198,19 @@ msgstr ""
 "Spellingcontrole kon niet gestart worden.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "_Van:"
 
-#: src/compose.c:8197
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "Te gebruiken account voor dit bericht"
 
-#: src/compose.c:8199
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "Een afzender-adres is verplicht."
 
-#: src/compose.c:8365
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2219,68 +2219,68 @@ msgstr ""
 "Het privacy-systeem '%s' kon niet worden geladen. Het zal niet mogelijk zijn "
 "om dit bericht te ondertekenen of te versleutelen."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "G_een"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8584 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Opmaakfout in berichttekst-sjabloon op regel %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "Opmaakfout in Van-sjabloon."
 
-#: src/compose.c:8701
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "Opmaakfout in Aan-sjabloon."
 
-#: src/compose.c:8719
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "Opmaakfout in Cc-sjabloon."
 
-#: src/compose.c:8737
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "Opmaakfout in Bcc-sjabloon."
 
-#: src/compose.c:8755
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "Opmaakfout in Antwoord-Aan sjabloon."
 
-#: src/compose.c:8774
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "Opmaakfout in Onderwerp-sjabloon."
 
-#: src/compose.c:9043
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME-type."
 
-#: src/compose.c:9058
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:9132
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:9149
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: src/compose.c:9190
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:9210
+#: src/compose.c:9227
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:9211
+#: src/compose.c:9228
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:9462
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2291,16 +2291,16 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9968 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Claws Mail heeft netwerktoegang nodig voor het verzenden van deze e-mail."
 
-#: src/compose.c:9977
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "Kon bericht niet in de wachtrij zetten."
 
-#: src/compose.c:9979
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2311,15 +2311,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "Kon klad niet opslaan."
 
-#: src/compose.c:10161
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "Kon klad niet opslaan"
 
-#: src/compose.c:10162
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2327,24 +2327,24 @@ msgstr ""
 "Kon klad niet opslaan.\n"
 "Wil je deze e-mail annuleren of weggooien?"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "_Annuleren"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "_Gooi e-mail weg"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:10352
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Bestand '%s' kon niet gelezen worden."
 
-#: src/compose.c:10354
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2353,54 +2353,54 @@ msgstr ""
 "Bestand '%s' bevat ongeldige characters\n"
 "voor de huidige codering, invoeging kan onjuist zijn."
 
-#: src/compose.c:10441
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "Gooi bericht weg"
 
-#: src/compose.c:10442
+#: src/compose.c:10459
 msgid "This message has been modified. Discard it?"
 msgstr "Bericht is gewijzigd, veranderingen laten vervallen?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Gooi weg"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "Opslaan als _klad"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
-#: src/compose.c:10446
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bericht is gewijzigd. Veranderingen opslaan?"
 
-#: src/compose.c:10447
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "_Niet opslaan"
 
-#: src/compose.c:10518
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Wil je sjabloon '%s' toepassen?"
 
-#: src/compose.c:10520
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10538 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Vervang"
 
-#: src/compose.c:11379
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "In- of Bijvoegen"
 
-#: src/compose.c:11380
+#: src/compose.c:11397
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2408,16 +2408,16 @@ msgstr ""
 "Wil je de inhoud van de bestand(en) invoegen in de tekst van het bericht of "
 "bij het bericht voegen als het verstuurd wordt?"
 
-#: src/compose.c:11382
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "_Bijvoegen"
 
-#: src/compose.c:11599
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Opmaakfout in citaat op regel %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2636,8 +2636,8 @@ msgid " Check File "
 msgstr " Controleer bestand"
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Bestand"
 
@@ -2784,7 +2784,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2971,7 +2971,7 @@ msgstr ""
 "Het maximaal aantal ingangen dat moet worden teruggegeven in een "
 "zoekresultaat."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Algemeen"
 
@@ -3105,15 +3105,15 @@ msgid "Stylesheet"
 msgstr "Stijlblad"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Geen"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Standaard"
 
@@ -3622,27 +3622,27 @@ msgstr "Prullenbak"
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bezig met verwerken (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Bezig met kopiëren van %s naar %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Bezig met verplaatsen van %s naar %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Cache voor %s wordt bijgewerkt ..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Berichten verwerken..."
 
@@ -3668,7 +3668,7 @@ msgstr "NieuweMap"
 #: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
 #: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map voorkomen."
@@ -3676,7 +3676,7 @@ msgstr "'%c' mag niet in de naam van een map voorkomen."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "De map '%s' bestaat al."
@@ -3700,7 +3700,7 @@ msgstr "Markeer alles gelezen, _recursief"
 msgid "R_un processing rules"
 msgstr "_Verwerkingsregel draaien"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_Map doorzoeken..."
 
@@ -3758,12 +3758,12 @@ msgstr "Wil je werkelijk alle berichten in deze map als gelezen markeren?"
 msgid "Mark all as read"
 msgstr "Markeer alles als gelezen"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Map wordt ingelezen %s%c%s..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Map wordt ingelezen %s..."
@@ -3808,7 +3808,7 @@ msgstr "Map %s wordt geopend..."
 msgid "Folder could not be opened."
 msgstr "Map kon niet worden geopend."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
@@ -4050,7 +4050,7 @@ msgstr ""
 "Taaldefinitie: %s (tekenset: %s)\n"
 "Besturingssysteem: unknown"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "Het Claws Mail Team"
 
@@ -5041,9 +5041,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -5080,14 +5080,14 @@ msgstr "Plugins geladen"
 msgid "Page Index"
 msgstr "Pagina Inhoudsopgave"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Verberg"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5528,234 +5528,193 @@ msgstr "Bestandsgrootte:"
 msgid "Load Image"
 msgstr "Laad afbeelding"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4-verbinding verbroken\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP-fout op %s:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr " geauthenticateerd\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr " niet geauthenticateerd\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr " bad state (er is iets mis)\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr " stream leesfout\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr " verwerkingsfout (waarschijnlijk niet-RFC overeenkomende server)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr " verbinding geweigerd\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr " geheugen-fout\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr " fatale fout\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr " protocolfout (waarschijnlijk niet-RFC overeenkomende server)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr " verbinding geweigerd\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " APPEND-fout\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " NOOP-fout\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " LOGOUT-fout\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " CAPABILITY-fout\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " CHECK-fout\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " CLOSE-fout\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " EXPUNGE-fout\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " UID COPY-fout\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " UID COPY-fout\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " CREATE-fout\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " DELETE-fout\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " EXAMINE-fout\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " FETCH-fout\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " UID FETCH-fout\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " LIST-fout\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " LOGIN-fout\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr " LSUB-fout\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " RENAME-fout\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " SEARCH-fout\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " UID SEARCH-fout\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " SELECT-fout\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " STATUS-fout\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " STORE-fout\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " UID STORE-fout\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " SUBSCRIBE-fout\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " UNSUBSCRIBE-fout\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " STARTTLS-fout\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " INVAL-fout\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " EXTENSION-fout\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " SASL-fout\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " SSL-fout\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr " Onbekende fout [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5767,7 +5726,7 @@ msgstr ""
 "CRAM-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de CRFAM-MD5 SASL plugin geïnstalleerd is."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5779,7 +5738,7 @@ msgstr ""
 "DIGEST-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de DIGEST-MD5 SASL plugin geïnstalleerd is."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5791,50 +5750,37 @@ msgstr ""
 "CRAM-SHA-1 logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de CRFAM SASL plugin geïnstalleerd is."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"CRAM-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
-"ondersteuning en de CRFAM-MD5 SASL plugin geïnstalleerd is."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Verbinding maken met %s mislukt: login geweigerd.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Verbinding maken met %s mislukt: login geweigerd.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Verbinding maken met %s mislukt"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP4-verbinding naar %s is verbroken. Contact wordt opnieuw gelegd...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail heeft netwerktoegang nodig voor toegang tot de IMAP-server."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Onveilige verbinding"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5848,104 +5794,104 @@ msgstr ""
 "Wil je de verbinding met deze server toch maken? De communicatie is dan niet "
 "beveiligd."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "Verbinding _hervatten"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Account '%s': Verbinden met IMAP4-server: %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Kan geen verbinding maken met de IMAP4-server: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan geen verbinding maken met de IMAP4-server: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "Kan TLS-sessie niet tot stand brengen.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kon niet inloggen op IMAP-server %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kon niet inloggen op IMAP-server %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Berichten worden toegevoegd..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Berichten worden gekopieerd..."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "kan \"verwijderd\" vlaggen niet instellen\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Zoeken naar niet-geabonneerde mappen in %s..."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Zoeken naar submappen van %s..."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "LIST mislukt: kan postvak niet aanmaken\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "kan postvak niet aanmaken\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan postvak niet hernoemen: %s naar %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "kan postvak niet verwijderen\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST mislukt\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Berichten afvlaggen..."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "Server vereist TLS om in te loggen.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan 'capabilities' niet verversen.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5954,20 +5900,20 @@ msgstr ""
 "Verbinden met %s mislukt: de server vereist TLS, maar Claws Mail is "
 "gecompileerd zonder TLS-ondersteuning.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Inloggen op servers staat uit.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Berichten worden opgehaald..."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan \"verwijderd\" vlaggen: %d niet instellen\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6020,7 +5966,7 @@ msgstr "_Abonnementen"
 msgid "_Subscribe..."
 msgstr "_Abonneren..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "_Afmelden..."
 
@@ -6057,20 +6003,20 @@ msgstr "Neem eigenschappen over van bovenliggende map"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Hernoem map"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6092,7 +6038,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verwijderen."
@@ -6119,7 +6065,7 @@ msgstr "_Zoeken"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Kies een submap van %s om op te abonneren: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Abonneren"
 
@@ -6349,56 +6295,56 @@ msgstr "Selecteer Pine-bestand"
 msgid "Import Pine file into Address Book"
 msgstr "Importeren Pine-bestand in adresboek"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail heeft netwerktoegang nodig voor het onvangen van e-mail."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s mislukt\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Klaar (%d bericht (%s) ontvangen)"
 msgstr[1] "Klaar (%d berichten (%s) ontvangen)"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Authenticatie mislukt"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Beveiligd"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Tijdslimiet"
 
@@ -6434,7 +6380,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan geen verbinding maken met POP3-server: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Authenticatie..."
 
@@ -6459,7 +6405,7 @@ msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
@@ -6510,7 +6456,7 @@ msgstr "Socket-fout."
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-fout bij verbinding met %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Verbinding gesloten door de server."
 
@@ -6532,11 +6478,11 @@ msgstr ""
 "Postvak zit op slot:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Authenticatie mislukt."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6545,7 +6491,7 @@ msgstr ""
 "Authenticatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6900,814 +6846,809 @@ msgstr "NetworkManager: netwerk is beschikbaar.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: netwerk is niet beschikbaar.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Bestand"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "Beel_d"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Instellingen"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "_Postvak toevoegen"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Verander postvakvolgorde..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "_Importeer mbox-bestand"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "_Exporteer naar mbox-bestand"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "E_xporteer selectie naar mbox-bestand..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Alle prullenbakken _leegmaken"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Opslaan e-mail als..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "Opslaan _deel als..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Pagina-instellingen..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "Af_drukken..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "Synchroniseer mappen"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "Af_sluiten"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "_Discussiedraad selecteren"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_Zoek in huidige bericht"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_Snelzoeken"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "_Toon of verberg"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "_Werkbalk"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "Weergegeven _kolommen instellen"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "in _mappenlijst..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "in _berichtenlijst..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "_Weergave"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Sorteer"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "Ge_lijksoortige onderwerpen bij elkaar"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "Berichtenboom _uitklappen"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "Berichtenboom _inklappen"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Ga naar"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Vorige bericht"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "V_olgende bericht"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Volgende o_ngelezen bericht"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Vo_rige nieuwe bericht"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Volge_nde nieuwe bericht"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Vorige ge_markeerde bericht"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Volgende gem_arkeerde bericht"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Vorige bericht met _label"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Volgende bericht met l_abel"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Vorige geopende bericht"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Volgende geopende bericht"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Bovenliggende bericht"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Volgende _ongelezen bericht"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "An_dere map..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Volgende deel"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Vorige deel"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Berichten schuiven"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Vorige regel"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Volgende regel"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Vorige pagina"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Volgende pagina"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Decodeer"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "_Nieuw venster"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Br_on weergeven"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Berichtendeel"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Als tekst weergeven"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Openen"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Openen met..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Citaten"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "Berichtenlijst v_erversen"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "Ont_vangen"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Ophalen van _huidige account"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Ophalen van _alle accounts"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "Ophalen ann_uleren"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "Verzend berichten uit de _wachtrij"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "Nieuw _e-mailbericht opstellen"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Nieuw _Nieuwsbericht opstellen"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Beantwoorden"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Be_antwoord"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Mailing-_lijst"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Beantwoorden en _opvolgen"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Doorsturen als bijvoegsel"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Herverwi_jzen"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "Mailing-_Lijst"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Plaatsen"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "Help"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Bekijk archief"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "Contact eigenaar"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "Ver_plaatsen..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "K_opiëren..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Naar _prullenbak"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "Ver_wijderen..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Draad naar _prullenbak"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "_Verwijder draad"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Trek nieuwsartikel in"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_Markeren"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_Demarkeer"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Markeer _ongelezen"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Markeer _gelezen"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Alles gelezen"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Draad negeren"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Draad niet meer negeren"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Volg draad"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Volg draad niet meer"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Markeer als _spam"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Markeer als _ham"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Op slot"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Van slot"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "_Kleurlabel"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Ta_gs"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "_Wijzigen"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Verifieer ondertekening"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "A_fzender toevoegen aan adresboek"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "_Verzamel adressen"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "Van huidige _map..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "Van geselecteerde _berichten..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "Alle berichten _filteren"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Selectie _filteren"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "_Verwerkingsregels draaien voor map"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "_Filterregel aanmaken"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatisch"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "A_fzender"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Aan"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "_Onderwerp"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Verwerkingsregel aanmaken"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Geef _URLs weer..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Verwijder _dubbele berichten"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "In geselecteerde map"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "In alle mappen"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "_Doen!"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "Gooi _weg"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "SSL-cer_tificaten"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "Filterlo_g"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "Netwerk_log"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "_Vergeet alle wachtwoorden van de sessie"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "_Vergeet alle wachtwoorden van de sessie"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "_Huidig account veranderen"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "V_oorkeuren huidig account..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "_Nieuw account aanmaken..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "Account_beheer..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "_Voorkeuren..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "_Voorverwerken..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "_Naverwerken..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Filteren..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "_Sjablonen..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Acties..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "Tag_s..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "Plu_gins..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Handboek"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "_Online FAQ met bijdragen van gebruikers"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "Pictogram_legenda"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Instellen als standaard mailprogramma"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "_Werk offline"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Men_ubalk"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "_Berichtweergave"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "_Statusbalk"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Kolomkoppen"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "Toon berichtenlijst in _boomvorm"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Gelezen draden verbergen"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "Gelezen berichten _verbergen"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Verberg verwijderde berichten"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "_Volledig venster"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Vo_lledige header weergeven"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Alles _opvouwen"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Opvouwen vanaf niveau _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Opvouwen vanaf niveau _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Tekst _onder pictogrammen"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Tekst _naast pictogrammen"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Alleen _pictogrammen"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "Alleen _tekst"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Standaard"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "3 _Kolommen"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "_Hele bericht"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "_Brede berichtenlijst"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "K_lein venster"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "Volgens _nummer"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "Volgens _grootte"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "Op _datum"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Volgens datum van draad"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "Volgens _onderwerp"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "Volgens _kleurlabel"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Volgens tag"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "Volgens _markering"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "Volgens _status"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "Volgens _bijvoegsel"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Volgens sc_ore"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Volgens beveiligd"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "Ni_et sorteren"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Oplopend"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Aflopend"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_Automatisch detecteren"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Tags toepassen..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Fout(en) voorgekomen. Klik hier om het log te zien."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Je bent online. Klik op het pictogram om offline te gaan"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "Je bent offline. Klik op het pictogram om online te gaan"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Selecteer account"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Netwerklog"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Filteren/Verwerken debuglog"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filterlog staat aan\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filterlog staat uit.\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Naamloos"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten in de prullenbakken weggooien?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Niet afsluiten"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Postvak toevoegen"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7717,18 +7658,18 @@ msgstr ""
 "Als een bestaand postvak wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Het postvak '%s' bestaat al."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Postvak"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7738,79 +7679,79 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "Versturen niet toegestaan"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Fout bij importeren mbox-bestand."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "Exporteren naar mbox-bestand mislukt."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail afsluiten?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Map synchronisatie"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Wil je alle mappen nu synchroniseren?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Synchroniseren"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Dubbele berichten worden verwijderd..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d dubbel bericht verwijderd in %d map.\n"
 msgstr[1] "%d dubbele berichten verwijderd in %d mappen.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Verwerkingsregels toepassen voor mapregels"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Verwerkingsregels toepassen na mapregels"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Filters instellen"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Kan niet registreren als standaard mailprogramma: niet mogelijk om het "
 "uitvoerpad te vinden."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail is geregistreerd als standaard mailprogramma."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Kan niet registreren als standaard mailprogramma: niet mogelijk om te "
 "schrijven naar het register."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7890,7 +7831,7 @@ msgstr "Mbox-bestand overschrijven"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Dit bestand bestaat reeds. Wil je het overschrijven?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Overschrijven"
@@ -7936,19 +7877,19 @@ msgstr "Einde van bericht bereikt, verdergaan vanaf het begin?"
 msgid "Search finished"
 msgstr "Zoeken voltooid"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Berichtenvenster"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<Geen Return-Path gevonden>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7963,11 +7904,11 @@ msgstr ""
 "Return path: %s\n"
 "Je wordt afgeraden een onvangstbevestiging te versturen."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Niet versturen"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7979,48 +7920,48 @@ msgstr ""
 "officieel aan je gericht.\n"
 "Je wordt afgeraden een onvangstbevestiging te versturen."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Ophalen van bericht (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Decoderen mislukt: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Bericht is niet conform de MIME-standaard. Het zou verkeerd weergegeven "
 "kunnen worden."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Opslaan als"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Bestaand bestand overschrijven?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kan bestand '%s' niet opslaan."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Geef alle %s weer."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Alleen de eersste megabyte tekst is weergegeven."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8028,19 +7969,19 @@ msgstr ""
 "Je kreeg een ontvangstbevestiging in dit bericht : het is gezien door de "
 "ontvanger."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Je hebt om een ontvangstbevestiging gevraagd voor dit bericht."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Dit bericht vraagt om een ontvangstbevestiging."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Ontvangstbevestiging versturen"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8048,7 +7989,7 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "en is verwijderd van de server."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8057,15 +7998,15 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Markeer voor ophalen"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Gemarkeerd om te verwijderen"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8074,12 +8015,12 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden opgehaald."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Demarkeer"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8088,11 +8029,11 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden verwijderd."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Verstuur Ontvangstbevestiging"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8103,19 +8044,19 @@ msgstr ""
 "gebruiken.\n"
 "Kies het account vanaf welke je de ontvangstbevestiging wilt versturen:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Stuur Bevestiging"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan niet afdrukken: het bericht bevat geen tekst."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8123,7 +8064,7 @@ msgstr ""
 "\n"
 " Er zijn geen berichten in deze map"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8131,7 +8072,7 @@ msgstr ""
 "\n"
 " Bericht is verwijderd"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8139,16 +8080,16 @@ msgstr ""
 "\n"
 "  Bericht is verplaatst naar de prullenbak of naar een andere map"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "Er is een fout opgetreden tijdens het leren.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Berichten worden verplaatst..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Berichten worden verwijderd..."
 
@@ -8250,7 +8191,7 @@ msgid "Go back to email"
 msgstr "Ga terug naar bericht"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kan het deel van een meerdelig bericht niet opslaan: %s"
@@ -8329,79 +8270,79 @@ msgstr "Grootte:"
 msgid "Description:"
 msgstr "Beschrijving:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "De NNTP-verbinding naar %s:%d is verbroken.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Account '%s': Verbinden met NNTP-server: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Fout tijdens inloggen op %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan ondersteunt return-code 480 niet dus voor nu kunnen we doorgaan\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Modus lezer mislukt, gaat toch door\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Fout bij aanmaken sessie met %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Fout tijdens authenticatie met %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail heeft voor contact met de Nieuwsserver netwerktoegang nodig."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "kan groep '%s' niet selecteren\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "kan groep niet instellen: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ongeldig artikelbereik: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "Kan xhdr niet ophalen\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d uit %s wordt opgehaald...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "Kan xover niet ophalen\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "ongeldige xover regel\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9892,7 +9833,7 @@ msgstr "De CSS in dit bestand wordt toegepast op alle HTML-delen"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Bekijk"
@@ -9901,93 +9842,93 @@ msgstr "Bekijk"
 msgid "Select stylesheet"
 msgstr "Stijlblad selecteren"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Inhoud van de server laden is uitgezet."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Laad afbeeldingen"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Deblokkeer externe inhoud"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Zet Javascript Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Zet Plugins Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Java aanzetten"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Open links met externe browser"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Een fout gebeurde: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s is een foutgevormde of niet-ondersteunde feed"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Zoeken op het Web"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Open in Browser"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Open in Browser (laad inhoud van de server)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Open in Browser"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Open Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Kopieer Koppeling"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Haal Koppeling Op"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Sla Afbeelding Op Als"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Kopieer Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Importeer feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Weergever"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10082,11 +10023,11 @@ msgstr ""
 "Voegt de X-FETCH-TIME-header toe met de datum en tijd van het ophalen van "
 "het bericht in RFC822-opmaak"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "GData-plugin: Authorisatie vereist"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10104,29 +10045,29 @@ msgstr ""
 "Voer die code in het veld hieronder in om Claws Mail toegang te geven om je "
 "Google contactlijst te gebruiken."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Stap 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr "Klik hier om de authorisatiepagina van Google te openen in een browser"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Stap 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Invoeren code:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "GData-plugin: Fout bij het ophalen van contacten: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10134,48 +10075,48 @@ msgstr[0] "Toevoegen %d van"
 msgstr[1] "Toevoegen %d van"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 contact aan de cache"
 msgstr[1] "%d contacten aan de cache"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "GData-plugin: Starten asynchronisch contacten ophalen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "GData-plugin: Fout bij ophalen van groepen: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "GData-plugin: Groepen ontvangen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "GData-plugin: Starten asynchronisch groepen ophalen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "GData-plugin: Authorisatiefout: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData-plugin: Authorisatie gelukt\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "GData-plugin: Starten interactieve authorisatie\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "GData-plugin: Authorisatiecode ontvangen, authorisatie aanvragen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10183,26 +10124,26 @@ msgstr ""
 "GData-plugin: Geen authorisatiecode ontvangen, authorisatie-aanvraag is "
 "geannuleerd\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData-plugin: Authorisatie-vernieuwingsfout: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData-plugin: Authorisatie-vernieuwing gelukt\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-plugin: Starten van vernieuwing authorisatie\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Authenticatie"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
@@ -10246,7 +10187,7 @@ msgstr ""
 "\n"
 "Feedback naar <berndth at gmx.de> is welkom."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "GData integratie"
 
@@ -10474,7 +10415,7 @@ msgstr "Aanvraag verlooptijd"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "seconde(n)"
@@ -10762,28 +10703,28 @@ msgid "Specify authentication"
 msgstr "Geef authenticatie op"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Gebruikersnaam"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Wachtwoord"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Authenticatie-methode"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -11865,158 +11806,163 @@ msgstr "Deze ondertekening is nog niet gecontroleerd."
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Geen sleutel, er draait geen gpg-agent."
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "De ondertekening kan niet worden gecontroleerd - %s."
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Goedgekeurde ondertekening van \"%s\" [ultimate]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Goedgekeurde ondertekening van \"%s\" [volledig]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Goedgekeurde ondertekening van \"%s\" [beperkt]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Goedgekeurde ondertekening van \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "Sleutel 0x%s niet beschikbaar om deze ondertekening te verifiëren"
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verlopen ondertekening van \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Goedgekeurde ondertekening van \"%s\", maar de sleutel is verlopen"
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Goedgekeurde ondertekening van \"%s\", maar de sleutel is ingetrokken"
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Foutieve ondertekening van \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "Sleutel 0x%s niet beschikbaar om deze ondertekening te verifiëren"
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "Deze ondertekening is nog niet gecontroleerd"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "Fout bij het controleren van de ondertekening: no status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Fout bij het controleren van de ondertekening: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Ondertekening gemaakt op %s met %s sleutel-ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Goedgekeurde ondertekening van \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Verlopen sleutel-uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Verlopen ondertekening van uid \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Ingetrokken sleutel-uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "FOUTIEVE ondertekening van \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "Ingetrokken"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Betrouwbaarheid eigenaar: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "Geen sleutel!"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "Vingerafdruk van primaire sleutel:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "Waarschuwing: Adres van ondertekenaar \"%s\" klopt niet met DNS ingang\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Adres van geverifieerde ondertekenaar is \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Kon geen gegevens van bericht verkrijgen, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Kon gegevens initialiseren, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "Geheime sleutel-specificatie is onduidelijk"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Geheime sleutel niet gevonden (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fout bij instellen geheime sleutel: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme-protocol '%s' is onbruikbaar: Engine '%s' is niet goed geïnstalleerd."
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12025,12 +11971,12 @@ msgstr ""
 "Gpgme-protocol '%s' is onbruikbaar: Engine '%s' versie %s is geïnstalleerd, "
 "maar versie %s is nodig.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme-protocol '%s' is onbruikbaar (onbekend probleem)"
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12038,7 +11984,7 @@ msgstr ""
 "GnuPG is niet goed geïnstalleerd of moet worden bijgewerkt.\n"
 "OpenPGP-ondersteuning wordt uitgeschakeld."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12046,11 +11992,11 @@ msgstr ""
 "Je dient de informatie van het account op te slaan door op \"OK\" te klikken "
 "alvorens je een sleutelpaar kunt aanmaken.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "Geen PGP-sleutel gevonden"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -12060,12 +12006,12 @@ msgstr ""
 "berichten kunt ondertekenen of versleutelde berichten kunt ontvangen.\n"
 "Wil je nu een sleutelpaar aanmaken?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Kon nieuw sleutelpaar niet aanmaken: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12073,11 +12019,11 @@ msgstr ""
 "Je nieuwe sleutelpaar wordt nu aangemaakt... Beweeg je muis heen en weer om "
 "te helpen bij het maken van entropie..."
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Kon nieuw sleutelpaar niet aanmaken: onbekende fout"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12090,19 +12036,19 @@ msgstr ""
 "\n"
 "Wil je de sleutel exporteren naar een sleutel-server?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "Seutel aangemaakt"
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "Sleutel geëxporteerd."
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "Kon sleutel niet exporteren."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "Seutels exporteren is niet geïmplementeerd onder Windows."
 
@@ -12334,9 +12280,9 @@ msgstr "Geef Python-console weer..."
 msgid "Refresh"
 msgstr "Verversen"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Bekijk"
 
@@ -12645,7 +12591,7 @@ msgstr ""
 "titel van de feed wijzigt."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Verifieer geldigheid van SSL-certificaat"
 
@@ -12805,17 +12751,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Bijwerken reacties voor '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Authorisatie vereist)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (Niet geautoriseerd)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (Niet gevonden)"
 
@@ -12953,21 +12899,21 @@ msgstr ""
 "Let op dat e-mail-headers, zoals Onderwerp, niet versleuteld worden door het "
 "S/MIME-systeem."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Rapporteer spam..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Rapporteer spam online..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "SpamRapport"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12983,19 +12929,19 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Spam rapportering"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Aangezet"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Doorsturen aan:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Wachtwoord:"
 
@@ -13293,7 +13239,7 @@ msgid "Next month"
 msgstr "Volgende maand"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13327,7 +13273,7 @@ msgstr ""
 "agenda te exporteren, je vrij/bezet informatie te publiceren, en die "
 "informatie op te halen van anderen."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -13510,63 +13456,63 @@ msgstr "Genodigden:"
 msgid "Action:"
 msgstr "Actie:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Nieuwe afspraak..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Exporteer agenda..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_Schrijf je in voor webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "_Hernoem..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "_Ververs abonnementen"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "_Lijst beeld"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "_Week beeld"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "_Maand beeld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Afspraken"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "in het verleden"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "vandaag"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "morgen"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "deze week"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "later"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13575,17 +13521,17 @@ msgstr ""
 "\n"
 "Dit zijn de dingen gepland %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Tijdslimiet (%d secondes) voor verbinden met %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Fout %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13598,7 +13544,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13611,7 +13557,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13622,7 +13568,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13633,42 +13579,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Kon de doelmap %s niet aanmaken"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail heeft netwerk toegang nodig om de Webcal-feed te verversen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Kalender voor %s wordt bijgewerkt..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "Nieuw abonnement"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail heeft netwerk toegang nodig om de abonnering te vernieuwen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Abonneren op WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Voer de WebCal-URL in:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Kon de URL niet verwerken."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Wil je echt uitschrijven?"
 
@@ -14039,84 +13985,84 @@ msgstr "Kon de vrij/bezet info niet exporteren."
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Kon vrij/bezet niet exporteren naar '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Herinneringen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Waarschuw me"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "minuten voor een afspraak"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Agenda export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Automatisch agenda exporteren naar"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Je kunt naar een lokaal bestand of URL exporteren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Geef een lokaal bestand of URL op (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Voeg webcal-inschrijvingen bij het exporteren in"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Opdracht om te starten na het exporteren van de agenda"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registreer Claws' agenda in XFCE's Orage klok"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "Sta Orage (versie 4.4 of nieuwer) toe om Claws Mail's agaenda in te zien"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Exporteren voor GNOME-shell calendar-server"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Registreer D-Bus calendar-server interface om Claws Mail's agenda te "
 "exporteren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Vrij/Bezet informatie"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Automatisch exporteren van vrij/bezet status naar"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Geef een lokaal bestand of URL (http://server/path/file.ifb) op"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Opdracht om te starten na het exporteren van vrij/bezet status"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Haal vrij/bezet status van anderen van"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14125,7 +14071,7 @@ msgstr ""
 "Geef een lokaal bestand of URL (http://server/path/file.ifb) op. Gebruik %u "
 "voor het linkerdeel van het e-mailadres, %d voor het domein"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "SSL-opties"
 
@@ -14180,12 +14126,12 @@ msgstr "er is een fout opgetreden in de POP3-sessie\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-opdracht wordt niet ondersteund\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14193,7 +14139,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Nieuws (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Lokaal mbox-bestand"
 
@@ -14221,11 +14167,11 @@ msgstr "Volledige naam"
 msgid "Mail address"
 msgstr "E-mailadres"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Automatische instellingen"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -14316,7 +14262,7 @@ msgstr ""
 "opgehaald. Als je zo'n bericht selecteert, kun je kiezen om het helemaal op "
 "te halen of te verwijderen."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14328,71 +14274,66 @@ msgstr "Maximum aantal artikelen dat zal worden opgehaald"
 msgid "unlimited if 0 is specified"
 msgstr "ongelimiteerd als 0 is opgegeven"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Zoek tekst:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "IMAP-servermap"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(gewoonlijk leeg)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Geef alleen geabonneerde mappen weer"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreedte-efficiente methode (vermijdt ophalen van tags)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Deze methode gebruikt minder bandbreedte, maar kan langzamer zijn met "
 "bepaalde servers."
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filter de berichten bij het ophalen met behulp van plugins"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ophalen' haalt de e-mail voor dit account op"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Stuur account-e-mailadres in Bericht-ID"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Voeg een header van de gebruikers-agent toe"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-authenticatie (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14400,183 +14341,183 @@ msgstr ""
 "Als je deze velden leeg laat, worden dezelfde\n"
 "gebruikersnaam en wachtwoord gebruikt als bij ontvangen."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Authenticatie met POP3 voor het verzenden"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "Tijdslimiet voor POP-authenticatie: "
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "minuten"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Handtekening"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Voeg automatisch ondertekening in"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Handtekening scheidingsteken"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Opdracht-uitvoer"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Automatisch volgende adressen instellen"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Woordenlijsten voor spellingcontrole"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Standaard woordenlijst"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Standaard alternatieve woordenlijst"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Standaard privacy-systeem"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Berichten altijd ondertekenen"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Berichten altijd versleutelen"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 "Berichten altijd versleutelen bij het reageren op een ondertekend bericht"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Berichten altijd versleutelen bij het reageren op een versleuteld bericht"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Versleutel verzonden berichten behalve met de sleutel van de ontvanger ook "
 "met je eigen sleutel"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Sla verzonden versleutelde berichten onversleuteld op"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Gebruik geen SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Gebruik SSL voor POP3-verbinding"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Gebruik STARTTLS voor starten SSL-sessie"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Gebruik SSL voor IMAP4-verbinding"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Gebruik SSL voor NNTP-verbinding"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Verzenden (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Gebruik geen SSL (maar, als het noodzakelijk is, gebruik STARTTLS)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Gebruik SSL voor SMTP-verbinding"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Client-certificaten"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Certificaat om te ontvangen"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Client-certificaat-bestand als een PKCS12- of PEM-bestand"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Certificaat om te verzenden"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Geldige SSL-certificaten automatisch accepteren"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Gebruik niet-blokkerende SSL"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Zet dit uit als je problemen hebt met SSL-verbindingen"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "SMTP-poort"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "POP3-poort"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "IMAP4-poort"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "NNTP-poort"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Domeinnaam"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14584,15 +14525,15 @@ msgstr ""
 "De domeinnaam wordt gebruikt in de aangemaakte Bericht-ID, en wanneer er "
 "wordt verbonden met SMTP-servers."
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Gebruik opdracht om te communiceren met server"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Verplaats verwijderde e-mails naar de vuilnisbak en wis onmiddelijk"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14600,108 +14541,108 @@ msgstr ""
 "Verplaatst verwijderde e-mails naar de vuilnisbak in plaats van gebruik te "
 "maken van de \\Verwijderd vlag zonder wissen."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markeer dubbel geplaatste berichten als gelezen en kleur:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Plaats verzonden berichten in"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Plaats berichten in wachtrij in"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Plaats kladberichten in"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Plaats verwijderde berichten in"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Je hebt geen accountnaam opgegeven."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "Je hebt geen e-mailadres opgegeven."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "Je hebt geen SMTP-server opgegeven."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Je hebt geen gebruikers-ID opgegeven."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "Je hebt geen POP3-server opgegeven."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "De standaard Inbox-map bestaat niet."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "Je hebt geen IMAP4-server opgegeven."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "Je hebt geen NNTP-server opgegeven."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "Je hebt geen bestandsnaam voor het lokale postvak opgegeven."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "Je hebt geen mail-opdrachtregel opgegeven."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - accountvoorkeuren"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Mislukt (verkeerd adres)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Selecteer bestand met handtekening"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Selecteer certificaat-bestand"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin niet geladen)"
@@ -15745,7 +15686,7 @@ msgstr "Beeld"
 msgid "Fonts"
 msgstr "Lettertypes"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Voorkeuren"
 
@@ -15890,7 +15831,7 @@ msgstr "Foutmeldingen"
 msgid "Status messages for filtering/processing log"
 msgstr "Statusmeldingen voor filteren/verwerken log"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Diversen"
 
@@ -16521,15 +16462,15 @@ msgstr "Selecteer kleur voor map"
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Kies thema sneltoetsen"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Selecteer thema:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16538,35 +16479,35 @@ msgstr ""
 "met de muis op dat item te gaan staan, en dan de gewenste toets in te "
 "drukken."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Voeg adres toe aan 'Geadresseerden' na dubbelklikken"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Afsluiten"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Bevestigen bij het afsluiten"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Prullenbak legen bij het afsluiten"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Waarschuwen wanneer er berichten in de wachtrij staan"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Sneltoetsen"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Maak aangepaste sneltoetsen mogelijk"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16576,15 +16517,15 @@ msgstr ""
 "muis op dat item te gaan staan, en dan de gewenste toets in te drukken\n"
 "Laat deze optie uit als je alle sneltoetsen wilt vastzetten."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Kies sneltoetsen..."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Metadata verwerking"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16593,31 +16534,31 @@ msgstr ""
 "schrijven,\n"
 "het vermijdt informatieverlies na vastlopen maar kan wat langer duren."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Veiliger"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Sneller"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Socket-I/O tijdslimiet"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Bevestigen bij het legen"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "Bij handmatig filteren, vraag naar accountspecifieke filterregels"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Gebruik veilige bestandsverwijdering wanneer mogelijk"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16625,7 +16566,7 @@ msgstr ""
 "Gebruik veilige bestandsverwijdering wanneer mogelijk\n"
 "(het programma 'shred' is niet beschikbaar)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16634,32 +16575,11 @@ msgstr ""
 "overschrijven voor het verwijderen. Dit vertraagt het verwijderen. Het "
 "advies is om de handleiding (man shred) na te lezen voor de zekerheid."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchroniseer offline mappen zo snel mogelijk"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Invoeren wachtwoord"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Invoeren wachtwoord"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Invoeren wachtwoord"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Overige"
 
@@ -16917,8 +16837,8 @@ msgstr ""
 "Specificeer de Inhoud-Overdracht-Codering (Content-Transfer-Encoding) die "
 "gebruikt moet worden als de tekst van het bericht niet-ASCII tekens bevat"
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Verzenden"
 
@@ -17653,28 +17573,28 @@ msgstr "Geen informatie beschikbaar"
 msgid "No recipient keys defined."
 msgstr "Geen sleutel van ontvanger gedefinieerd."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fout bij decoderen BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Reeds bezig met proberen te sturen."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Kon bestand '%s' niet openen."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "Header van bericht in de wachtrij is kapot."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "Er is een fout opgetreden tijdens de SMTP-sessie."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -17682,7 +17602,7 @@ msgstr ""
 "Er is geen specifiek account gevonden om mee te versturen en er is een fout "
 "opgetreden tijdens de SMTP-sessie."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17690,21 +17610,21 @@ msgstr ""
 "Kon verzend-informatie niet vinden. Misschien is deze e-mail niet gemaakt "
 "met Claws Mail."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "Kon tijdelijk bestand voor het verzenden van nieuws niet aanmaken."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Fout bij het schrijven naar tijdelijk bestand voor het verzenden van nieuws."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Berichten sorteren...\n"
 
@@ -18008,88 +17928,88 @@ msgstr "Geef tekst om '%s' mee te vervangen"
 msgid "Enter variable"
 msgstr "Geef variabele"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Bericht wordt verzonden met behulp van opdracht: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Kon de externe opdracht '%s' niet uitvoeren"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fout bij uitvoeren van opdracht: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Verbinding wordt gemaakt"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Bezig met POP voor SMTP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP voor SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Account '%s': Verbinden met SMTP-server: %s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "Bestand succesvol verzonden."
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "HELO wordt verstuurd..."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Bezig met authenticatie"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Bericht wordt verzonden..."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "EHLO wordt verstuurd..."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM wordt verstuurd..."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO wordt verstuurd..."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "DATA wordt verstuurd..."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Bezig met sluiten..."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Bericht wordt verzonden (%d / %d bytes)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Bericht wordt verzonden"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Er is een fout opgetreden bij het verzenden."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18966,12 +18886,12 @@ msgstr "Selecteer een adres om te openen."
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Welkom bij Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -19062,47 +18982,47 @@ msgstr ""
 "dat doen te <%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Geef naam van postvak."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Geef naam en e-mailadres."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Geef onvangende server en gebruikersnaam."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Geef je gebruikersnaam."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Geef je SMTP-server."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Geef je SMTP-gebruikersnaam."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Je naam:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Je e-mailadres:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Je organisatie:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Postvak-naam:"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19110,7 +19030,7 @@ msgstr ""
 "Je kunt ook een absoluut pad opgeven, bijvoorbeeld: \"/home/kees/Documenten/"
 "Mail\""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19118,55 +19038,55 @@ msgstr ""
 "Je kunt het poortnummer specificeren door het aan het eind toe te voegen: "
 "\"mail.voorbeeld.com:25\""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "SMTP-serveradres:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Gebruik authenticatie"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(laat leeg om dezelfde als bij ontvangen te gebruiken)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "SMTP-gebruikersnaam"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "SMTP-wachtwoord:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Gebruik SSL voor verbinding met de SMTP-server"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Gebruik SSL via STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Client SSL-certificaat (optioneel)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Serveradres:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Lokaal postvak:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Servertype:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19174,19 +19094,19 @@ msgstr ""
 "Je kunt het poortnummer specificeren door het aan het eind toe te voegen: "
 "\"mail.voorbeeld.com:110\""
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Gebruik SSL voor verbinding met de ontvangende server"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "IMAP-serverdirectory:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Alleen ge-abonneerde mappen weergeven"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19194,15 +19114,15 @@ msgstr ""
 "Waarschuwing: deze versie van Claws Mail\n"
 "is gecompileerd zonder ondersteuning voor IMAP."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail Setup-assistent"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Welkom by Claws Mail"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19216,37 +19136,34 @@ msgstr ""
 "gebruikte e-mailopties zodat je binnen vijf minuten Claws Mail kunt "
 "gebruiken."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Over u"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Velden in vet zijn verplicht"
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "E-mail ontvangen"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "E-mail verzenden"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "E-mail opslaan op schijf"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Klaar met instellen"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Claws Mail is nu klaar.\n"
 "Klik op 'Opslaan' om te starten."
-
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "De ondertekening kan niet worden gecontroleerd - %s."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 29ae6d3..4826da7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-22 11:07+0000\n"
 "PO-Revision-Date: 2015-12-20 19:02-0300\n"
 "Last-Translator: Frederico Goncalves Guimaraes <frederico at teia.bio.br>\n"
 "Language-Team: Portuguese <>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -28,15 +28,15 @@ msgstr ""
 "Algumas janelas de composição estão abertas.\n"
 "Por favor, feche todas essas janelas antes de editar as contas."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Não foi possível criar a pasta."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Editar contas"
 
-#: src/account.c:744
+#: src/account.c:741
 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,43 +46,43 @@ msgstr ""
 "contas, na ordem fornecida. As caixas de checagem indicam quais contas serão "
 "incluídas. A conta padrão possui o seu texto em negrito."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " Definir como conta _padrão "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Contas com pastas remotas não podem ser copiadas."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Cópia de %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Deseja realmente excluir a conta '%s'?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Sem título)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Excluir conta"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Receber mensagem' busca os e-mails das contas marcadas"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -95,11 +95,11 @@ msgstr "'Receber mensagem' busca os e-mails das contas marcadas"
 msgid "Name"
 msgstr "Nome"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Servidor"
 
@@ -152,10 +152,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -423,18 +423,18 @@ msgid "_Book"
 msgstr "Li_vro"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -473,13 +473,13 @@ msgstr "E_xcluir livro"
 msgid "_Save"
 msgstr "_Salvar"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Fechar"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "Selecionar _todos"
 
@@ -488,7 +488,7 @@ msgid "C_ut"
 msgstr "_Recortar"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copiar"
@@ -538,8 +538,8 @@ msgstr "Encontrar d_uplicatas..."
 msgid "Edit custom attributes..."
 msgstr "Editar atributos _personalizados..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_Sobre"
 
@@ -655,7 +655,7 @@ msgstr "Foi requerida uma autenticação (mais) forte"
 msgid "Sources"
 msgstr "Fontes"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Livro de endereços"
@@ -708,7 +708,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Excluir a pasta"
 
@@ -823,7 +823,7 @@ msgid "Person"
 msgstr "Pessoa"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Pasta"
 
@@ -960,18 +960,18 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Não foi possível atualizar. As mudanças não foram escritas no diretório."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9473
 msgid "Notice"
 msgstr "Nota"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
+#: src/alertpanel.c:159 src/compose.c:5680 src/compose.c:6203
+#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868 src/plugins/pgpcore/sgpgme.c:746
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5621 src/inc.c:669
 #: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
 msgid "Error"
 msgstr "Erro"
@@ -1004,67 +1004,67 @@ msgstr "Nome no LDAP"
 msgid "Attribute Value"
 msgstr "Atribuir valor"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Nenhum"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "um visualizador"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "um analisador MIME"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "pastas"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "filtragem"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "uma interface de privacidade"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "um notificador"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "um utilitário"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "coisas"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Esse plugin fornece %s (%s), o qual já é fornecido pelo plugin %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "O plugin Já foi carregado"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Não foi possível alocar memória para o plugin"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Esse módulo não está licenciado sob uma licença compatível com a GPL v3 ou "
 "posterior."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Esse módulo é para o Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1073,7 +1073,7 @@ msgstr ""
 "A sua versão do Claws Mail é mais recente do que a utilizada para construir "
 "o plugin '%s'."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1081,16 +1081,16 @@ msgstr ""
 "A sua versão do Claws Mail é mais recente do que a utilizada para construir "
 "o plugin."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "A sua versão do Claws Mail é muito antiga para o plugin '%s'."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "A sua versão do Claws Mail é muito antiga para o plugin."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "Não foi possível efetuar o handshake do SSL\n"
 
@@ -1480,7 +1480,7 @@ msgstr "_Remover"
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_Mensagem"
 
@@ -1548,7 +1548,7 @@ msgstr "Com _quebra de linhas"
 msgid "_Unwrapped"
 msgstr "_Sem quebra de linhas"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Selecionar _tudo"
@@ -1613,7 +1613,7 @@ msgstr "Apagar a linha"
 msgid "Delete to end of line"
 msgstr "Apagar até o final da linha"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "Locali_zar"
@@ -1658,47 +1658,47 @@ msgstr "Sistema de _privacidade"
 msgid "_Priority"
 msgstr "_Prioridade"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Codificação dos caracteres"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Europeu Ocidental"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonês"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Chinês"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Tailandês"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Livro de endereços"
 
@@ -1706,7 +1706,7 @@ msgstr "_Livro de endereços"
 msgid "_Template"
 msgstr "_Modelo"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "_Ações"
 
@@ -1742,11 +1742,11 @@ msgstr "Exibir _régua"
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Todos"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_Remetente"
 
@@ -1770,27 +1770,27 @@ msgstr "_Baixa"
 msgid "_Lowest"
 msgstr "Bai_xíssima"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automática"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "U_nicode (UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europeu Central (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "_Grego (ISO-8859-7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
@@ -1841,48 +1841,48 @@ msgstr "O corpo do modelo \"Encaminhar\" possui um erro na linha %d."
 msgid "Fw: multiple emails"
 msgstr "Enc: múltiplos e-mails"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "O corpo do modelo \"Redirecionar\" possui um erro na linha %d."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Cco:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Responder para:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4935 src/compose.c:4937
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Seguindo a:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Em resposta a:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4932 src/compose.c:4940
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Não foi possível anexar o arquivo (erro na conversão da codificação dos "
 "caracteres)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1897,16 +1897,16 @@ msgstr[1] ""
 "Os seguintes arquivos foram anexados: \n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "A \"Marca de citação\" do modelo é inválida."
 
-#: src/compose.c:3605
+#: src/compose.c:3602
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Não foi possível obter o tamanho do arquivo '%s'."
 
-#: src/compose.c:3616
+#: src/compose.c:3613
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1915,58 +1915,58 @@ msgstr ""
 "Você esta prestes a inserir um arquivo de %s no corpo da mensagem. Deseja "
 "realmente fazer isso?"
 
-#: src/compose.c:3619
+#: src/compose.c:3616
 msgid "Are you sure?"
 msgstr "Tem certeza?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3617 src/compose.c:10529 src/compose.c:11390
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: src/compose.c:3744
+#: src/compose.c:3741
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:3745
+#: src/compose.c:3742
 msgid "Empty file"
 msgstr "Arquivo vazio"
 
-#: src/compose.c:3746
+#: src/compose.c:3743
 #, fuzzy
 msgid "_Attach anyway"
 msgstr "+_Anexar mesmo assim"
 
-#: src/compose.c:3755
+#: src/compose.c:3752
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3779
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4772 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Editada]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4779 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Escrever mensagem%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4782 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sem assunto] - Escrever mensagem%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4784 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Escrever mensagem"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4811 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1974,52 +1974,52 @@ msgstr ""
 "Não foi especificada uma conta para o envio da\n"
 "mensagem. Por favor, selecione uma conta antes de enviar."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5031 src/compose.c:5063 src/compose.c:5105
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:5035
+#: src/compose.c:5032
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cc padrão. Enviar mesmo assim?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5033 src/compose.c:5065 src/compose.c:5098 src/compose.c:5622
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:5067
+#: src/compose.c:5064
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cco padrão. Enviar mesmo assim?"
 
-#: src/compose.c:5084
+#: src/compose.c:5081
 msgid "Recipient is not specified."
 msgstr "O destinatário não foi especificado."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5100 src/plugins/attachwarner/attachwarner.c:212
 #, fuzzy
 msgid "_Queue"
 msgstr "+Mandar para a _Fila de Saída"
 
-#: src/compose.c:5104
+#: src/compose.c:5101
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "A mensagem está sem assunto. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5102 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Enviar mesmo assim?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Mandar para a Fila de Saída mesmo assim?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5105 src/toolbar.c:425
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5158 src/compose.c:9993
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2029,7 +2029,7 @@ msgstr ""
 "\n"
 "Ocorreu um erro na conversão da codificação dos caracteres."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5161 src/compose.c:9996
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2039,7 +2039,7 @@ msgstr ""
 "\n"
 "Não foi possível obter a chave de criptografia do destinatário."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5167 src/compose.c:9990
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2050,7 +2050,7 @@ msgstr ""
 "\n"
 "Falha na assinatura: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5170
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2061,11 +2061,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5172
 msgid "Could not queue message for sending."
 msgstr "Não foi possível acrescentar a mensagem à Fila de Saída."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5187 src/compose.c:5247
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2074,7 +2074,7 @@ msgstr ""
 "Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
 "tentar novamente."
 
-#: src/compose.c:5246
+#: src/compose.c:5243
 #, c-format
 msgid ""
 "%s\n"
@@ -2084,7 +2084,7 @@ msgstr ""
 "Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
 "tentar novamente."
 
-#: src/compose.c:5621
+#: src/compose.c:5618
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2095,7 +2095,7 @@ msgstr ""
 "para a codificação %s especificada.\n"
 "Enviá-la como %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5676
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2108,74 +2108,74 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:5790
+#: src/compose.c:5787
 #, fuzzy, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Não foi possível descriptografar: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5908
 msgid "Encryption warning"
 msgstr "Aviso de criptografia"
 
-#: src/compose.c:5912
+#: src/compose.c:5909
 #, fuzzy
 msgid "C_ontinue"
 msgstr "+C_ontinuar"
 
-#: src/compose.c:5961
+#: src/compose.c:5958
 msgid "No account for sending mails available!"
 msgstr "Não existem contas para enviar a mensagem!"
 
-#: src/compose.c:5970
+#: src/compose.c:5967
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "A conta selecionada não é NNTP: é impossível enviar a mensagem."
 
-#: src/compose.c:6205
+#: src/compose.c:6202
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "O anexo %s não existe mais. Devo ignorar?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6203 src/mainwindow.c:651 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Cancelar o envio"
 
-#: src/compose.c:6206
+#: src/compose.c:6203
 msgid "Ignore attachment"
 msgstr "Ignorar o anexo"
 
-#: src/compose.c:6246
+#: src/compose.c:6243
 #, c-format
 msgid "Original %s part"
 msgstr "Parte %s original"
 
-#: src/compose.c:6824
+#: src/compose.c:6825
 msgid "Add to address _book"
 msgstr "Adicionar ao _Livro de Endereços"
 
-#: src/compose.c:6985
+#: src/compose.c:6986
 msgid "Delete entry contents"
 msgstr "Excluir o conteúdo da entrada"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6990 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Use <tab> para completar automaticamente a partir do Livro de Endereços"
 
-#: src/compose.c:7204
+#: src/compose.c:7212
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:7273
+#: src/compose.c:7281
 msgid "Save Message to "
 msgstr "Salvar mensagem em "
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7318 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2186,23 +2186,23 @@ msgstr "Salvar mensagem em "
 msgid "_Browse"
 msgstr "Nav_egar"
 
-#: src/compose.c:7783
+#: src/compose.c:7791
 msgid "Hea_der"
 msgstr "_Cabeçalho"
 
-#: src/compose.c:7788
+#: src/compose.c:7796
 msgid "_Attachments"
 msgstr "Ane_xos"
 
-#: src/compose.c:7802
+#: src/compose.c:7810
 msgid "Othe_rs"
 msgstr "_Outros"
 
-#: src/compose.c:7817
+#: src/compose.c:7825
 msgid "S_ubject:"
 msgstr "_Assunto:"
 
-#: src/compose.c:8041
+#: src/compose.c:8049
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2211,19 +2211,19 @@ msgstr ""
 "Não foi possível iniciar o verificador ortográfico.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8188
 msgid "_From:"
 msgstr "_De:"
 
-#: src/compose.c:8197
+#: src/compose.c:8205
 msgid "Account to use for this email"
 msgstr "Conta a ser usada por esse e-mail"
 
-#: src/compose.c:8199
+#: src/compose.c:8207
 msgid "Sender address to be used"
 msgstr "Endereço do remetente a ser usado"
 
-#: src/compose.c:8365
+#: src/compose.c:8373
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2232,68 +2232,68 @@ msgstr ""
 "Não foi possível carregar o sistema de privacidade '%s'. Você não poderá "
 "assinar ou criptografar essa mensagem."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Nenhum"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8575 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "O corpo do modelo possui um erro na linha %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8691
 msgid "Template From format error."
 msgstr "Erro no formato do Remetente do modelo."
 
-#: src/compose.c:8701
+#: src/compose.c:8709
 msgid "Template To format error."
 msgstr "Erro no formato do Destinatário do modelo."
 
-#: src/compose.c:8719
+#: src/compose.c:8727
 msgid "Template Cc format error."
 msgstr "Erro no formato da Cc do modelo."
 
-#: src/compose.c:8737
+#: src/compose.c:8745
 msgid "Template Bcc format error."
 msgstr "Erro no formato da Cco do modelo."
 
-#: src/compose.c:8755
+#: src/compose.c:8763
 msgid "Template Reply-To format error."
 msgstr "Erro no formato do Responder Para do modelo."
 
-#: src/compose.c:8774
+#: src/compose.c:8782
 msgid "Template subject format error."
 msgstr "Erro no formato do assunto do modelo."
 
-#: src/compose.c:9043
+#: src/compose.c:9051
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:9058
+#: src/compose.c:9066
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:9132
+#: src/compose.c:9140
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:9149
+#: src/compose.c:9157
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:9190
+#: src/compose.c:9198
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:9210
+#: src/compose.c:9218
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:9211
+#: src/compose.c:9219
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:9462
+#: src/compose.c:9470
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2304,15 +2304,15 @@ msgstr ""
 "Deseja terminar o processo?\n"
 "Id do grupo do processo: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9959 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "O Claws Mail necessita de acesso à rede para enviar essa mensagem."
 
-#: src/compose.c:9977
+#: src/compose.c:9985
 msgid "Could not queue message."
 msgstr "Não foi possível adicionar a mensagem à Fila de Saída."
 
-#: src/compose.c:9979
+#: src/compose.c:9987
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2323,15 +2323,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10165
 msgid "Could not save draft."
 msgstr "Não foi possível salvar o rascunho."
 
-#: src/compose.c:10161
+#: src/compose.c:10169
 msgid "Could not save draft"
 msgstr "Não foi possível salvar o rascunho"
 
-#: src/compose.c:10162
+#: src/compose.c:10170
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2339,24 +2339,24 @@ msgstr ""
 "Não foi possível salvar o rascunho.\n"
 "Deseja cancelar a saída ou descartar essa mensagem?"
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Cancel exit"
 msgstr "_Cancelar a saída"
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Discard email"
 msgstr "_Descartar a mensagem"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10332 src/compose.c:10346
 msgid "Select file"
 msgstr "Selecione o arquivo"
 
-#: src/compose.c:10352
+#: src/compose.c:10360
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Não foi possível ler o arquivo '%s'."
 
-#: src/compose.c:10354
+#: src/compose.c:10362
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2365,54 +2365,54 @@ msgstr ""
 "O arquivo '%s' continha caracteres inválidos para a\n"
 "codificação atual, a inserção pode estar incorreta."
 
-#: src/compose.c:10441
+#: src/compose.c:10449
 msgid "Discard message"
 msgstr "Descartar a mensagem"
 
-#: src/compose.c:10442
+#: src/compose.c:10450
 msgid "This message has been modified. Discard it?"
 msgstr "Essa mensagem foi modificada. Deseja descartá-la ?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10451 src/compose.c:10455
 msgid "_Save to Drafts"
 msgstr "Salvar em _Rascunhos"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Salvar alterações"
 
-#: src/compose.c:10446
+#: src/compose.c:10454
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Essa mensagem foi modificada. Deseja salvar as últimas alterações?"
 
-#: src/compose.c:10447
+#: src/compose.c:10455
 msgid "_Don't save"
 msgstr "_Não salvar"
 
-#: src/compose.c:10518
+#: src/compose.c:10526
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Deseja aplicar o modelo '%s'?"
 
-#: src/compose.c:10520
+#: src/compose.c:10528
 msgid "Apply template"
 msgstr "Aplicar o modelo"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10529 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:11379
+#: src/compose.c:11387
 msgid "Insert or attach?"
 msgstr "Inserir ou anexar?"
 
-#: src/compose.c:11380
+#: src/compose.c:11388
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2420,16 +2420,16 @@ msgstr ""
 "Você deseja inserir o conteúdo do(s) arquivo(s) no corpo da mensagem ou "
 "anexá-lo ao e-mail?"
 
-#: src/compose.c:11382
+#: src/compose.c:11390
 msgid "_Attach"
 msgstr "_Anexar"
 
-#: src/compose.c:11599
+#: src/compose.c:11607
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erro no formato da citação, na linha %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11902
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2646,8 +2646,8 @@ msgid " Check File "
 msgstr " Verificar o arquivo "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Arquivo"
 
@@ -2796,7 +2796,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2983,7 +2983,7 @@ msgstr ""
 "O número máximo de entradas que devem ser apresentadas como resultado da "
 "pesquisa."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Básico"
 
@@ -3122,15 +3122,15 @@ msgid "Stylesheet"
 msgstr "Folha de Estilo"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Nenhum"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Padrão"
 
@@ -3643,27 +3643,27 @@ msgstr "Lixeira"
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Processando (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s para %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movendo %s para %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Atualizando o cache para %s ..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Processando as mensagens..."
 
@@ -3689,7 +3689,7 @@ msgstr "NovaPasta"
 #: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
 #: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' não pode ser incluído no nome da pasta."
@@ -3697,7 +3697,7 @@ msgstr "'%c' não pode ser incluído no nome da pasta."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "A pasta '%s' já existe."
@@ -3721,7 +3721,7 @@ msgstr "Marcar _recursivamente todas como lidas"
 msgid "R_un processing rules"
 msgstr "E_xecutar regras de processamento"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_Pesquisar na pasta..."
 
@@ -3778,12 +3778,12 @@ msgstr "Deseja realmente marcar todas as mensagens dessa pasta como lidas?"
 msgid "Mark all as read"
 msgstr "Marcar todas como lidas"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Vasculhando a pasta %s%c%s..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Vasculhando a pasta %s..."
@@ -3830,7 +3830,7 @@ msgstr "Abrindo a pasta %s..."
 msgid "Folder could not be opened."
 msgstr "Não foi possível abrir a pasta."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Esvaziar Lixeira"
 
@@ -4075,7 +4075,7 @@ msgstr ""
 "Locale: %s (codificação dos caracteres: %s)\n"
 "Sistema operacional: desconhecido"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "A equipe do Claws Mail"
 
@@ -5071,9 +5071,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -5112,14 +5112,14 @@ msgstr "Plugins carregados"
 msgid "Page Index"
 msgstr "Índice da Página"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Esconder"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5563,237 +5563,231 @@ msgstr "Tamanho do arquivo:"
 msgid "Load Image"
 msgstr "Carregar imagem"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "A conexão com o IMAP4 foi interrompida\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, fuzzy, c-format
 msgid "IMAP error on %s:"
 msgstr "Erro no IMAP em %s: estado ruim\n"
 
-#: src/imap.c:622
+#: src/imap.c:621
 #, fuzzy
-msgid "authenticated"
+msgid " authenticated\n"
 msgstr "Sem autenticação"
 
-#: src/imap.c:625
+#: src/imap.c:624
 #, fuzzy
-msgid "not authenticated"
+msgid " not authenticated\n"
 msgstr "Sem autenticação"
 
-#: src/imap.c:628
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr ""
 
-#: src/imap.c:631
+#: src/imap.c:630
 #, fuzzy
-msgid "stream error"
+msgid " stream error\n"
 msgstr "Erro na leitura do socket"
 
-#: src/imap.c:634
+#: src/imap.c:633
 #, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 "Erro no IMAP em %s: erro de análise (muito provavelmente uma submissão não-"
 "RFC do servidor)\n"
 
-#: src/imap.c:638
+#: src/imap.c:637
 #, fuzzy
-msgid "connection refused"
+msgid " connection refused\n"
 msgstr "Ocorreu uma falha na conexão"
 
-#: src/imap.c:641
+#: src/imap.c:640
 #, fuzzy
-msgid "memory error"
+msgid " memory error\n"
 msgstr "Erro no IMAP em %s: erro de memória\n"
 
-#: src/imap.c:644
+#: src/imap.c:643
 #, fuzzy
-msgid "fatal error"
+msgid " fatal error\n"
 msgstr "Erro interno"
 
-#: src/imap.c:647
+#: src/imap.c:646
 #, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 "Erro no IMAP em %s: erro de protocolo (muito provavelmente uma submissão não-"
 "RFC do servidor)\n"
 
-#: src/imap.c:651
+#: src/imap.c:650
 #, fuzzy
-msgid "connection not accepted"
+msgid " connection not accepted\n"
 msgstr "Erro no IMAP em %s: conexão não aceita\n"
 
-#: src/imap.c:654
+#: src/imap.c:653
 #, fuzzy
-msgid "APPEND error"
+msgid " APPEND error\n"
 msgstr "Erro no IMAP em %s: erro no APPEND\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
-msgstr "Erro no IMAP em %s: erro no LOGOUT\n"
+#: src/imap.c:656
+msgid " NOOP error\n"
+msgstr ""
 
-#: src/imap.c:660
+#: src/imap.c:659
 #, fuzzy
-msgid "LOGOUT error"
+msgid " LOGOUT error\n"
 msgstr "Erro no IMAP em %s: erro no LOGOUT\n"
 
-#: src/imap.c:663
+#: src/imap.c:662
 #, fuzzy
-msgid "CAPABILITY error"
+msgid " CAPABILITY error\n"
 msgstr "Erro no IMAP em %s: erro no CAPABILITY\n"
 
-#: src/imap.c:666
+#: src/imap.c:665
 #, fuzzy
-msgid "CHECK error"
+msgid " CHECK error\n"
 msgstr "Erro no IMAP em %s: erro no CHECK\n"
 
-#: src/imap.c:669
+#: src/imap.c:668
 #, fuzzy
-msgid "CLOSE error"
+msgid " CLOSE error\n"
 msgstr "Erro no IMAP em %s: erro no CLOSE\n"
 
-#: src/imap.c:672
+#: src/imap.c:671
 #, fuzzy
-msgid "EXPUNGE error"
+msgid " EXPUNGE error\n"
 msgstr "Erro no IMAP em %s: erro no EXPUNGE\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
-msgstr "Erro no IMAP em %s: erro no UID COPY\n"
+#: src/imap.c:674
+msgid " COPY error\n"
+msgstr ""
 
-#: src/imap.c:678
+#: src/imap.c:677
 #, fuzzy
-msgid "UID COPY error"
+msgid " UID COPY error\n"
 msgstr "Erro no IMAP em %s: erro no UID COPY\n"
 
-#: src/imap.c:681
+#: src/imap.c:680
 #, fuzzy
-msgid "CREATE error"
+msgid " CREATE error\n"
 msgstr "Erro no IMAP em %s: erro no CREATE\n"
 
-#: src/imap.c:684
+#: src/imap.c:683
 #, fuzzy
-msgid "DELETE error"
+msgid " DELETE error\n"
 msgstr "Erro no IMAP em %s: erro no DELETE\n"
 
-#: src/imap.c:687
+#: src/imap.c:686
 #, fuzzy
-msgid "EXAMINE error"
+msgid " EXAMINE error\n"
 msgstr "Erro no IMAP em %s: erro no EXAMINE\n"
 
-#: src/imap.c:690
+#: src/imap.c:689
 #, fuzzy
-msgid "FETCH error"
+msgid " FETCH error\n"
 msgstr "Erro no IMAP em %s: erro no FETCH\n"
 
-#: src/imap.c:693
+#: src/imap.c:692
 #, fuzzy
-msgid "UID FETCH error"
+msgid " UID FETCH error\n"
 msgstr "Erro no IMAP em %s: erro no UID FETCH\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
-msgstr "Erro no IMAP em %s: erro no CLOSE\n"
+#: src/imap.c:695
+msgid " LIST error\n"
+msgstr ""
 
-#: src/imap.c:699
+#: src/imap.c:698
 #, fuzzy
-msgid "LOGIN error"
+msgid " LOGIN error\n"
 msgstr "Erro no IMAP em %s: erro no LOGIN\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
-msgstr "Erro no IMAP em %s: erro no CLOSE\n"
+#: src/imap.c:701
+msgid " LSUB error\n"
+msgstr ""
 
-#: src/imap.c:705
+#: src/imap.c:704
 #, fuzzy
-msgid "RENAME error"
+msgid " RENAME error\n"
 msgstr "Erro no IMAP em %s: erro no RENAME\n"
 
-#: src/imap.c:708
+#: src/imap.c:707
 #, fuzzy
-msgid "SEARCH error"
+msgid " SEARCH error\n"
 msgstr "Erro no IMAP em %s: erro no SEARCH\n"
 
-#: src/imap.c:711
+#: src/imap.c:710
 #, fuzzy
-msgid "UID SEARCH error"
+msgid " UID SEARCH error\n"
 msgstr "Erro no IMAP em %s: erro no UID SEARCH\n"
 
-#: src/imap.c:714
+#: src/imap.c:713
 #, fuzzy
-msgid "SELECT error"
+msgid " SELECT error\n"
 msgstr "Erro no IMAP em %s: erro no SELECT\n"
 
-#: src/imap.c:717
+#: src/imap.c:716
 #, fuzzy
-msgid "STATUS error"
+msgid " STATUS error\n"
 msgstr "Erro no IMAP em %s: erro no STATUS\n"
 
-#: src/imap.c:720
+#: src/imap.c:719
 #, fuzzy
-msgid "STORE error"
+msgid " STORE error\n"
 msgstr "Erro no IMAP em %s: erro no STORE\n"
 
-#: src/imap.c:723
+#: src/imap.c:722
 #, fuzzy
-msgid "UID STORE error"
+msgid " UID STORE error\n"
 msgstr "Erro no IMAP em %s: erro no UID STORE\n"
 
-#: src/imap.c:726
+#: src/imap.c:725
 #, fuzzy
-msgid "SUBSCRIBE error"
+msgid " SUBSCRIBE error\n"
 msgstr "Erro no IMAP em %s: erro no SUBSCRIBE\n"
 
-#: src/imap.c:729
+#: src/imap.c:728
 #, fuzzy
-msgid "UNSUBSCRIBE error"
+msgid " UNSUBSCRIBE error\n"
 msgstr "Erro no IMAP em %s: erro no UNSUBSCRIBE\n"
 
-#: src/imap.c:732
+#: src/imap.c:731
 #, fuzzy
-msgid "STARTTLS error"
+msgid " STARTTLS error\n"
 msgstr "Erro no IMAP em %s: erro no STARTTLS\n"
 
-#: src/imap.c:735
+#: src/imap.c:734
 #, fuzzy
-msgid "INVAL error"
+msgid " INVAL error\n"
 msgstr "Erro no IMAP em %s: erro no INVAL\n"
 
-#: src/imap.c:738
+#: src/imap.c:737
 #, fuzzy
-msgid "EXTENSION error"
+msgid " EXTENSION error\n"
 msgstr "Erro no IMAP em %s: erro no EXTENSION\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
-msgstr "Erro no IMAP em %s: erro no STATUS\n"
+#: src/imap.c:740
+msgid " SASL error\n"
+msgstr ""
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
-msgstr "Erro no IMAP em %s: erro no SELECT\n"
+#: src/imap.c:744
+msgid " SSL error\n"
+msgstr ""
 
-#: src/imap.c:749
+#: src/imap.c:748
 #, fuzzy, c-format
-msgid "Unknown error [%d]"
+msgid " Unknown error [%d]\n"
 msgstr "Erro desconhecido"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5805,7 +5799,7 @@ msgstr ""
 "Autenticações CRAM-MD5 funcionam somente se a libetpan estiver compilada com "
 "suporte a SASL e o plugin CRAM-MD5 SASL instalado."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5817,7 +5811,7 @@ msgstr ""
 "Autenticações DIGEST-MD5 funcionam somente se a libetpan estiver compilada "
 "com suporte a SASL e o plugin DIGEST-MD5 SASL estiver instalado."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5829,50 +5823,37 @@ msgstr ""
 "Autenticações SCRAM-SHA-1 funcionam somente se a libetpan estiver compilada "
 "com suporte a SASL e o plugin SCRAM SASL instalado."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"Autenticações CRAM-MD5 funcionam somente se a libetpan estiver compilada com "
-"suporte a SASL e o plugin CRAM-MD5 SASL instalado."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Erro na conexão com %s: login recusado.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Erro na conexão com %s: login recusado.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Erro na conexão com %s"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s foi interrompida. Reconectando...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "O Claws Mail necessita de acesso à rede para conectar-se ao servidor IMAP."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5885,104 +5866,104 @@ msgstr ""
 "\n"
 "Você quer continuar a conexão ao servidor? A comunicação não será segura."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "Con_tinuar a conexão"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor IMAP4: %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Não foi possível autenticar-se no servidor IMAP %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Não foi possível conectar-se ao servidor IMAP %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Adicionando mensagens..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "não foi possível definir as marcas de exclusão\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "não foi possível expurgar\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Procurando por pastas não assinadas em %s..."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Procurando por sub-pastas de %s..."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não foi possível criar a caixa postal: falha no comando LIST\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "não foi possível criar a caixa postal\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não foi possível renomear a caixa postal: %s para %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "não foi possível excluir a caixa postal\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "Erro no comando LIST\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Marcando as mensagens..."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não foi possível selecionar a pasta: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "O servidor depende do TLS para efetutar a autenticação.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Não foi possível atualizar as capacidades.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5991,20 +5972,20 @@ msgstr ""
 "Ocorreu uma falha na conexão com %s: o servidor requer TLS, mas o Claws Mail "
 "foi compilado sem o suporte a TLS.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "As autenticações no servidor estão desabilitadas.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Buscando a mensagem..."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "não foi possível definir marcas de exclusão: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6056,7 +6037,7 @@ msgstr "Ass_inaturas"
 msgid "_Subscribe..."
 msgstr "Assi_nar..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "Cance_lar assinatura..."
 
@@ -6093,20 +6074,20 @@ msgstr "Propriedades herdadas da pasta superior"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Entre com o novo nome para '%s':"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Renomear a pasta"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6129,7 +6110,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível remover a pasta '%s'."
@@ -6157,7 +6138,7 @@ msgstr "+_Pesquisar"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Selecione uma sub-pasta de %s para assinar:"
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Assinar"
 
@@ -6387,56 +6368,56 @@ msgstr "Selecione o arquivo do Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Incorporar o arquivo do Pine ao Livro de Endereços"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "O Claws Mail necessita de acesso à rede para obter as mensagens."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s falhou\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Recebendo novas mensagens"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Recebendo"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Pronto (%d mensagem, (%s) recebida)"
 msgstr[1] "Pronto (%d mensagens, (%s) recebidas)"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Pronto (não há novas mensagens)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Ocorreu uma falha na conexão"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Ocorreu um erro na autenticação"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Travada"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Tempo esgotado"
 
@@ -6472,7 +6453,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível conectar ao servidor POP3: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
@@ -6497,7 +6478,7 @@ msgstr "Obtendo o número de novas mensagens (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamanho das mensagens (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Saindo"
 
@@ -6548,7 +6529,7 @@ msgstr "Erro de socket."
 msgid "Socket error on connection to %s:%d."
 msgstr "Erro de socket na conexão com %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "A conexão foi fechada pelo computador remoto."
 
@@ -6570,11 +6551,11 @@ msgstr ""
 "A caixa postal está travada:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Ocorreu uma falha na autenticação."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6583,7 +6564,7 @@ msgstr ""
 "Ocorreu uma falha na autenticação:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6945,816 +6926,811 @@ msgstr "NetworkManager: a rede está conectada.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: a rede está desconectada.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "E_xibir"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Configurações"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "Adicionar caixa _postal"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Mudar a ordenação da caixa postal..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "Importar arquivo _mbox"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "Exporta para arquivo m_box"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "Exportar a seleção para um _arquivo mbox..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Esvaziar todas as _Lixeiras"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "Salvar a _mensagem como..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "Salvar a _parte como..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Con_figuração da página..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "_Sincronizar pastas"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "Sai_r"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "Selecionar _discussão"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_Localizar na mensagem atual..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "Pesquisa _rápida"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "_Mostrar ou esconder"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "_Barra de ferramentas"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "Definir colu_nas visíveis"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "Na lista de _pastas..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "Na lista de _mensagens"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "_Aparência"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "_Atrair pelo assunto"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "E_xpandir todas as discussões"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "Recolher _todas as discussões"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Ir para"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "Mensagem _anterior"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "_Próxima mensagem"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Mensagem não _lida anterior"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Próxima mensagem _não lida"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "_Mensagem nova anterior"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Próxima m_ensagem nova"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Mensagem ma_rcada anterior"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Próxima mensa_gem marcada"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Mensagem rot_ulada anterior"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Próxima mensagem ro_tulada"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Mensagem aberta anterior"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Próxima mensagem aberta"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Mensagem pai"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Próxima pa_sta não lida"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Outra pasta..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Próxima parte"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Parte anterior"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Rolagem da mensagem"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Linha anterior"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Próxima linha"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Próxima página"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "_Decodificação"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "Abrir em uma nova _janela"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Código-_fonte da mensagem"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Parte da mensagem"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Visualizar como texto"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Abrir"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Abrir com..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Ci_tações"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "At_ualizar sumário"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "_Receber"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Receber da conta _atual"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Receber de _todas as contas"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "_Cancelar a recepção"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "_Enviar mensagens da Fila de Saída"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "Escrever uma mensa_gem de e-mail"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Escrever artigo de _Newsgroup"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Responder _para"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "_Lista de discussão"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "_Acompanhar o assunto e responder"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Encaminhar como _anexo"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Re_direcionar"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "_Lista de discussão"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Enviar _mensagem"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "_Ajuda"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Cancelar assinatura"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "_Ver arquivo"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "_Contatar o administrador"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "M_over..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Mover para a _Lixeira"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "E_xcluir..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 #, fuzzy
 msgid "Move thread to tr_ash"
 msgstr "Mover para a _Lixeira"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "Delete t_hread"
 msgstr "_Excluir discussão"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Cancelar uma mensagem de Ne_wsgroup"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_Marcar"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_Desmarcar"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Marcar como _não lida"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Marcar como _lida"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Marcar _todas como lidas"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorar discussão"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Deixar de ignorar discussão"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Observar discussão"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Deixar de observar discussão"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Marcar como _spam"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Marcar como _não-spam"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "Ró_tulo colorido"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "E_tiquetas"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "Reedi_tar"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Verificar assinatura"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Adicionar remetente ao Li_vro de Endereços"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "_Coletar endereços"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "Da _pasta atual..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "Das _mensagens selecionadas..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "Filtrar _todas as mensagens da pasta"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Filtrar as mensagens _selecionadas"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "E_xecutar regras de processamento da pasta"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Criar regra de _filtragem"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automaticamente"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "Pelo _remetente (De:)"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Pelo _destinatário (Para:)"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "Pelo a_ssunto"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Criar re_gra de processamento"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Listar _URLs..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "Procurar por _novas mensagens em todas as pastas"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Excluir mensagens _duplicadas"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "Na pasta _selecionada"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "Em _todas as pastas"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "_Executar"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "Exp_urgar"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "Cert_ificados SSL"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "Relatório de _filtragem"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "Relatório da _rede"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "Es_quecer todas as senhas da sessão"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "Es_quecer todas as senhas da sessão"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "M_udar conta atual"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "Preferências da _conta atual..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Criar uma _nova conta..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "_Editar contas..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "_Preferências..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "P_ré-processamento..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "Pó_s-processamento..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Filtragem..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "_Modelos..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Ações..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "E_tiquetas..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "_Plugins..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ na Internet (contribuição dos usuários)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "_Legendas dos ícones"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Definir como o cliente padrão"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "Modo _desconectado"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Barra de men_u"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "Visualização da _mensagem"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "Barra de _status"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "_Cabeçalhos das colunas"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "A_grupar por assunto"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Ocultar discussões lidas"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "Ocultar mensagens _lidas"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Ocultar as mensagens excluídas"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "_Tela inteira"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Mostrar todos os cabeçal_hos"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Recolher _tudo"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Recolher a partir do nível _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Recolher a partir do nível _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Texto _abaixo do ícones"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Texto ao _lado do ícones"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Somente í_cones"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "Somente _texto"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Padrão"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Três colunas"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "Ampliar a área de _mensagens"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "Amplicar a _lista de mensagens"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "_Tela pequena"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "Pelo _número"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "Pelo _tamanho"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "Pela _data"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Pela data da discussão"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "Pelo a_ssunto"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "Pela _cor do rótulo"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Pela etiqueta"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "Pela _marca"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "Pelo s_tatus"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "Pelo ane_xo"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Pela _pontuação"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Pelo tra_vamento"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "Não _ordenar"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Crescente"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Decrescente"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_Autodetectar"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Aplicar etiquetas..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Ocorreram alguns erros. Clique aqui para ver o relatório."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Selecione a conta"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Relatório da rede"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Relatório de depuração da filtragem/processamento"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "relatório de filtragem habilitado\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "relatório de filtragem desabilitado\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Excluir todas as mensagens da Lixeira?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Não sair"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Adicionar caixa postal"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7764,18 +7740,18 @@ msgstr ""
 "Se for especificada uma já existente, ela será\n"
 "verificada automaticamente."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "A caixa postal '%s' já existe."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Caixa postal"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7785,80 +7761,80 @@ msgstr ""
 "Talvez já existam arquivos, ou você não possui permissão para escrita nesta "
 "pasta."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "Não é permitido o envio de mensagens"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Não foi possível importar o mbox."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "Não foi possível exportar para o mbox."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Sair do Claws Mail?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Sincronização das pastas"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Deseja sincronizar suas pastas agora?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 #, fuzzy
 msgid "_Synchronise"
 msgstr "+_Sincronizar"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Excluindo mensagens duplicadas..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Foi excluída %d mensagem duplicada em %d pastas.\n"
 msgstr[1] "Foram excluídas %d mensagens duplicadas em %d pastas.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Regras de processamento a serem aplicadas antes das regras das pastas"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Regras de processamento a serem aplicadas após as regras das pastas"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Configuração da filtragem"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Não foi possível registrar como cliente padrão: impossível obter o caminho "
 "do executável."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "O Claws Mail foi registrado como o cliente padrão."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Não foi possível registrar como cliente padrão: impossível escrever no "
 "registro."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7938,7 +7914,7 @@ msgstr "Sobrescrever o arquivo mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "O arquivo já existe. Deseja sobrescrevê-lo?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Sobrescrever"
@@ -7984,19 +7960,19 @@ msgstr "Foi atingido o fim da mensagem; continuar a partir do início?"
 msgid "Search finished"
 msgstr "Pesquisa concluída"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Escrever _nova mensagem"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Visualização das mensagens"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<Campo Return-Path não encontrado>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8011,11 +7987,11 @@ msgstr ""
 "Return-path: %s\n"
 "Não é aconselhável enviar a confirmação."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Não enviar"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -8027,48 +8003,48 @@ msgstr ""
 "oficialmente endereçada à você.\n"
 "Não é aconselhável enviar a confirmação de recebimento."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Buscando a mensagem (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Não foi possível descriptografar: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "A mensagem não está de acordo com o padrão MIME. Ela pode ser renderizada "
 "incorretamente."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Salvar como"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Sobrescrever o arquivo existente?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Não foi possível salvar o arquivo '%s'."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Exibir todos os %s."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "É exibido somente o primeiro megabyte do texto."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8076,19 +8052,19 @@ msgstr ""
 "Você recebeu uma confirmação de recebimento nessa mensagem: ela foi exibida "
 "pelo recebedor."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Você solicitou uma confirmação de recebimento nessa mensagem."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "O remetente solicitou uma confirmação de recebimento."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Enviar a confirmação de recebimento"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8096,7 +8072,7 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente,\n"
 "e foi excluída no servidor."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8105,15 +8081,15 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente.;\n"
 "ela é %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Marcar para receber"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Marcar para exclusão"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8122,12 +8098,12 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será baixada."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Desmarcar"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8136,11 +8112,11 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será excluída."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Confirmação de recebimento"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8152,19 +8128,19 @@ msgstr ""
 "Por favor, selecione qual a conta que você deseja utilizar para enviar a "
 "confirmação de recebimento:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Enviar confirmação"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Não foi possível imprimir: a mensagem não contém texto."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8172,7 +8148,7 @@ msgstr ""
 "\n"
 "  Não existem mais mensagens nesta pasta"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8180,7 +8156,7 @@ msgstr ""
 "\n"
 "  A mensagem foi excluída"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8188,16 +8164,16 @@ msgstr ""
 "\n"
 "  A mensagem foi excluída ou movida para outra pasta"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "Ocorreu um erro durante a aprendizagem.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Movendo as mensagens..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Excluindo mensagens..."
 
@@ -8299,7 +8275,7 @@ msgid "Go back to email"
 msgstr "Voltar à mensagem"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
@@ -8375,80 +8351,80 @@ msgstr "Tamanho:"
 msgid "Description:"
 msgstr "Descrição:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "A conexão NNTP com %s:%d foi interrompida.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Conta '%s': Conectando ao servidor NNTP: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Erro na autenticação com %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan não suporta o código de retorno 480, por isso optamos por "
 "continuar\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Falha no modo leitor, continuando mesmo assim\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Erro na criação da sessão com %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Erro na autenticação com %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "O Claws Mail necessita de acesso à rede para se conectar ao servidor de News."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "não foi possível selecionar o grupo: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "não foi possível definir o grupo: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervalo de artigos inválido: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "não foi possível obter xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obtendo xover %d - %d em %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "não foi possível obter xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "linha xover inválida\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9936,7 +9912,7 @@ msgstr "O CSS desse arquivo será aplicado em todas as partes HTML"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "E_xplorar"
@@ -9945,93 +9921,93 @@ msgstr "E_xplorar"
 msgid "Select stylesheet"
 msgstr "Selecione a folha de estilos"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "A recuperação de conteúdo remoto está desabilitada."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Carregar imagens"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Habilitar conteúdo remoto"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Habilitar Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Habilitar plugins"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Habilitar Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Abrir os links com um navegador externo"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocorreu um erro: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s é uma fonte malformada ou não suportada"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Pesquisar a Web"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Abrir no visualizador"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Abrir no visualizador (habilitar conteúdo remoto)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Abrir no navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Abrir a imagem"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Copiar o link"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Baixar o link"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Salvar imagem como"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Copiar a imagem"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Importar a fonte"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Visualizador HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10128,11 +10104,11 @@ msgstr ""
 "Adiciona o cabeçalho X-FETCH-TIME com a data e hora do recebimento da "
 "mensagemno formato RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "Plugin GData: É necessária autorização"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10150,30 +10126,30 @@ msgstr ""
 "esse código no campo abaixo para garantir ao Claws Mail o acesso à sua lista "
 "de contatos da Google."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Passo 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 "Clique aqui para abrir a página de autorização da Google no seu navegador"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Passo 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Digite o código:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Plugin GData: Erro na solicitação de contatos: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10181,49 +10157,49 @@ msgstr[0] "Adicionado %d de"
 msgstr[1] "Adicionados %d de"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 contato para o cache"
 msgstr[1] "%d contatos para o cache"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Plugin GData: Iniciando solicitação assíncrona de contatos\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Plugin GData: Erro na solicitação de grupos: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "Plugin GData: Os grupos foram recebidos\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Plugin GData: Iniciando solicitação assíncrona de grupos\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Plugin GData: Erro na autorização: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "Plugin GData: A autorização foi bem sucedida\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Plugin GData: Iniciando autorização interativa\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 "Plugin GData: Código de autorização recebido, requisitando a autorização\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10231,26 +10207,26 @@ msgstr ""
 "Plugin GData: Não foi recebido nenhum código de autorização, a solicitação "
 "de autorização foi cancelada\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Plugin GData: Erro na atualização da autorização: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Plugin GData: A atualização da autorização foi bem sucedida\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Plugin GData: Tentando atualizar a autorização\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autenticação"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Nome de usuário:"
 
@@ -10296,7 +10272,7 @@ msgstr ""
 "\n"
 "Qualquer retorno para <berndth at gmx.de> é bem-vindo."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "Integração com GData"
 
@@ -10531,7 +10507,7 @@ msgstr "Tempo da requisição esgotado"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "segundo(s)"
@@ -10846,28 +10822,28 @@ msgid "Specify authentication"
 msgstr "Efetuar autenticação"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "ID do usuário"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Senha"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automático"
 
@@ -12443,9 +12419,9 @@ msgstr "Exibir o console Python..."
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Navegar"
 
@@ -12763,7 +12739,7 @@ msgstr ""
 "altere o título da fonte,"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Verificar a validade do certificado SSL"
 
@@ -12932,17 +12908,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Atualizando os comentários para '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Requer autorização)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (Não autorizado)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (Não encontrado)"
 
@@ -13083,21 +13059,21 @@ msgstr ""
 "Por favor, perceba que os cabeçalhos do e-mail (como o Assunto) não são "
 "criptografados pelo sistema S/MIME."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Relatar o spam..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Relatar o spam online..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "SpamReport"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13113,19 +13089,19 @@ msgstr ""
 " * spamcop.net\n"
 " * sistema de notificação da lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Relatando o spam"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Encaminhar para:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Senha:"
 
@@ -13423,7 +13399,7 @@ msgid "Next month"
 msgstr "Próximo mês"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13458,7 +13434,7 @@ msgstr ""
 "suas reuniões e agendas, publicar sua informação de livre/ocupado e "
 "recuperar essa informação dos outros."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -13643,63 +13619,63 @@ msgstr "Participantes:"
 msgid "Action:"
 msgstr "Ação:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Nova reunião..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Exportar agenda..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_Inscrever-se no webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "_Atualizar subscrições"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "Visão em _lista"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "Visão _semanal"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "Visão _mensal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Reuniões"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "no passado"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "hoje"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "amanhã"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "essa semana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "mais tarde"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13708,17 +13684,17 @@ msgstr ""
 "\n"
 "Esses são os eventos planejados %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Tempo esgotado (%d segundos) ao tentar conectar com %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Erro %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13731,7 +13707,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13744,7 +13720,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13755,7 +13731,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13766,42 +13742,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Não foi possível criar o diretório %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "O Claws Mail necessita de acesso à rede para atualizar a fonte Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Buscando a agenda de %s ..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "nova assinatura"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "O Claws Mail necessita de acesso à rede para atualizar a subscrição."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Inscrever-se no WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Digite a URL do WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Não foi possível analisar a URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Deseja realmente desinscrever-se?"
 
@@ -14176,85 +14152,85 @@ msgstr "Não foi possível exportar a informação de livre/ocupado."
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Não foi possível exportar a informação de livre/ocupado para '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Lembretes"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Alerte-me"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "minutos antes do evento"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Exportação da agenda"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Exportar a agenda automaticamente para"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Você pode exportar para um arquivo local ou uma URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr ""
 "Especifique um arquivo local ou uma URL (http://servidor/caminho/arquivo.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Incluir as subscrições de webcal na exportação"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Comando a ser executado após a exportação da agenda"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registre a Agenda do Claws no relógio Orage do XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "Permite ao Orage (versão superior a 4.4) visualizar a agenda do Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Informação de livre/ocupado"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Exportar a informação de livre/ocupado automaticamente para"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr ""
 "Especifique um arquivo local ou uma URL (http://servidor/caminho/arquivo.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr ""
 "Comando a ser executado após a exportação da informação de livre/ocupado"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Obter as informações de livre/ocupado dos outros em"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14263,7 +14239,7 @@ msgstr ""
 "Especifique um arquivo local ou uma URL (http://servidor/caminho/arquivo."
 "ifb). Use %u para a parte esquerda do endereço de e-mail, %d para o domínio"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "Opções do SSL"
 
@@ -14318,12 +14294,12 @@ msgstr "ocorreu um erro na sessão POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "Comando TOP não suportado\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14331,7 +14307,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Arquivo mbox local"
 
@@ -14359,11 +14335,11 @@ msgstr "Nome completo"
 msgid "Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Configuração automática"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -14454,7 +14430,7 @@ msgstr ""
 "Mensagens acima desse limite serão recebidas parcialmente. Ao selecioná-las, "
 "você poderá obtê-las por inteiro ou exclui-las."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14466,71 +14442,66 @@ msgstr "Número máximo de artigos a receber"
 msgid "unlimited if 0 is specified"
 msgstr "ilimitado se for especificado 0"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Localizar texto:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Diretório do servidor IMAP"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(geralmente vazio)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Mostrar apenas pastas assinadas"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Módulo de eficiência de banda (impede a recuperação de etiquetas remotas)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Esse modo usa menos banda, mas pode ser mais lento com alguns servidores."
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permite filtrar usando plugins, durante o recebimento"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Receber mensagem' procura por novas mensagens dessa conta"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Cabeçalho"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Enviar o endereço de e-mail da conta na Message-ID"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Adicionar cabeçalho user agent"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho definido pelo usuário"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14538,183 +14509,183 @@ msgstr ""
 "Deixe estes campos em branco, para utilizar os mesmos usuário e senha de "
 "recebimento."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar via POP3 antes de enviar"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "Tempo de espera para autenticação POP: "
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "minutos"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Inserir a assinatura automaticamente"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Saída do comando"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Dicionários de checagem ortográfica"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Dicionário padrão"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Dicionário alternativo padrão"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Sistema de privacidade padrão"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Sempre assinar as mensagens"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Sempre criptografar as mensagens"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "Sempre assinar as mensagens em resposta a mensagens assinadas"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Sempre criptografar as mensagens em resposta a mensagens criptografadas"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Criptografar as mensagens enviadas com sua própria chave além da dos "
 "destinatários"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salvar mensagens criptografadas enviadas como texto simples"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Não utilizar SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Utilizar SSL para conexão POP3"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizar comando STARTTLS para iniciar sessão SSL"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizar SSL para conexão IMAP4"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Utilizar SSL para conexão NNTP"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Não use SSL (mas, se necessario, use STARTTLS)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Utilizar SSL para conexão SMTP"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Certificados do cliente"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Certificado para recebimento"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado do cliente como um arquivo PKCS12 ou PEM"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Certificado para envio"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 #, fuzzy
 msgid "Automatically accept valid SSL certificates"
 msgstr "Aceitar certificados SSL válidos, mas desconhecidos, automaticamente"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL não bloqueador"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desligue essa opção caso você tenha problemas de conexão via SSL"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "Porta SMTP"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "Porta POP3"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "Porta IMAP4"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "Porta NNTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14722,16 +14693,16 @@ msgstr ""
 "O nome do domínio será utilizado na Message-ID gerada e durante a conexão "
 "com os servidores SMTP."
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Utilizar comando para comunicar com o servidor"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr ""
 "Mover as mensagens excluídas para a lixeira e expurgá-las imediatamente"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14739,108 +14710,108 @@ msgstr ""
 "Move as mensagens excluídas para a lixeira, ao invés de usar a marca de "
 "exclusão (\\Deleted), sem expurgá-la."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar mensagens de cross-posting como lidas e com a cor:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Colocar as mensagens enviadas em"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Colocar as mensagens a serem enviadas em"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Colocar os rascunhos das mensagens em"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Colocar as mensagens excluídas em"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "O nome da conta não foi informado."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "O endereço de e-mail não foi informado."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "O servidor SMTP não foi informado."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "A ID do usuário não foi informada."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "O servidor POP3 não foi informado."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "A pasta padrão da Caixa de Entrada não existe."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "O servidor IMAP4 não foi informado."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "O servidor NNTP não foi informado."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "o nome do arquivo da caixa postal local não informado."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "o comando de e-mail não foi informado."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modelos"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Preferências da nova conta"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferências da conta"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Falha (endereço errado)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Selecione o arquivo de assinatura"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Selecione o arquivo do certificado"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin não carregado)"
@@ -15878,7 +15849,7 @@ msgstr "Exibir"
 msgid "Fonts"
 msgstr "Fontes"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -16023,7 +15994,7 @@ msgstr "Mensagens de erro"
 msgid "Status messages for filtering/processing log"
 msgstr "Mensagens de status para o relatório de filtragem/processamento"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Outro"
 
@@ -16651,15 +16622,15 @@ msgstr "Seleção de cor para as pastas"
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Escolha entre atalhos de teclado pré-definidos"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Selecionar pré-definido:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16667,35 +16638,35 @@ msgstr ""
 "Você também pode modificar os atalhos de menu pressionando\n"
 "a(s) tecla(s) ao colocar o ponteiro do mouse sobre o item."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Adicionar o endereço ao destinatário ao fazer um duplo-clique"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Ao sair"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Confirmar ao sair"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Esvaziar a Lixeira ao sair"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Alertar se houver mensagens na Fila de Saída"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Atalhos de teclado"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Habilitar a personalização de atalhos do teclado"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 msgid ""
 "If checked, you can change the keyboard shortcuts of most of the menu items "
 "by focusing on the menu item and pressing a key combination.\n"
@@ -16706,15 +16677,15 @@ msgstr ""
 "combinação de teclas.\n"
 "Desmarque essa opção caso você deseje travar todos os atalhos de teclado."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr " Escolha entre atalhos de teclado pré-definidos... "
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Manipulação dos metadados"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16722,33 +16693,33 @@ msgstr ""
 "O modo seguro solicita ao SO a escrita imediata dos metadados no disco;\n"
 "isso evita perda de dados após uma falha, mas pode consumir algum tempo."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Mais seguro"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Mais rápido"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Tempo limite para o socket E/S"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Pergunte antes de esvaziar a lixeira"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Pergunte sobre regras de filtragem específicas da conta ao fazer a filtragem "
 "manual"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Use a exclusão segura do arquivo, se possível"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16756,7 +16727,7 @@ msgstr ""
 "Use a exclusão segura de arquivo, se possível\n"
 "(o programa 'shred' não está disponível)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16765,32 +16736,11 @@ msgstr ""
 "antes de exclui-los. Isso tornar a exclusão mais lenta. Certifique-se de ler "
 "a página de manual do shred para eventuais advertências."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronize as pastas off-line assim que possível"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Digite a senha"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Digite a senha"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Digite a senha"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Miscelânea"
 
@@ -17049,8 +16999,8 @@ msgstr ""
 "Encoding) a ser utilizada quando o corpo da mensagem possuir caracteres não-"
 "ASCII"
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Envio"
 
@@ -17785,28 +17735,28 @@ msgstr "Não existe informação disponível"
 msgid "No recipient keys defined."
 msgstr "Não foi definida nenhuma chave de destinatário."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Erro ao decodificar BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Ainda tentando envia."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "O cabeçalho da mensagem na Fila de Saída está com problema."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "Ocorreu um erro durante a seção SMTP."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -17814,7 +17764,7 @@ msgstr ""
 "Não foi encontrada nenhuma conta específica para o envio e ocorreu um erro "
 "durante a seção SMTP."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17822,20 +17772,20 @@ msgstr ""
 "Não foi possível determinar as informações de envio. Talvez essa mensagem "
 "não tenha sido gerada pelo Claws Mail."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "Não foi possível criar o arquivo temporário para envio do artigo."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "Erro ao gravar no arquivo temporário para envio do artigo."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Ocorreu um erro durante o envio da mensagem para %s."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Filtrando as mensagens...\n"
 
@@ -18139,88 +18089,88 @@ msgstr "Digite o texto para substituir '%s'"
 msgid "Enter variable"
 msgstr "Digite a variável"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando a mensagem usando o comando: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Não foi possível executar o comando: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ocorreu um erro na execução do comando: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Executando verificação POP antes do SMTP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP antes do SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor SMTP: %s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "A mensagem foi enviada com sucesso."
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Enviando a mensagem..."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "Enviando MENSAGEM..."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Saindo..."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando a mensagem (%d / %d bytes)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Enviando a mensagem"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro durante o envio da mensagem."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19120,12 +19070,12 @@ msgstr "Por favor, selecione a URL a ser aberta."
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Bem-vindo(a) ao Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -19218,52 +19168,52 @@ msgstr ""
 "pode fazê-lo em <%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Por favor, digite o nome da caixa postal."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Por favor, digite o seu nome e endereço de e-mail."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr ""
 "Por favor, digite o endereço e o nome de usuário do seu servidor de "
 "recebimento."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Por favor, digite o seu nome de usuário."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Por favor, digite o endereço do seu servidor SMTP."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Por favor, digite o nome de usuário para o SMTP."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 #, fuzzy
 msgid "Your name:"
 msgstr "Nome de referência:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 #, fuzzy
 msgid "Your email address:"
 msgstr "Endereço de e-mail"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Sua organização:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 #, fuzzy
 msgid "Mailbox name:"
 msgstr "Caixas postais"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19271,7 +19221,7 @@ msgstr ""
 "Você também pode especificar um caminho absoluto, por exemplo \"/home/fulano/"
 "Documentos/Mail\""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19279,61 +19229,61 @@ msgstr ""
 "Você pode especificar o número da porta adicionando-o ao final: \"mail."
 "exemplo.com:25\""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 #, fuzzy
 msgid "SMTP server address:"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Efetuar autenticação"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 #, fuzzy
 msgid "(empty to use the same as receive)"
 msgstr ""
 "<span size=\"small\">(em branco para utilizar o mesmo da recepção)</span>"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "Nome de usuário do SMTP:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "Senha do SMTP:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Usar SSL para conectar-se ao servidor SMTP"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Usar SSL via STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Certificado SSL do cliente (opcional)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 #, fuzzy
 msgid "Server address:"
 msgstr "Nome do servidor:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 #, fuzzy
 msgid "Local mailbox:"
 msgstr "Caixa postal local"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 #, fuzzy
 msgid "Server type:"
 msgstr "Nome do servidor:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19341,19 +19291,19 @@ msgstr ""
 "Você pode especificar o número da porta adicionando-o ao final: \"mail."
 "exemplo.com:110\""
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Usar SSL para conectar-se ao servidor de recebimento"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "Diretório do servidor IMAP:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Mostrar apenas pastas assinadas"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 #, fuzzy
 msgid ""
 "Warning: this version of Claws Mail\n"
@@ -19362,15 +19312,15 @@ msgstr ""
 "<span weight=\"bold\">Aviso: essa versão do Claws Mail\n"
 "foi compilada sem suporte ao IMAP.</span>"
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Assistente de configuração do Claws Mail"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Bem-vindo(a) ao Claws Mail"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19384,31 +19334,31 @@ msgstr ""
 "opções mais comuns de e-mail. Assim, você poderá iniciar a utilização do "
 "Claws Mail em menos de cinco minutos."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Sobre você"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Os campos em negrito DEVEM ser preenchidos"
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Recebimento de mensagens"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Envio de mensagem"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Salvamento da mensagem no disco"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Configuração encerrada"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
diff --git a/po/ru.po b/po/ru.po
index 88626d4..509215d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.13.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 11:20+0000\n"
 "PO-Revision-Date: 2015-12-14 16:04+0300\n"
 "Last-Translator: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
 "Language-Team: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
@@ -27,7 +27,7 @@ msgstr ""
 "X-Generator: Poedit 1.5.5\n"
 "X-Poedit-Basepath: ../claws\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -35,15 +35,15 @@ msgstr ""
 "Открыты окна составления сообщений.\n"
 "Пожалуйста, закройте их перед изменением учётных записей."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Не удалось создать папку."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Правка учётных записей"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -54,43 +54,43 @@ msgstr ""
 "учётные записи с пометкой в колонке \"G\". Учётная запись по умолчанию "
 "отмечена жирным шрифтом."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr "_Использовать как учётную запись по умолчанию "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Учётные записи с внешними папками не могут быть скопированы."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Копировать %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Вы действительно хотите удалить учётную запись '%s'?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Безымянный)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Удалить учётную запись"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Получить Почту' проверяет письма в указанных учётных записях"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -103,11 +103,11 @@ msgstr "'Получить Почту' проверяет письма в ука
 msgid "Name"
 msgstr "Имя"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Протокол"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Сервер"
 
@@ -160,10 +160,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -424,18 +424,18 @@ msgid "_Book"
 msgstr "_Книга"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Правка"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "_Сервис"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Справка"
 
@@ -474,13 +474,13 @@ msgstr "_Удалить книгу"
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "_Выделить всё"
 
@@ -489,7 +489,7 @@ msgid "C_ut"
 msgstr "В_ырезать"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Копировать"
@@ -539,8 +539,8 @@ msgstr "Найти дублирующиеся почтовые адреса..."
 msgid "Edit custom attributes..."
 msgstr "Редактировать пользовательские свойства..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_О Claws Mail"
 
@@ -656,7 +656,7 @@ msgstr "Требуется более защищённый протокол ау
 msgid "Sources"
 msgstr "Источники"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Адресная книга"
@@ -707,7 +707,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Удалить папку"
 
@@ -820,7 +820,7 @@ msgid "Person"
 msgstr "Контакт"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Папка"
 
@@ -956,19 +956,20 @@ msgstr "Обновить адрес(а)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Ошибка обновления. Изменения не записаны в Каталог."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "Уведомление"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:750 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4892
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "Ошибка"
 
@@ -1000,67 +1001,67 @@ msgstr "Имя LDAP"
 msgid "Attribute Value"
 msgstr "Значение Параметра"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Ничего"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "средство просмотра"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "анализатор Mime"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "папки"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "фильтрация"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "интерфейс конфиденциальности"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "оповещение"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "утилита"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "разное"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Этот модуль предоставляет %s (%s), что уже предоставлено модулем %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "Модуль уже загружен"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Ошибка выделения памяти для Модуля"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Лицензия на модуль отличается от GPL v3 или более поздней совместимой "
 "лицензии."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Этот модуль для Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1068,22 +1069,22 @@ msgid ""
 msgstr ""
 "Ваша версия Claws Mail новее, чем версия '%s' для которой собран модуль."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "Ваша версия Claws Mail новее, чем версия для которой собран модуль."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Ваша версия Claws Mail является очень старой для '%s' модуля."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Ваша версия Claws Mail является очень старой для модуля."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "ошибка SSL соединения\n"
 
@@ -1472,7 +1473,7 @@ msgstr "_Удалить"
 msgid "_Properties..."
 msgstr "_Свойства..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_Сообщение"
 
@@ -1540,7 +1541,7 @@ msgstr "_С переносами"
 msgid "_Unwrapped"
 msgstr "_Без переносов"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Выделить _всё"
@@ -1605,7 +1606,7 @@ msgstr "Удалить строку"
 msgid "Delete to end of line"
 msgstr "Удалить до конца строки"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Найти"
@@ -1650,47 +1651,47 @@ msgstr "Система _Конфиденциальности"
 msgid "_Priority"
 msgstr "_Приоритет"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "Кодировка _символов"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Западно-европейская"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Балтийская"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Арабская"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Кириллица"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Японская"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Китайская"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Корейская"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Тайская"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Адресная книга"
 
@@ -1698,7 +1699,7 @@ msgstr "_Адресная книга"
 msgid "_Template"
 msgstr "_Шаблон"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Дейст_вия"
 
@@ -1734,11 +1735,11 @@ msgstr "Показать _линейку"
 msgid "_Normal"
 msgstr "_Обычный режим"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Всем"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_Отправителю"
 
@@ -1762,27 +1763,27 @@ msgstr "Низ_кий"
 msgid "_Lowest"
 msgstr "_Самый низкий"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Автоматически"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7бит ASCII (US-ASCII)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Юникод (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Центрально-европейская (ISO-8859-2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Турецкая (ISO-8859-9)"
 
@@ -1829,46 +1830,46 @@ msgstr "Ошибка в теле шаблона \"Переслать\", стро
 msgid "Fw: multiple emails"
 msgstr "Fw: несколько писем"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Ошибка в строке %d тела шаблона \"Перенаправить\"."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Скрытая копия:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Ответить:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Группы новостей:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Дополнение к:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "В ответе кому:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Кому:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Не удалось вложить файл (ошибка преобразования кодировки)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1886,73 +1887,73 @@ msgstr[2] ""
 "Вложенные файлы:\n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Некорректный \"Символ цитаты\" в шаблоне."
 
-#: src/compose.c:3605
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Невозможно определить размер файла '%s'."
 
-#: src/compose.c:3616
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Вы собираетесь вставить файл размером %s в тело сообщения. Продолжать?"
 
-#: src/compose.c:3619
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "Вы уверены?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "_Вставить"
 
-#: src/compose.c:3744
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пуст."
 
-#: src/compose.c:3745
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "Пустой файл"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "_Все равно вложить"
 
-#: src/compose.c:3755
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "Не удалось прочитать %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Изменено]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Составить сообщение %s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[нет темы] - Составить сообщение%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Составить сообщение"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4820 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1960,53 +1961,53 @@ msgstr ""
 "Учётная запись для отправки почты не указана.\n"
 "Пожалуйста, выберите учётную запись перед отправкой."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Отправить"
 
-#: src/compose.c:5035
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "По умолчанию задан только \"Копия\" (Cс) адрес. Всё равно отправить?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Отправить"
 
-#: src/compose.c:5067
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "По умолчанию задан только адрес \"Скрытая копия\" (Bсс) адрес. Всё равно "
 "отправить?"
 
-#: src/compose.c:5084
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "Получатель не указан."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_В очередь"
 
-#: src/compose.c:5104
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Тема не указана. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Всё равно отправить?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Всё равно поставить в очередь на отправку?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2016,7 +2017,7 @@ msgstr ""
 "\n"
 "Ошибка преобразование кодировки."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2026,7 +2027,7 @@ msgstr ""
 "\n"
 "Не удалось получить ключ шифрования."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2037,7 +2038,7 @@ msgstr ""
 "\n"
 "Ошибка подписи: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2048,11 +2049,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "Не удалось поставить сообщение в очередь для отправки."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5196 src/compose.c:5256
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2061,7 +2062,7 @@ msgstr ""
 "Используйте кнопку \"Отправить сообщения из очереди\" из меню главного окна "
 "для повторной попытки."
 
-#: src/compose.c:5246
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2071,7 +2072,7 @@ msgstr ""
 "Используйте кнопку \"Отправить сообщения из очереди\" из меню главного окна "
 "для повторной попытки."
 
-#: src/compose.c:5621
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2082,7 +2083,7 @@ msgstr ""
 "в определённую %s кодировку.\n"
 "Отправить как %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2095,73 +2096,74 @@ msgstr ""
 "\n"
 "Всё равно отправить?"
 
-#: src/compose.c:5790
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Не удалось зашифровать письмо: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "Предупреждение о кодировке"
 
-#: src/compose.c:5912
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "П_родолжить"
 
-#: src/compose.c:5961
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "Отсутствует учётная запись для отправки почты!"
 
-#: src/compose.c:5970
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Выбранная учётная запись не NNTP: Отправка невозможна."
 
-#: src/compose.c:6205
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 "Файл %s, который вы вложили в сообщение, больше не существует. Игнорировать?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Отменить отправку"
 
-#: src/compose.c:6206
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "Игнорировать вложение"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "Часть первоисточника %s"
 
-#: src/compose.c:6824
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "Добавить в адресную _книгу"
 
-#: src/compose.c:6985
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "Удалить содержимое записи"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Использовать <Tab> для автозавершения из адресной книги"
 
-#: src/compose.c:7204
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "Mime тип"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:7273
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "Сохранить Сообщение в "
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7327 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2172,23 +2174,23 @@ msgstr "Сохранить Сообщение в "
 msgid "_Browse"
 msgstr "_Выбрать"
 
-#: src/compose.c:7783
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "Загол_овок"
 
-#: src/compose.c:7788
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "_Вложения"
 
-#: src/compose.c:7802
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "Проч_ее"
 
-#: src/compose.c:7817
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "Т_ема:"
 
-#: src/compose.c:8041
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2197,19 +2199,19 @@ msgstr ""
 "Не удалось запустить проверку орфографии.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "_От:"
 
-#: src/compose.c:8197
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "Учётная запись используемая для этого сообщения"
 
-#: src/compose.c:8199
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "Использовать адрес отправителя"
 
-#: src/compose.c:8365
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2218,68 +2220,68 @@ msgstr ""
 "Не удалось загрузить систему конфиденциальности '%s'. Вы не сможете "
 "подписать или зашифровать сообщение."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Никакой"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8584 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Ошибка в теле шаблона, строка %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "Ошибка формата поля От."
 
-#: src/compose.c:8701
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "Ошибка формата поля Кому."
 
-#: src/compose.c:8719
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "Ошибка формата поля Копия."
 
-#: src/compose.c:8737
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "Ошибка формата поля Скрытая копия."
 
-#: src/compose.c:8755
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "Ошибка формата поля Ответить."
 
-#: src/compose.c:8774
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "Ошибка формата поля Тема."
 
-#: src/compose.c:9043
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:9058
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:9132
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:9149
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "MIME тип"
 
-#: src/compose.c:9190
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "Кодировать"
 
-#: src/compose.c:9210
+#: src/compose.c:9227
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:9211
+#: src/compose.c:9228
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:9462
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2290,15 +2292,15 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "id группы процесса: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9968 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail требуется доступ к сети для отправки письма."
 
-#: src/compose.c:9977
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "Не удалось поставить сообщение в очередь на отправку."
 
-#: src/compose.c:9979
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2309,15 +2311,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "Не удалось сохранить черновик."
 
-#: src/compose.c:10161
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "Не удалось сохранить черновик"
 
-#: src/compose.c:10162
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2325,24 +2327,24 @@ msgstr ""
 "Не удалось сохранить черновик.\n"
 "Отказаться от написанного сообщения?"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "_Отменить выход"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "_Отказаться от письма"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:10352
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Файл '%s' не может быть прочитан."
 
-#: src/compose.c:10354
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2351,54 +2353,54 @@ msgstr ""
 "Файл '%s' содержал неверные символы\n"
 "для текущей кодировки, вставка может быть неправильной."
 
-#: src/compose.c:10441
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "Отказаться от сообщения"
 
-#: src/compose.c:10442
+#: src/compose.c:10459
 msgid "This message has been modified. Discard it?"
 msgstr "Это сообщение было изменено. Отказаться от него?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Отказаться"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "_Сохранить в Черновики"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#: src/compose.c:10446
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Это сообщение было изменено. Сохранить изменения?"
 
-#: src/compose.c:10447
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "_Не сохранять"
 
-#: src/compose.c:10518
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Вы хотите применить шаблон '%s' ?"
 
-#: src/compose.c:10520
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10538 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Заменить"
 
-#: src/compose.c:11379
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "Вставить или вложить?"
 
-#: src/compose.c:11380
+#: src/compose.c:11397
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2406,16 +2408,16 @@ msgstr ""
 "Вы хотите вставить содержимое файла(ов) в тело сообщения или вложить "
 "(прикрепить) в письмо?"
 
-#: src/compose.c:11382
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "_Вложить"
 
-#: src/compose.c:11599
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Неверный формат цитирования в строке %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2633,8 +2635,8 @@ msgid " Check File "
 msgstr " Проверить Файл "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Файл"
 
@@ -2781,7 +2783,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2961,7 +2963,7 @@ msgid ""
 msgstr ""
 "Максимальное число записей, которые должны возвращаться в результат поиска."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Основные"
 
@@ -3098,15 +3100,15 @@ msgid "Stylesheet"
 msgstr "Таблица стилей"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Никакой"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -3614,27 +3616,27 @@ msgstr "Корзина"
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Обработка (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Копирование %s в %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Перенос %s в %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Обновление кэша для %s..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Обработка сообщений..."
 
@@ -3656,11 +3658,11 @@ msgstr "Выбрать папку"
 msgid "NewFolder"
 msgstr "Новая папка"
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215
+#: src/imap_gtk.c:271 src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:424 src/plugins/rssyl/rssyl_cb_menu.c:206
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' не может быть включено в имя папки."
@@ -3668,7 +3670,7 @@ msgstr "'%c' не может быть включено в имя папки."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Папка '%s' уже существует."
@@ -3692,7 +3694,7 @@ msgstr "Рекурсивно пометить все как п_рочтённы
 msgid "R_un processing rules"
 msgstr "Зап_устить обработку"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_Поиск в папке..."
 
@@ -3750,12 +3752,12 @@ msgstr "Действительно пометить все сообщения д
 msgid "Mark all as read"
 msgstr "Пометить все как прочтённые"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Сканирование папки %s%c%s..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Сканирование папки %s..."
@@ -3800,7 +3802,7 @@ msgstr "Открывается папка %s..."
 msgid "Folder could not be opened."
 msgstr "Папка не может быть открыта."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Очистить корзину"
 
@@ -4042,7 +4044,7 @@ msgstr ""
 "Локаль: %s (набор символов: %s)\n"
 "Операционная Система: неизвестна"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "Команда Claws Mail"
 
@@ -5030,9 +5032,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Модули"
 
@@ -5071,14 +5073,14 @@ msgstr "Загруженные модули"
 msgid "Page Index"
 msgstr "Список"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Скрыть"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5519,236 +5521,195 @@ msgstr "Размер файла:"
 msgid "Load Image"
 msgstr "Загрузить Изображение"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "Соединение IMAP4 прервано\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Ошибка IMAP в %s:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr "аутентифицировано\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr "не аутентифицировано\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr "некорректное состояние\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr "ошибка потока\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 "ошибка анализатора (скорее всего, не соответствующий RFC ответ от сервера)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr "в соединении отказано\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr "ошибка выделения памяти\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr "фатальная ошибка\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 "ошибка протокола (скорее всего, не соответствующий RFC ответ от сервера)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr "соединение не принято\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr "Ошибка APPEND\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr "Ошибка NOOP\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr "Ошибка LOGOUT\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr "Ошибка CAPABILITY\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr "Ошибка CHECK\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr "Ошибка CLOSE\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr "Ошибка EXPUNGE\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr "Ошибка COPY\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr "Ошибка UID COPY\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr "Ошибка CREATE\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr "Ошибка DELETE\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr "Ошибка EXAMINE\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr "Ошибка FETCH\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr "Ошибка UID FETCH\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr "Ошибка LIST\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr "Ошибка LOGIN\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr "Ошибка LSUB\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr "Ошибка RENAME\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr "Ошибка SEARCH\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr "Ошибка UID-SEARCH\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr "Ошибка SELECT\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr "Ошибка STATUS\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr "Ошибка STORE\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr "Ошибка UID STORE\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr "Ошибка SUBSCRIBE\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr "Ошибка UNSUBSCRIBE\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr "Ошибка STARTTLS\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr "Ошибка INVAL\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr "Ошибка EXTENSTION\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr "Ошибка SASL\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr "Ошибка SSL\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr "Неизвестная ошибка [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5760,7 +5721,7 @@ msgstr ""
 "CRAM-MD5 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен CRAM-MD5 SASL модуль."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5772,7 +5733,7 @@ msgstr ""
 "DIGEST-MD5 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен DIGEST-MD5 SASL модуль."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5784,49 +5745,36 @@ msgstr ""
 "SCRAM-SHA-1 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен SCRAM SASL модуль."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"CRAM-MD5 логин работает только, если libetpan собран с поддержкой SASL и "
-"установлен CRAM-MD5 SASL модуль."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Соединение с %s прошло неудачно: логин отвергнут. %s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Соединение с %s прошло неудачно: логин отвергнут. %s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Соединение с %s прошло неудачно"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 соединение с %s было разорвано. Повторное подключение...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail необходимо сетевое подключение для доступа к серверу IMAP."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Незащищенное подключение"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5839,104 +5787,104 @@ msgstr ""
 "\n"
 "Продолжить подключение к серверу? Передаваемые данные не будут зашифрованы."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "Прод_олжить подключение"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Учётная запись '%s': Подключение к IMAP4 серверу: %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Не удалось подключиться к IMAP4 серверу: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не удалось подключиться к IMAP4 серверу: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "Не удалось начать TLS сессию.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Не удалось подключиться к серверу IMAP %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Не удалось подключиться к серверу IMAP %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Добавление сообщения..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Копирование сообщения..."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "невозможно установить флаг удаления\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "невозможно стереть\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Поиск подписанных папок в %s..."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Ищутся подпапки %s..."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не удалось создать почтовый ящик: LIST завершился с ошибкой\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "не удалось создать почтовый ящик\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не удалось переименовать почтовый ящик: %s в %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "не удалось удалить почтовый ящик\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST завершился с ошибкой\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Помечаются сообщения..."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "невозможно выбрать папку: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "Сервер требует TLS для входа в систему.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Не удалось обновить.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5945,20 +5893,20 @@ msgstr ""
 "Не удалось соединиться с %s: сервер требует TLS, но Claws Mail собран без "
 "поддержки TLS.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Сбой входа на сервер.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Получение сообщения..."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "невозможно установить флаг удаления: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6009,7 +5957,7 @@ msgstr "П_одписки"
 msgid "_Subscribe..."
 msgstr "_Подписаться..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "_Отписаться..."
 
@@ -6046,20 +5994,20 @@ msgstr "Наследовать свойства родительской пап
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Введите новое имя для '%s':"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6082,7 +6030,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не удалось удалить папку '%s'."
@@ -6109,7 +6057,7 @@ msgstr "_Поиск"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Выберите подпапку %s для подписки: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Подписаться"
 
@@ -6143,8 +6091,8 @@ msgstr "подписаться на папку"
 msgid "unsubscribe"
 msgstr "отписаться от папки"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428
+#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Применить к подпапкам"
 
@@ -6337,32 +6285,32 @@ msgstr "Выбрать Pine Файл"
 msgid "Import Pine file into Address Book"
 msgstr "Импорт Pine файла в адресную книгу"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail нужно сетевое подключение для получения писем."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "Не удалось выполнить %s\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Получение новых сообщений"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Ожидание"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Получение"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6370,24 +6318,24 @@ msgstr[0] "Завершено (%d сообщение (%s) получено)"
 msgstr[1] "Завершено (%d сообщения (%s) получено)"
 msgstr[2] "Завершено (%d сообщений (%s) получено)"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Сбой подключения"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Ошибка аутентификации"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Заблокирован"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Время ожидания"
 
@@ -6424,7 +6372,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с POP3 сервером: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
@@ -6449,7 +6397,7 @@ msgstr "Получение количества новых сообщений (U
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Выход"
 
@@ -6501,7 +6449,7 @@ msgstr "Ошибка сокета."
 msgid "Socket error on connection to %s:%d."
 msgstr "Ошибка сокета при соединении с %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Соединение прервано удалённым узлом."
 
@@ -6523,11 +6471,11 @@ msgstr ""
 "Почтовый ящик заблокирован:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6536,7 +6484,7 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6893,815 +6841,810 @@ msgstr "NetworkManager: сеть доступна.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: сеть недоступна.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Файл"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "_Вид"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Настройки"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "_Добавить почтовый ящик"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "В формате MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Изменить порядок папок..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "_Импортировать mbox-файл..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "_Экспорт в mbox..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "_Экспорт выбранных сообщений в mbox..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Очистить все _Корзины"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Сохранить сообщение как..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_Сохранить часть как..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Параметры страницы..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "_Печать..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "Синхронизировать папки"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "В_ыход"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "Выделить _цепочку"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_Поиск в текущем сообщении..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_Быстрый поиск"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "Показывать или ск_рывать"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "_Панель инструментов"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "Отображаемые _столбцы..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "В _списке папок..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "В _списке сообщений..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "Ра_сположение"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Сортировка"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "_Сгруппировать по теме"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "Р_азвернуть все цепочки"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "Св_ернуть все цепочки"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Перейти к"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Предыдущему сообщению"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "_Следующему сообщению"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "П_редыдущему непрочтённому сообщению"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Сле_дующему непрочтённому сообщению"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Предыдущему но_вому сообщению"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Сл_едующему новому сообщению"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Предыдущему _помеченному сообщению"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Следующему п_омеченному сообщению"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Предыдущему с _цветной меткой"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Следующему с цв_етной меткой"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Предыдущее открытое сообщение"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Следующее открытое сообщение"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Сообщению на уровень выше"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Следующей непрочтённой _папке"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Другой папке..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Следующая часть"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Предыдущая часть"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Прокрутка сообщения"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Предыдущая строка"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Следующая строка"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Декодировать"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "Открыть в новом окне"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Исхо_дный текст сообщения"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Часть сообщения"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Показать как текст"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Открыть"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Открыть с помощью..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Цитирование"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "_Обновить сводку"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "Получ_ить"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Получить для _текущей учётной записи"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Получить для _всех учётных записей"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "Отменить получени_е"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "_Отправить сообщения из очереди"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "Составить по_чтовое сообщение"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Составить сообщение новостей"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Отве_тить"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Список _рассылки"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Дополнить и ответить"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Переслать"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Пер_еслать как вложение"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Перенаправи_ть"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "Список _Рассылки"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Написать"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "Справка"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Смотреть архив"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "Связаться с владельцем"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "П_ереместить..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Копировать..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Переместить в _корзину"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "_Удалить..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Переместить цепочку в ко_рзину"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "Удалить ц_епочку"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Отменить сообщение новостей"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_Пометить"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_Снять пометку"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Пометить как непрочт_ённое"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Пометить как прочтё_нное"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Пометить все как п_рочтённые"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Игнорировать цепочку"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Перестать игнорировать цепочку"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Следить за цепочкой"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Перестать отслеживать цепочку"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Пометить как _спам"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Пометить как _не спам"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Заблокировать"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Разблокировать"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "Цветные ме_тки"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Те_ги"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "Заново _отредактировать"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Проверить подпись"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Добавить отправителя в адресную кн_игу"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "С_обрать адреса"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "Из текущей _папки..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "Из выделенных _сообщений..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "_Фильтровать все сообщения в папке"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Фильтровать _выделенные сообщения"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Запустить обр_аботку писем"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "_Создать правило фильтрации"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Автоматически"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "По _Отправителю"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "По _Получателю"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "По _Теме"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Создать правило обработки"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Список _Ссылок..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "Проверить новые сообщения для всех папок"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Удалить ко_пии сообщений"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "В текущей папке"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "Во всех папках"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "В_ыполнить"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "Сте_реть удалённые"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "Серти_фикаты SSL"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "Журнал Фил_ьтрации"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "Журнал _Сети"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "_Забыть все пароли текущей сессии"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "_Забыть все пароли текущей сессии"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "И_зменить текущую учётную запись"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "_Параметры текущей учётной записи..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Создать _новую учётную запись..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "_Редактировать учётные записи..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "П_араметры..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "Начальная об_работка..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "Пост-обр_аботка..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Фильтрация..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "_Шаблоны..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Действия..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "Теги..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "Модули..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Руководство"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "ЧАВО (онлайн)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "Объяснение _Значков"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Установить в качестве почтового клиента по умолчанию"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "Автономный _режим"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Стр_ока меню"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "_Просмотр сообщения"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "Стр_ока состояния"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Заголовки столбцов"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "Пр_осмотр в виде цепочек"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Скрыть прочтённые цепочки"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "_Скрыть прочтённые"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Скрыть удалённые сообщения"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "Во весь _экран"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Показать все _заголовки"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "_Свернуть все цепочки"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Свернуть по _второму уровню"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Свернуть по _третьему уровню"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Текст _под значками"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Текст р_ядом со значками"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "_Только значки"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "_Только текст"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Стандартное (классическое)"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Три колонки"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "_Широкий просмотр сообщений"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "Ш_ирокий список сообщений"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "Д_ля небольшого экрана"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "По _номеру"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "По р_азмеру"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "По _дате"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "По дате цепочки"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "По т_еме"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "По _цветным меткам"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "По тегу"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "По _пометке"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "По _статусу"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "По в_ложению"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "По счёту"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "По блокировке"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "Н_е сортировать"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "По возрастанию"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "По убыванию"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_Автоопределение"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Применить теги..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Произошли ошибки. Нажмите здесь для просмотра журнала."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Вы подключены. Щёлкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 "Вы работаете в автономном режиме. Щёлкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Выберите учётную запись"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Журнал сети"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Журнал отладки фильтрации/обработки"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "журнал фильтрации включён\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "журнал фильтрации выключен\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Безымянный"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "никакой"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения в корзине?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Отменить выход"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7711,18 +7654,18 @@ msgstr ""
 "Если указан существующий почтовый ящик, он\n"
 "будет проверен автоматически."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7732,43 +7675,43 @@ msgstr ""
 "Возможно, некоторые файлы уже существуют, или у вас нет прав на запись в "
 "указанный каталог."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "Отправлять не разрешено"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Ошибка импорта mbox файла."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "Неудачный экспорт в mbox файл."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Выйти из Claws Mail?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Синхронизация папок"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Вы хотите синхронизировать ваши папки сейчас?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Синхронизировать"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Удаление копий сообщений..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -7776,36 +7719,36 @@ msgstr[0] "Удалено %d копий сообщения в %d папках.\n
 msgstr[1] "Удалено %d копии сообщений в %d папках.\n"
 msgstr[2] "Удалено %d копий сообщений в %d папках.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Обработка правил для применения перед правилами папки"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Обработка правил для применения после правил папки"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Настройка фильтрации"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Не удалось установить Claws Mail почтовым клиентом по умолчанию: не удалось "
 "определить путь к программе."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail установлен в качестве почтового клиента по умолчанию."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Не удалось установить Claws Mail почтовым клиентом по умолчанию: невозможно "
 "произвести запись в реестр."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7887,7 +7830,7 @@ msgstr "Перезаписать mbox файл"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Этот файл уже существует. Переписать его?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Перезаписать"
@@ -7933,19 +7876,19 @@ msgstr "Достигнут конец сообщения; продолжить 
 msgid "Search finished"
 msgstr "Поиск завершён"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Составить _новое сообщение"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Просмотр Сообщения"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<Не найден адрес отправителя>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7960,11 +7903,11 @@ msgstr ""
 "Адрес отправителя: %s\n"
 "Уведомление о получении отсылать не рекомендуется."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Не Отправлять"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7976,66 +7919,66 @@ msgstr ""
 "официально адресовано вам.\n"
 "Автоматическое уведомление о получении сообщения не будет отослано."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Получение сообщения (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Не удалось расшифровать: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Сообщение не соответствует стандарту MIME. Оно может отображаться "
 "некорректно."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Сохранить как"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Перезаписать существующий файл?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Не удалось сохранить файл '%s'."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Показать все %s."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Показан только первый мегабайт текста."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "Вы получили уведомление о прочтении этого сообщения получателем."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Вы запросили уведомление о прочтении этого сообщения получателем."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Это сообщение запрашивает отсылку уведомления о получении."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Послать уведомление"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8043,7 +7986,7 @@ msgstr ""
 "Это сообщение было получено частично\n"
 "и удалено с сервера."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8052,15 +7995,15 @@ msgstr ""
 "Это сообщение было получено частично;\n"
 "оно %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Отметить для загрузки"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Отметить для удаления"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8069,12 +8012,12 @@ msgstr ""
 "Это сообщение было получено частично;\n"
 "оно %s и будет загружено."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Снять метку"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8083,11 +8026,11 @@ msgstr ""
 "Это сообщение было получено частично;\n"
 "оно %s и будет удалено."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Возврат Уведомления о Получении"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8099,19 +8042,19 @@ msgstr ""
 "Пожалуйста, выберите учётную запись, которую вы хотите использовать, для "
 "отправки уведомления о получении:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Послать Уведомление"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Печать невозможна: сообщение не содержит текста."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8119,7 +8062,7 @@ msgstr ""
 "\n"
 "  Нет сообщений в этой папке"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8127,7 +8070,7 @@ msgstr ""
 "\n"
 "  Сообщение было удалено"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8135,16 +8078,16 @@ msgstr ""
 "\n"
 "  Сообщение было удалено или перемещено в другую папку"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "При обучении произошла ошибка.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Перемещение сообщений..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Удаление сообщений..."
 
@@ -8245,7 +8188,8 @@ msgid "Go back to email"
 msgstr "Вернуться к письму"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190
+#: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Не удалось сохранить часть составного сообщения: %s"
@@ -8323,78 +8267,78 @@ msgstr "Размер:"
 msgid "Description:"
 msgstr "Описание:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "NNTP соединение с %s:%d было разорвано.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Учётная запись '%s': Соединение с NNTP сервером: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Не удалось подключиться к %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr "Libetpan не поддерживает код 480, так что пока продолжаем\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Ошибка MODE READER, не смотря на это, продолжаем\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Ошибка открытия сессии с %s:%d ...\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Не удалось пройти аутентификацию на %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail нуждается в сетевом подключении для доступа к серверу новостей."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "не удалось выбрать группу: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "не удалось установить группу: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "неверный диапазон статьи: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "не удалось получить xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "получение xover %d - %d в %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "не удалось получить xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "неверная строка xover\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9165,7 +9109,8 @@ msgstr ""
 "Не проверять сообщения, которые вы пересылаете или перенаправляете другим "
 "адресатам"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Подписи"
 
@@ -9272,12 +9217,14 @@ msgstr ""
 "\n"
 "Настройки находятся в /Настройки/Параметры/Модули/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Обнаружение спама"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Обучить, что это спам"
@@ -9870,7 +9817,7 @@ msgstr "CSS в этом файле будет применяться для вс
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Просмотр"
@@ -9879,93 +9826,93 @@ msgstr "Просмотр"
 msgid "Select stylesheet"
 msgstr "Выберите таблицу стилей"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Загрузка внешнего содержимого отключена."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Загружать изображения"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Отображать внешнее содержимое"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Разрешить JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Разрешить Модули"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Разрешить Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Открывать ссылки во внешнем браузере"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Произошла ошибка: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "Поток %s имеет некорректный или неподдерживаемый формат"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Искать в Сети"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Открыть в Просмотрщике"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Открыть в Просмотрщике (включить внешнее содержимое)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Открыть в Браузере"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Открыть Изображение"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Копировать Ссылку"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Скачать Ссылку"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Сохранить Изображение Как"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Копировать Изображение"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Импортировать поток"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Просмотрщик"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10060,11 +10007,11 @@ msgstr ""
 "Добавить заголовок X-FETCH-TIME с датой и временем получения сообщения в "
 "формате RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "GData модуль: Требуется авторизация"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10081,29 +10028,29 @@ msgstr ""
 "вы подтвердили разрешение, вы получите код авторизации. Введите этот код в "
 "поле ниже, чтобы предоставить доступ Claws Mail к списку контактов Google."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Шаг 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr "Нажмите здесь, чтобы открыть страницу авторизации Google в браузере"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Шаг 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Введите код:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "GData модуль: Ошибка запроса контактов: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10112,7 +10059,7 @@ msgstr[1] "Добавить %d из"
 msgstr[2] "Добавить %d из"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
@@ -10120,67 +10067,67 @@ msgstr[0] "%d контакта в кэш"
 msgstr[1] "%d контактов в кэш"
 msgstr[2] "%d контактов в кэш"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "GData модуль: Запуск синхронизации запроса контактов\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "GData модуль: Ошибка запроса групп: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "GData модуль: Группы получены\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "GData модуль: Запуск синхронизации групповых запросов\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "GData модуль: Ошибка авторизации: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData модуль: Авторизация успешна\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "GData модуль: Начинается интерактивная авторизация\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "GData модуль: Получен код авторизации, запрашивается авторизация\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
 "GData модуль: Не получен код авторизации, запрос на авторизацию отменен\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData модуль: Ошибка обновления авторизации: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData модуль: Обновление авторизации успешно\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData модуль: Попытка обновить авторизацию\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Аутентификация"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Имя пользователя:"
 
@@ -10224,7 +10171,7 @@ msgstr ""
 "\n"
 "Пожелания и предложения отправлять по адресу <berndth at gmx.de>."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "Интеграция GData"
 
@@ -10451,7 +10398,7 @@ msgstr "Запрос времени ожидания"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "секунд(а)"
@@ -10740,28 +10687,28 @@ msgid "Specify authentication"
 msgstr "Укажите аутентификацию"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Пользователь"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Пароль"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Метод аутентификация"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Автоматически"
 
@@ -11685,7 +11632,8 @@ msgstr "Срок действия истекает через"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Значение '0' будет сохранять парольную фразу в течение всей сессии"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "минут(ы)"
@@ -11844,158 +11792,163 @@ msgstr "Подпись не была проверена."
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Не удалось получить ключ - не запущен gpg-agent."
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "Подпись не может быть проверена - %s."
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Действительная подпись от \"%s\" [абсолютное]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Действительная подпись от \"%s\" [полное]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Действительная подпись от \"%s\" [ограниченное]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "Недоступен ключ 0x%s для проверки подписи."
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Действительная подпись от \"%s\", но ключ просрочен"
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Действительная подпись от \"%s\", но ключ был отозван"
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Неверная подпись от \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "Недоступен ключ 0x%s для проверки подписи."
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "Подпись не была проверена"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "Ошибка при проверке подписи: отсутствует статус\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Ошибка при проверке подписи: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Подписано на %s использует %s идентификатор ключа %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Действительная подпись от uid \"%s\" (Период действия: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Просрочен ключ uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Просроченная подпись от uid \"%s\" (Период действия: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "uid отозванного ключа \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "НЕВЕРНАЯ подпись от \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid \"%s\" (Период действия: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "Отозванный"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Доверие Владельца: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "Нет ключа!"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "Отпечаток главного ключа:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "ВНИМАНИЕ: Адрес подписавшего \"%s\" не соответствует формату DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Проверенный адрес подписавшего \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Не удалось получить данные для сообщения, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Не удалось инициализировать данные, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "Неоднозначные характеристики секретного ключа"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Секретный ключ не найден (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Неверные настройки секретного ключа: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Невозможно использовать протокол Gpgme '%s': движок '%s' не был установлен "
 "должным образом."
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12004,12 +11957,12 @@ msgstr ""
 "Невозможно использовать протокол Gpgme '%s': установлен движок '%s' версии "
 "'%s' в то время, как требуется версия '%s'.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Невозможно использовать протокол Gpgme '%s' (неизвестная проблема)"
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12017,7 +11970,7 @@ msgstr ""
 "GnuPG не установлен или должен быть обновлён.\n"
 "Поддержка OpenPGP отключена."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12025,11 +11978,11 @@ msgstr ""
 "Вы должны сохранить информацию учётной записи с помощью кнопки \"ОК\" прежде "
 "чем Вы сможете сгенерировать пару ключей.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "Не найден PGP ключ"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -12039,12 +11992,12 @@ msgstr ""
 "подписывать свои сообщения и получать зашифрованные сообщения от других.\n"
 "Хотите ли вы сейчас создать новую пару ключей?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Не удалось сгенерировать новую пару ключей: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12052,11 +12005,11 @@ msgstr ""
 "Генерируется новая пара ключей... Пожалуйста, подвигайте мышкой для создания "
 "дополнительной энтропии..."
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Не удалось сгенерировать новую пару ключей: неизвестная ошибка"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12069,19 +12022,19 @@ msgstr ""
 "\n"
 "Хотите ли вы экспортировать его на сервер ключей?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "Ключ генерируется"
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "Ключ экспортируются."
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "Не удалось экспортировать ключ."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "Экспорт ключей не реализован в версии для Windows."
 
@@ -12313,9 +12266,9 @@ msgstr "Показать Python консоль..."
 msgid "Refresh"
 msgstr "Обновить"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Просмотр"
 
@@ -12627,7 +12580,7 @@ msgstr ""
 "потока."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Проверить действие SSL сертификата"
 
@@ -12788,17 +12741,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Обновление комментариев для '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Требуется авторизация)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (Не авторизован)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (Документ не найден)"
 
@@ -12936,21 +12889,21 @@ msgstr ""
 "Обратите внимание, что заголовки сообщения, такие как Тема, не шифруются "
 "системой S/MIME."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Отправить отчёт..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Отправить отчёт онлайн..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "SpamReport"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12966,19 +12919,19 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Отчёт о спаме"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Включён"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Перенаправлять на:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -13181,7 +13134,8 @@ msgid "Show"
 msgstr "Показывать"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "дней"
 
@@ -13274,7 +13228,7 @@ msgid "Next month"
 msgstr "Следующий месяц"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13309,7 +13263,7 @@ msgstr ""
 "экспортировать свои календари и встречи, а также публиковать информацию о "
 "вашей занятости и получать подобную информацию от других."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Календарь"
 
@@ -13491,63 +13445,63 @@ msgstr "Участники:"
 msgid "Action:"
 msgstr "Действие:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Новая встреча..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Экспортировать календарь..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_Подписаться на webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "_Переименовать..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "Об_новить подписки"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "Обзор _списка"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "Обзор _недели"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "Обзор _месяца"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Встречи"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "прошедшие"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "сегодня"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "завтра"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "на этой неделе"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "в будущем"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13556,17 +13510,17 @@ msgstr ""
 "\n"
 "Запланированы следующие события %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Истекло время ожидания (%d секунд) при подключении к %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Ошибка %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13579,7 +13533,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13592,7 +13546,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13603,7 +13557,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13614,42 +13568,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Невозможно создать директорию %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail требуется доступ к сети, чтобы обновить поток Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Извлечение календаря для %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "новая подписка"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail требуется доступ к сети, чтобы обновить подписку."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Подписать на WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Введите ссылку на WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Не удалось разобрать ссылку."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Вы действительно хотите отписаться?"
 
@@ -14022,83 +13976,83 @@ msgstr "Не удалось экспортировать информацию о
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Не удалось экспортировать информацию о доступности на '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Напоминания"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Предупреждать меня за"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "минут до события"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Экспорт календаря"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Автоматически экспортировать календарь"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Вы можете экспортировать в локальный файл или ссылку"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Укажите локальный файл или ссылку (http://server/path/file.ics)."
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Экспортировать также подписки webcal"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Запускать после экспорта календаря"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Регистрировать календарь в часах Orage среды XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Позволить Orage (версии выше 4.4) видеть календарь Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Экспортировать как сервер календаря оболочки GNOME"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Зарегистрировать D-Bus интерфейс сервера календаря для экспорта календаря "
 "Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Информация о доступности"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Автоматически экспортировать статус свободен/занят"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Укажите локальный файл или ссылку (http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Запускать после экспорта статуса свободен/занят"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Получать чужие статусы свободен/занят с"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14107,7 +14061,7 @@ msgstr ""
 "Укажите локальный файл или ссылку (http://server/path/file.ifb). Используйте "
 "%u в качестве левой части почтового адреса, %d в качестве домена."
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "SSL опции"
 
@@ -14162,12 +14116,12 @@ msgstr "ошибка во время POP3 сессии\n"
 msgid "TOP command unsupported\n"
 msgstr "команда ТОР не поддерживается\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14175,7 +14129,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Новости (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Локальный mbox файл"
 
@@ -14203,11 +14157,11 @@ msgstr "Полное имя"
 msgid "Mail address"
 msgstr "Почтовый адрес"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Авто-настройка"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -14297,7 +14251,7 @@ msgstr ""
 "Сообщения, превышающие данный лимит загружаются частично. При их выборе, "
 "возможно получить полное сообщение, либо удалить его."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14309,72 +14263,67 @@ msgstr "Максимальное количество статей для заг
 msgid "unlimited if 0 is specified"
 msgstr "неограниченно, если указан 0"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Найти текст:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "каталог сервера IMAP"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(обычно пусто)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Показывать только подписанные папки"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Режим экономии трафика (не получать теги с сервера)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Этот режим использует меньше трафика, но может быть медленнее с некоторыми "
 "серверами."
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Фильтровать сообщения при получении"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Использовать модули фильтрации при получении"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "'Получить почту' проверяет наличие новых сообщений данной учётной записи"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Заголовок"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Генерировать идентификатор сообщения"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Включать почтовый адрес в идентификатор сообщения"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Добавить заголовок агента пользователя"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Добавить заданный заголовок"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Аутентификация (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14382,180 +14331,180 @@ msgstr ""
 "Пустое поле означает использовать имя пользователя и пароль те же, что и при "
 "получении."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Авторизация с POP3 перед отправкой"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "Время ожидания авторизации POP: "
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "минут"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Автоматически вставлять подпись"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Отделять подпись"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Автоматически установить следующие адреса"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Словари проверки орфографии"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Словарь по умолчанию"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Альтернативный словарь по умолчанию"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Составление"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Система конфиденциальности по умолчанию"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Всегда подписывать сообщения"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Всегда шифровать сообщения"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "Всегда подписывать сообщение при ответе на подписанное сообщение"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Всегда шифровать сообщение при ответе на зашифрованное сообщение"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Шифровать отправленные сообщения своим ключом в дополнение к ключу получателя"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Сохранять отправленные зашифрованные сообщения как простой текст"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Не использовать SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Использовать SSL для POP3 соединения"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Использовать команду STARTTLS для начала SSL сессии"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Использовать SSL для IMAP4 соединения"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Использовать SSL для NNTP соединения"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Отправка (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Не использовать SSL (но при необходимости, использовать STARTTLS)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Использовать SSL для SMTP соединения"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Клиентские сертификаты"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Сертификат для получения"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Клиентский сертификат в виде файла PKCS12 или PEM"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Сертификат для отправки"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Автоматически принимать действительный SSL сертификат"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Использовать неблокируемый SSL"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Отключите при обнаружении проблем с SSL соединением"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "порт SMTP"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "порт POP3"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "порт IMAP4"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "порт NNTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "имя домена"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14563,15 +14512,15 @@ msgstr ""
 "Доменное имя будет использоваться в сгенерированном Message-ID, и при "
 "подключении к серверам SMTP."
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Использовать команду для связи с сервером"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Перемещать удаляемые сообщения в корзину и стирать немедленно"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14579,108 +14528,108 @@ msgstr ""
 "Перемещать удалённые сообщения в корзину вместо того, чтобы помечать их "
 "флагом \\Удалено без стирания"
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Пометить перекрёстные сообщения как прочтённые и цветом:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Поместить отправленные сообщения в"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Поместить исходящие сообщения в"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Поместить черновые сообщения в"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Поместить удалённые сообщения в"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Имя учётной записи не введено."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "Почтовый адрес не введён."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "SMTP сервер не введён."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Имя пользователя не введено."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "POP3 сервер не введён."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "Папка по умолчанию 'Входящие' не существует."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 сервер не введён."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "NNTP сервер не введён."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "имя файла локального ящика не введено."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "команда приёма почты не введена."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Получить"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Конфиденциальность"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Дополнительные"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Параметры для новой учётной записи"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "Параметры учётной записи - %s"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Ошибка (неправильный адрес)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Выбрать файл подписи"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Выбрать файл сертификата"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (модуль не загружен)"
@@ -14802,20 +14751,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Вы действительно хотите удалить все действия?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
+#: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Запись не сохранена"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Запись не была сохранена. Всё равно закрыть?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Продолжить редактирование"
 
@@ -15711,7 +15661,7 @@ msgstr "Отображение"
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -15855,7 +15805,7 @@ msgstr "Сообщения об ошибках"
 msgid "Status messages for filtering/processing log"
 msgstr "Сообщения статуса журнала фильтрации/обработки"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Другие"
 
@@ -16483,15 +16433,15 @@ msgstr "Выбрать цвет для папки"
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Горячие клавиши"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Выбрать предустановку:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16500,35 +16450,35 @@ msgstr ""
 "нажатием любой клавиши при наведении курсора\n"
 "мыши на элемент."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Добавить адрес в назначение при двойном щелчке"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "При выходе"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Подтверждать выход"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Очистить корзину при выходе"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Предупреждать о наличии очереди сообщений"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Горячие клавиши"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Разрешить настраиваемые горячие клавиши"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16539,15 +16489,15 @@ msgstr ""
 "Выключите эту настройку, чтобы заблокировать существующие настройки горячих "
 "клавиш."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Выберите предустановленные сочетания горячих клавиш..."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Работа с метаданными"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16556,33 +16506,33 @@ msgstr ""
 "метаданных на диск, это уменьшает вероятность порчи\n"
 "данных, но работает медленнее."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Надёжно"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Быстро"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Время ожидания I/O сокета"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Запрос перед очисткой корзины"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Запрос на определённые правила фильтрации для уч. записи при фильтрации "
 "вручную"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Использовать безопасное удаление файлов, если возможно"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16590,7 +16540,7 @@ msgstr ""
 "Использовать безопасное удаление файлов,\n"
 "если возможно (программа 'shred' недоступна)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16599,32 +16549,11 @@ msgstr ""
 "удалением. Это замедляет процесс удаления. Сверьтесь со страницей "
 "руководства shred по поводу возможных проблем и подводных камней."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Синхронизировать автономные папки как можно скорее"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Введите пароль"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Введите пароль"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Введите пароль"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Разное"
 
@@ -16881,8 +16810,8 @@ msgstr ""
 "Укажите Content-Transfer-Encoding для тела сообщений, содержащих не-ASCII "
 "символы"
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Отправка"
 
@@ -17612,28 +17541,28 @@ msgstr "Информация недоступна"
 msgid "No recipient keys defined."
 msgstr "Действия не определены."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Ошибка декодирования BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Всегда пытаться отправлять почту."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Невозможно открыть файл %s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "Заголовок сообщения в очереди испорчен."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "Во время SMTP сессии произошла ошибка."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -17641,7 +17570,7 @@ msgstr ""
 "Не было найдено ни одного сервера для отправки, и произошла ошибка во время "
 "SMTP сессии."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17649,20 +17578,20 @@ msgstr ""
 "Не удалось определить информацию об отправке. Возможно, сообщение было "
 "создано другим почтовым клиентом."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "Невозможно создать временный файл для отправки новостей."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "Ошибка при записи временного файла для отправки новостей."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Возникла ошибка при отправке сообщения для %s ."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Фильтрация сообщений...\n"
 
@@ -17965,88 +17894,88 @@ msgstr "Введите текст для замены '%s'"
 msgid "Enter variable"
 msgstr "Введите переменную"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Отправка сообщения командой: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Невозможно выполнить команду: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Возникла ошибка при выполнении команды: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Соединение"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Обрабатывать POP перед SMTP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP перед SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Учётная запись '%s': Соединение с SMTP сервером: %s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "Почта отправлена успешно."
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Отправка HELO..."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Аутентификация"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Отправка сообщения..."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "Отправка EHLO..."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "Отправка MAIL FROM..."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "Отправка RCPT TO..."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "Отправка DATA..."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Завершение..."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "При отправке сообщения возникла ошибка."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18932,12 +18861,12 @@ msgstr "Пожалуйста, выберите адрес для открыти
 msgid "Select All"
 msgstr "Выделить Всё"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Добро пожаловать в Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -19029,125 +18958,125 @@ msgstr ""
 "При желании помочь проекту Claws Mail можно сделать это здесь <%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Введите имя почтового ящика."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Введите имя и почтовый адрес."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Ведите сервер получения почты и имя пользователя."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Пожалуйста, введите имя пользователя."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Пожалуйста, введите ваш SMTP сервер."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Пожалуйста, введите ваше имя пользователя SMTP сервера."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Ваше имя:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Ваш почтовый адрес:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Организация:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Имя ящика:"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr "Вы также можете указать абсолютный путь, например \"/home/vasya/Mail\""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr "Вы можете указать порт, дописав его в конце: \"mail.example.com:25\""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "SMTP адрес сервера:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Использовать аутентификацию"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(оставьте пустым, если то же, что для получения)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "SMTP имя пользователя:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "SMTP пароль:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Использовать SSL для соединиться с SMTP сервером"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Использовать SSL через STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Клиентский SSL сертификат (не обязательно)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Адрес сервера:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Локальный ящик:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Тип сервера:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr "Вы можете указать порт, дописав его в конце: \"mail.example.com:110\""
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Использовать SSL для соединения с принимающим сервером"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "Каталог IMAP сервера:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Показывать только подписанные папки"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19155,15 +19084,15 @@ msgstr ""
 "Внимание: эта версия Claws Mail\n"
 "собрана без поддержки IMAP."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Мастер Настройки Claws Mail"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Добро пожаловать в Claws Mail"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19176,31 +19105,31 @@ msgstr ""
 "Для начала соберём основную информацию о Вас и основных настройках Вашей "
 "почты, чтобы вы смогли начать работу с Claws Mail менее чем через пять минут."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "О Вас"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Выделенные жирным поля должны быть заполнены."
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Получение почты"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Отправка почты"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Сохранение почты на диске"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Настройка завершена"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19208,9 +19137,6 @@ msgstr ""
 "Claws Mail готов к работе.\n"
 "Нажмите 'Сохранить' для продолжения."
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Подпись не может быть проверена - %s."
-
 #~ msgid "Refresh interval in minutes:"
 #~ msgstr "Период обновления в минутах:"
 
diff --git a/po/sk.po b/po/sk.po
index 1f2e7dd..a8391d4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166 3.13\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 11:20+0000\n"
 "PO-Revision-Date: 2015-12-19 07:32+0100\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
 "Language-Team: slovenčina <linux at slavino.sk>\n"
@@ -104,7 +104,7 @@ msgstr ""
 "X-POFile-SpellExtra: novších Webcal GNOME ISO-8601 ghostscript gui\n"
 "X-POFile-SpellExtra: Mjanmarsko Tab imap4 Macao GeoLocation Džibutsko\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -113,15 +113,15 @@ msgstr ""
 "Prosím zatvorte všetky tieto okná predtým, ako začnete meniť nastavenia "
 "účtov."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Nemožno vytvoriť zložku."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Upraviť účty"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -131,43 +131,43 @@ msgstr ""
 "zaškrtnutie poľa v stĺpci „G” určuje ktoré účty budú zahrnuté. Predvolený "
 "účet je označený tučným písmom."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " _Nastaviť ako predvolený účet "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Účty so vzdialenými zložkami nemožno kopírovať."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kópia %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Naozaj chcete odstrániť účet „%s”?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Bez názvu)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Zmazať účet"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr " "
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Tlačidlo „Prijať poštu” prijme poštu z označených účtov"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -180,11 +180,11 @@ msgstr "Tlačidlo „Prijať poštu” prijme poštu z označených účtov"
 msgid "Name"
 msgstr "Meno"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -237,10 +237,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
@@ -500,18 +500,18 @@ msgid "_Book"
 msgstr "_Adresár"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Pomocník"
 
@@ -550,13 +550,13 @@ msgstr "Z_mazať adresár"
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_Zavrieť"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "Vy_brať všetko"
 
@@ -565,7 +565,7 @@ msgid "C_ut"
 msgstr "_Vystrihnúť"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovať"
@@ -615,8 +615,8 @@ msgstr "Nájsť duplikáty…"
 msgid "Edit custom attributes..."
 msgstr "Upraviť vlastné atribúty…"
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_O programe"
 
@@ -732,7 +732,7 @@ msgstr "Je vyžadovaná silnejšia autentifikácia"
 msgid "Sources"
 msgstr "Zdroje"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adresár"
@@ -783,7 +783,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Odstrániť zložku"
 
@@ -896,7 +896,7 @@ msgid "Person"
 msgstr "Osoba"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Zložka"
 
@@ -1031,19 +1031,19 @@ msgstr "Aktualizácia adries"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualizácia zlyhala. Zmeny neboli zapísané do adresára."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868 src/plugins/pgpcore/sgpgme.c:750
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "Chyba"
 
@@ -1075,43 +1075,43 @@ msgstr "LDAP meno"
 msgid "Attribute Value"
 msgstr "Hodnota atribútu"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Nič"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "zobrazovač"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "analyzátor MIME"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "zložiek"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "filtrovania"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "rozhrania zabezpečenia súkromia"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "oznamovača"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "nástroje"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "inú"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1119,25 +1119,25 @@ msgstr ""
 "Tento zásuvný modul poskytuje funkciu %s (%s), ktorá už je poskytovaná "
 "modulom %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "Zásuvný modul už je načítaný"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Zlyhalo pridelenie pamäte pre zásuvný modul"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Tento modul nie je licencovaný pod licenciou kompatibilnou s GPL v3 alebo "
 "vyššou."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Tento modul je pre Claws Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1146,7 +1146,7 @@ msgstr ""
 "Vaša verzia Claws Mail je novšia ako verzia, pre ktorú bol zásuvný modul "
 "„%s” zostavený."
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1154,16 +1154,16 @@ msgstr ""
 "Vaša verzia Claws Mail je novšia ako verzia, pre ktorú bol tento zásuvný "
 "modul zostavený."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Vaša verzia Claws Mail je pre zásuvný modul „%s” príliš stará."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Vaša verzia Claws Mail je pre tento zásuvný modul príliš stará."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "Vytvorenie SSL spojenia zlyhalo\n"
 
@@ -1552,7 +1552,7 @@ msgstr "_Odstrániť"
 msgid "_Properties..."
 msgstr "_Vlastnosti…"
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "Sp_ráva"
 
@@ -1620,7 +1620,7 @@ msgstr "_Zalomené"
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vy_brať všetko"
@@ -1685,7 +1685,7 @@ msgstr "Zmazať riadok"
 msgid "Delete to end of line"
 msgstr "Zmazať do konca riadku"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Hľadať"
@@ -1730,47 +1730,47 @@ msgstr "_Súkromie"
 msgid "_Priority"
 msgstr "Pri_orita"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Kódovanie znakov"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Pobaltské"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebrejské"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabské"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Cyrilika"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japonské"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Čínske"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Kórejské"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Thajské"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adresár"
 
@@ -1778,7 +1778,7 @@ msgstr "_Adresár"
 msgid "_Template"
 msgstr "Šabló_na"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "A_kcie"
 
@@ -1814,11 +1814,11 @@ msgstr "Zobraziť p_ravítko"
 msgid "_Normal"
 msgstr "_Normálny"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Všetkým"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "Odo_sielateľ"
 
@@ -1842,27 +1842,27 @@ msgstr "_Nízka"
 msgid "_Lowest"
 msgstr "Na_jnižšia"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grécke (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turecké (ISO-8859-_9)"
 
@@ -1909,46 +1909,46 @@ msgstr "V tele šablóny „Poslať ďalej” je chyba na riadku %d."
 msgid "Fw: multiple emails"
 msgstr "Fw: viacero správ"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "V tele šablóny „Presmerovať” je chyba na riadku %d."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Pokračovanie:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "V odpovedi komu:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nemožno priložiť súbor (zlyhala konverzia kódovania)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1966,73 +1966,73 @@ msgstr[2] ""
 "Nasledujúce súbory budú priložené:\n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "„Značka citácie” šablóny nie je platná."
 
-#: src/compose.c:3605
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemožno zistiť veľkosť súboru „%s”."
 
-#: src/compose.c:3616
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Do tela správy vkladáte súbor %s. Ste si istý, že to chcete urobiť?"
 
-#: src/compose.c:3619
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "_Vložiť"
 
-#: src/compose.c:3744
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:3745
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "Prázdny súbor"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "Pripojiť i _tak"
 
-#: src/compose.c:3755
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemožno čítať %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr "[Upravené]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[bez názvu] - Písanie správy%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Napísať správu"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4820 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2040,51 +2040,51 @@ msgstr ""
 "Nie je zadaný účet na odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštový účet."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:5035
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Jediný príjemca je prednastavená adresa Kópie. Odoslať i tak?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Odoslať"
 
-#: src/compose.c:5067
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Jediný príjemca je prednastavená adresa Skrytej kópie. Odoslať i tak?"
 
-#: src/compose.c:5084
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "Nie je zadaný príjemca."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "Do _fronty"
 
-#: src/compose.c:5104
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Prázdny predmet. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Poslať i tak?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Zaradiť do fronty i tak?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "Odoslať ho neskôr"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2094,7 +2094,7 @@ msgstr ""
 "\n"
 "Zlyhala konverzia kódovania."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2104,7 +2104,7 @@ msgstr ""
 "\n"
 "Nie je dostupný šifrovací kľúč príjemcu."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2115,7 +2115,7 @@ msgstr ""
 "\n"
 "Podpísanie zlyhalo: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2126,11 +2126,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "Nemožno zaradiť správu do fronty na odoslanie."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5196 src/compose.c:5256
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2138,7 +2138,7 @@ msgstr ""
 "Správa bola zaradená do fronty, ale nebolo ju možné odoslať.\n"
 "Použite „Odoslať správy vo fronte” z hlavného okna na opakovanie."
 
-#: src/compose.c:5246
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2147,7 +2147,7 @@ msgstr ""
 "%s\n"
 "Použite „Odoslať správy vo fronte” z hlavného okna na opakovanie."
 
-#: src/compose.c:5621
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2158,7 +2158,7 @@ msgstr ""
 "kódovania na %s.\n"
 "Odoslať správu v kódovaní %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2171,72 +2171,72 @@ msgstr ""
 "\n"
 "Odoslať aj tak?"
 
-#: src/compose.c:5790
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Nemožno zašifrovať správu: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "Upozornenie šifrovania"
 
-#: src/compose.c:5912
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "_Pokračovať"
 
-#: src/compose.c:5961
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "Nie je dostupné žiadny účet na odosielanie správ!"
 
-#: src/compose.c:5970
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Zvolený účet nie je NNTP: Posielanie nie je možné."
 
-#: src/compose.c:6205
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Príloha %s už neexistuje. Ignorovať?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Zrušiť posielanie"
 
-#: src/compose.c:6206
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "Ignorovať prílohu"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "Pôvodná časť %s"
 
-#: src/compose.c:6824
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "Pridať do _adresára"
 
-#: src/compose.c:6985
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "Zmazať obsah položiek"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Na automatické doplnenie z adresára použite <TAB>"
 
-#: src/compose.c:7204
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "Typ MIME"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:7273
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "Uložiť správu do "
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7327 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2247,23 +2247,23 @@ msgstr "Uložiť správu do "
 msgid "_Browse"
 msgstr "_Prechádzať"
 
-#: src/compose.c:7783
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "H_lavička"
 
-#: src/compose.c:7788
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "_Prílohy"
 
-#: src/compose.c:7802
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "_Ostatné"
 
-#: src/compose.c:7817
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "Pre_dmet:"
 
-#: src/compose.c:8041
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2272,19 +2272,19 @@ msgstr ""
 "Nemožno spustiť kontrolu preklepov.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "O_d:"
 
-#: src/compose.c:8197
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "Účet, použitý pre tento email"
 
-#: src/compose.c:8199
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "Adresa odosielateľa"
 
-#: src/compose.c:8365
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2293,68 +2293,68 @@ msgstr ""
 "Nemožno načítať systém súkromia „%s”. Nebude možné podpísať ani zašifrovať "
 "túto správu."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "Žiad_na"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8584 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Telo šablóny má chybu v riadku %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "Chyba v tvare hlavičky odosielateľa v šablóne."
 
-#: src/compose.c:8701
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "Chyba v tvare hlavičky príjemcu v šablóne."
 
-#: src/compose.c:8719
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "Chyba v tvare hlavičky kópie v šablóne."
 
-#: src/compose.c:8737
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "Chyba v tvare hlavičky slepej kópie v šablóne."
 
-#: src/compose.c:8755
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "Chyba vo formáte šablóny Odpovedať."
 
-#: src/compose.c:8774
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "Chyba vo formáte predmetu šablóny."
 
-#: src/compose.c:9043
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:9058
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:9132
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9149
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: src/compose.c:9190
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: src/compose.c:9210
+#: src/compose.c:9227
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:9211
+#: src/compose.c:9228
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:9462
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2365,15 +2365,15 @@ msgstr ""
 "Vynútiť ukončenie procesu?\n"
 "ID skupiny procesu: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9968 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potrebuje na odoslanie tejto správy pripojenie k sieti."
 
-#: src/compose.c:9977
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "Nemožno zaradiť správu do fronty na odoslanie."
 
-#: src/compose.c:9979
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2384,15 +2384,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/compose.c:10157
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "Koncept nemožno uložiť."
 
-#: src/compose.c:10161
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "Koncept nemožno uložiť"
 
-#: src/compose.c:10162
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2400,24 +2400,24 @@ msgstr ""
 "Koncept nemožno uložiť.\n"
 "Chcete pokračovať v písaní, alebo zahodiť rozpísanú správu?"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "+_Zrušiť skončenie"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "_Zahodiť správu"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "Zvoľte súbor"
 
-#: src/compose.c:10352
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor „%s” nemožno čítať."
 
-#: src/compose.c:10354
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2426,54 +2426,54 @@ msgstr ""
 "Súbor „%s” obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
-#: src/compose.c:10441
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "Zahodiť správu"
 
-#: src/compose.c:10442
+#: src/compose.c:10459
 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Uložiť zmeny"
 
-#: src/compose.c:10446
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Táto správa bola zmenená. Uložiť posledné zmeny?"
 
-#: src/compose.c:10447
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "_Neukladať"
 
-#: src/compose.c:10518
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použiť šablónu „%s”?"
 
-#: src/compose.c:10520
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10538 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: src/compose.c:11379
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 
-#: src/compose.c:11380
+#: src/compose.c:11397
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2481,16 +2481,16 @@ msgstr ""
 "Chcete vložiť obsah súboru do tela správy, alebo ho chcete pripojiť k správe "
 "ako prílohu?"
 
-#: src/compose.c:11382
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "_Pripojiť"
 
-#: src/compose.c:11599
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba v tvare citácie na riadku %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2707,8 +2707,8 @@ msgid " Check File "
 msgstr "Skontrolovať súbor"
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Súbor"
 
@@ -2857,7 +2857,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -3034,7 +3034,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Najväčší počet vrátených výsledkov vyhľadávania."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Základné"
 
@@ -3168,15 +3168,15 @@ msgid "Stylesheet"
 msgstr "Štýlopis"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Žiadna"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Štandardné"
 
@@ -3679,27 +3679,27 @@ msgstr "Kôš"
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Spracúvam (%s)…\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopírujem %s do %s…\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Presúvam %s do %s…\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aktualizujem vyrovnávaciu pamäť zložky %s…"
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Spracúvam správy…"
 
@@ -3725,7 +3725,7 @@ msgstr "Nová zložka"
 #: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
 #: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Názov zložky nemôže obsahovať „%c”."
@@ -3733,7 +3733,7 @@ msgstr "Názov zložky nemôže obsahovať „%c”."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Zložka „%s” už existuje."
@@ -3757,7 +3757,7 @@ msgstr "Označiť _všetky ako prečítané rekurzívne"
 msgid "R_un processing rules"
 msgstr "Sp_ustiť pravidlá spracovania"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "Pre_hľadať zložku…"
 
@@ -3815,12 +3815,12 @@ msgstr "Naozaj chcete označiť všetky správy tejto zložky ako prečítané?"
 msgid "Mark all as read"
 msgstr "Označiť všetky ako prečítané"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prehľadávanie zložky %s%c%s…"
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prehľadávanie zložky %s…"
@@ -3867,7 +3867,7 @@ msgstr "Otváram zložku %s…"
 msgid "Folder could not be opened."
 msgstr "Zložku nemožno otvoriť."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
@@ -4108,7 +4108,7 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: neznámy"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "Tím Claws Mail"
 
@@ -5092,9 +5092,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
@@ -5133,14 +5133,14 @@ msgstr "Načítané zásuvné moduly"
 msgid "Page Index"
 msgstr "Obsah Stránky"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Skryť"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5579,236 +5579,195 @@ msgstr "Veľkosť súboru:"
 msgid "Load Image"
 msgstr "Načítať obrázok"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4 spojenie prerušené\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Chyba IMAP na %s:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr " autentifikovaný\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr " neautentifikovaný\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr " zlý stav\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr " chyba streamu\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 " chyba spracovania (pravdepodobne server, ktorý nedodržiava RFC štandard)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr " spojenie odmietnuté\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr " chyba pamäte\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr " fatálna chyba\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 " chyba protokolu (pravdepodobne server, ktorý nedodržiava RFC štandard)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr " spojenie nebolo prijaté\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " chyba pri APPEND\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " chyba pri NOOP\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " chyba pri LOGOUT\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " chyba pri CAPABILITY\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " chyba pri CHECK\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " chyba pri CLOSE\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " chyba pri EXPUNGE\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " chyba pri COPY\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " chyba pri UID COPY\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " chyba pri CREATE\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " chyba pri DELETE\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " chyba pri EXAMINE\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " chyba pri FETCH\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " chyba pri UID FETCH\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " chyba pri LIST\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " chyba pri LOGIN\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr "  chyba pri LSUB\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " chyba pri RENAME\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " chyba pri SEARCH\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " chyba pri UID SEARCH\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " chyba pri SELECT\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " chyba pri STATUS\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " chyba pri STORE\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " chyba pri UID STORE\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " chyba pri SUBSCRIBE\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " chyba pri UNSUBSCRIBE\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " chyba pri STARTTLS\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " chyba pri INVAL\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " chyba pri EXTENSION\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " chyba pri SASL\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " chyba pri SSL\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr " Neznáma chyba [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5820,7 +5779,7 @@ msgstr ""
 "Prihlásenie CRAM-MD5 funguje len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul CRAM-MD5 SASL."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5832,7 +5791,7 @@ msgstr ""
 "Prihlásenie DIGEST-MD5 funguje len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul DIGEST-MD5 SASL."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5844,49 +5803,36 @@ msgstr ""
 "Prihlásenie CRAM-SHA-1 funguje len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul SCRAM SASL."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"Prihlásenie CRAM-MD5 funguje len ak bola knižnica libetpan zostavená s "
-"podporou SASL, a je nainštalovaný zásuvný modul CRAM-MD5 SASL."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Spojenie k %s zlyhalo"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojenie k %s bolo prerušené. Obnovujem…\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Na prístup k serveru IMAP potrebuje Claws Mail pripojenie k sieti."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5900,104 +5846,104 @@ msgstr ""
 "Chcete pokračovať v pripájaní na tento server? Komunikácia nebude "
 "zabezpečená."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "Po_kračovať v pripájaní"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru IMAP4: %s: %d…"
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Nepodarilo sa pripojiť k serveru IMAP4: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru IMAP4: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "Nemožno vytvoriť TLS spojenie.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Pridávam správy…"
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Kopírujem správy…"
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "nemožno nastaviť príznak zmazania\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "nemožno odstrániť\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Hľadám neodoberané zložky v %s…"
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hľadám podzložky %s…"
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nemožno vytvoriť schránku: príkaz LIST zlyhal\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "nemožno vytvoriť schránku\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nemožno premenovať schránku: %s na %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "nemožno odstrániť schránku \n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST zlyhal\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Označujem správy…"
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nemožno vybrať zložku: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "Server na prihlásenie vyžaduje TLS.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo  sa obnoviť možnosti servera.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6006,20 +5952,20 @@ msgstr ""
 "Pripojenie k %s zlyhalo: server vyžaduje TLS, ale Claws Mail bol zostavený "
 "bez podpory TLS.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Tento server neumožňuje prihlásenie.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Sťahujem správu…"
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nemožno nastaviť príznaky zmazania: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -6071,7 +6017,7 @@ msgstr "_Odoberané zložky"
 msgid "_Subscribe..."
 msgstr "O_doberať…"
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "_Odhlásiť sa…"
 
@@ -6108,20 +6054,20 @@ msgstr "Zdediť vlastnosti z rodičovskej zložky"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadajte nový názov pre „%s”:"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Premenovať zložku"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6144,7 +6090,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemožno odstrániť zložku „%s”."
@@ -6171,7 +6117,7 @@ msgstr "_Hľadať"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Zvoľte podzložku %s, ktorú chcete odoberať: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Odoberať"
 
@@ -6397,32 +6343,32 @@ msgstr "Vyberte súbor Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importovať súbor Pine do adresára"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail  potrebuje na prijatie pošty pripojenie k sieti."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s zlyhal\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6430,24 +6376,24 @@ msgstr[0] "Hotovo (%d správa (%s) prijatá)"
 msgstr[1] "Hotovo (%d správy (%s) prijaté)"
 msgstr[2] "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Autentifikácia zlyhala"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Správa je zamknutá"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Časový limit"
 
@@ -6484,7 +6430,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Autentifikácia…"
 
@@ -6509,7 +6455,7 @@ msgstr "Získavam počet nových správ (UIDL)…"
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)…"
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Odpájam sa"
 
@@ -6561,7 +6507,7 @@ msgstr "Chyba soketu."
 msgid "Socket error on connection to %s:%d."
 msgstr "Chyba soketu pri pripojení k %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
@@ -6583,11 +6529,11 @@ msgstr ""
 "Poštová schránka je zamknutá:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Autentifikácia zlyhala."
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6596,7 +6542,7 @@ msgstr ""
 "Autentifikácia zlyhala:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6956,814 +6902,809 @@ msgstr "NetworkManager: sieť je pripojená.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieť nie je pripojená.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "Zo_braziť"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "Nastav_enie"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "Pridať m_ailbox"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH…"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Zmeniť poradie schránok…"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "_Importovať súbor mbox"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "_Exportovať do súboru mbox"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "Exportovať _výber do súboru mbox…"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "Vyčistiť všetky _koše"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Uložiť email ako…"
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_Uložiť časť ako…"
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Nastavenie strany…"
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "_Tlačiť…"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "S_ynchronizovať zložky"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "_Skončiť"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "Zvoliť _vlákno"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_Nájsť v aktuálnej správe"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "_Rýchle vyhľadanie"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "_Ukázať alebo skryť"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "Panel nás_trojov"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "Nastav_iť zobrazované stĺpce"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "V _zozname zložiek…"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "V zozname _správ.."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "Rozmiestnenie _okien"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Radiť"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "Pre_jsť na"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Predošlá správa"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "Ďa_lšia správa"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "P_redchádzajúca neprečítaná správa"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "Ďalšia _neprečítaná správa."
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Predchádzajúca no_vá správa"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "Ďalšia no_vá správa"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Predchádzajúca _označená správa"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Ďalšia _označená správa"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Predchádzajúca správa s návestí_m"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Ďalšia správa s návestí_m"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Naposledy ot_vorená správa"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Ďalšia o_tvorená správa"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Rodičovská správa"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Ďalšia nepr_ečítaná zložka"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "_Iná zložka…"
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Ďalšia časť"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Predošlá časť"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Posúvanie správy"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Predošlý riadok"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Ďalší riadok"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Predošlá strana"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Ďalšia strana"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Dekódovať"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "Otvoriť v _novom okne"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Zdrojový kód správ_y"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "Správová časť"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Zobraziť ako text"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Otvoriť"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Otvoriť pomocou…"
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Citácia"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "_Aktualizovať sumár"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "P_rijať"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Prijať z _aktuálneho účtu"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Prijať zo _všetkých účtov"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "_Zrušiť prijímanie"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "Odoslať _správy z fronty"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "_Napísať novú správu"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Napísať nový príspevok"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "O_dpovedať komu"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Emai_lová konferencia"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Sledovať a odpovedať na"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Poslať ďalej"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Poslať ďale_j ako prílohu"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "P_resmerovať"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "Emai_lová-Konferencia"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Pošta"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "_Pomocník"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "_Odhlásiť sa"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Zobraziť archív"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "kontaktovať vlastníka"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "Pre_sunúť…"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Kopírovať…"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Presunúť _do koša"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "Z_mazať…"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Presunúť vlákno do _koša"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "_Zmazať vlákno"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Zrušiť príspevo_k"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "O_značiť"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "O_dznačiť"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Označiť ako n_eprečítané"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Označiť ako _prečítané"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Označiť _všetky ako prečítané"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorovať vlákno"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Zrušiť ignorovanie vlákna"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Sledovať vlákno"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Zrušiť sledovanie vlákna"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Označiť ako _spam"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Označiť ako _nie spam"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Odomknúť"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "_Farebné označenie"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Z_načky"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "Znova _upraviť"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Overiť podpis"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Pridať odosielateľa _do adresára"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "Zoz_bierať adresy"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "Z aktuálnej _zložky…"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "Z vybraných _správ…"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "Filtrovať _všetky správy v zložke"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Filtrovať _zvolené správy"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustiť sprac_ovanie pravidiel"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Vytvor_iť pravidlo filtra"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "Podľa _odosielateľa"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Podľa _adresáta"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Vytvoriť pravidlo spracovania"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Zobraziť všetky _URL…"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "Skontrolovať nové správy vo všetkých pri_ečinkoch…"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Zmazať du_plikované správy"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "V zvolenej zložke"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "Vo všetkých zložkách"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "Vyko_nať"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "V_ymazať"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "SSL cer_tifikáty"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "Záznam _filtra"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "Záznam _siete"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "_Zabudnúť všetky heslá relácie"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "_Zabudnúť všetky heslá relácie"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "Z_meniť aktívny účet"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "Nastavenie aktívneho _účtu…"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Vytvoriť _nový účet…"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "_Upraviť účty…"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "Nas_tavenia…"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "Pred-sprac_ovanie…"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "Po-spra_covanie…"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Filtrovanie…"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "Ša_blóny…"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Akcie…"
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "Z_načky…"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly…"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "_Online používateľské FAQ"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "_Legenda k ikonám"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Nastaviť ako predvoleného klienta"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "Odpojený reži_m"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Panel nástr_ojov"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "Zobraze_nie správy"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "Stavový ria_dok"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Hlavičky stĺpcov"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "Zobraziť _vlákna"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Skryť prečítané vlákna"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "S_kryť prečítané správy"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Skryť vymazané správy"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Zobraziť všetky _hlavičky"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Zba_liť všetky"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Zbaliť od úrovne _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Zbaliť od úrovne _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Text _vedľa ikon"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Len _ikony"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "Len _text"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "Šta_ndardný"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Tri stĺpce"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "Š_iroká správa"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "Široký _zoznam správ"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "Podľa _čísla"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "Podľa _veľkosti"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "Podľa _dátumu"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Podľa dátumu v_lákna"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "Podľa _farebnej menovky"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Podľa _značky"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "Podľa _označenia"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "Podľa _stavu"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "Podľa _prílohy"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Podľa s_kóre"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Podľa _zamknutia"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "_Neradiť"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Vzostupne"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Zostupne"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "_Automaticky zistiť"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Použiť značky…"
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Nastala chyba(y). Kliknite tu na zobrazenie okna so záznamom."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Ste pripojený. Kliknite na ikonu ak sa chcete odpojiť"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "Ste odpojený. Kliknite na ikonu ak sa chcete pripojiť"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Zvoliť účet"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Záznam komunikácie"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Záznam ladenia filtrovania/spracovania"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "záznam filtrovania zapnutý\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "záznam filtrovania vypnutý\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v košoch?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "Neskončiť"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Pridať poštovú schránku"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7773,18 +7714,18 @@ msgstr ""
 "Ak zadáte názov existujúcej schránky, bude\n"
 "táto automaticky prehľadaná."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Schránka „%s” už existuje."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7793,43 +7734,43 @@ msgstr ""
 "Nemožno vytvoriť schránku.\n"
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte právo zápisu."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "Prispievanie nie je povolené"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Zlyhal import súboru mbox."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "Zlyhal export do mbox."
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Skončiť"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Skončiť Claws Mail?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Synchronizácia zložiek"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete teraz synchronizovať svoje zložky?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Synchronizovať"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplicitné správy…"
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -7837,34 +7778,34 @@ msgstr[0] "Zmazaná %d duplicitná správa v %d zložkách.\n"
 msgstr[1] "Zmazané %d duplicitné správy v %d zložkách.\n"
 msgstr[2] "Zmazaných %d duplicitných správ v %d zložkách.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracovania použité pred pravidlami zložky"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracovania použité po pravidlách zložky"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Nemožno registrovať ako predvoleného klienta: nemožné nájsť cestu programu."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail bol zaregistrovaný ako predvolený klient."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nemožno registrovať ako predvolený klient: nemožné zapisovať do registra."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7946,7 +7887,7 @@ msgstr "Prepísať súbor mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento súbor už existuje. Chcete ho prepísať?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Prepísať"
@@ -7992,19 +7933,19 @@ msgstr "Dosiahnutý koniec správy; pokračovať od začiatku?"
 msgid "Search finished"
 msgstr "Hľadanie dokončené"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Napísať _novú správu"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Zobrazenie správy"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<Nenájdená adresa pre odpoveď>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8019,11 +7960,11 @@ msgstr ""
 "Návratová cesta: %s\n"
 "Odporúčame toto potvrdenie neodoslať."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Neodoslať"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -8035,64 +7976,64 @@ msgstr ""
 "oficiálne adresovaná vám.\n"
 "Neodporúčame toto potvrdenie odoslať."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Sťahovanie správy (%s)…"
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nemožno dešifrovať: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Správa nezodpovedá štandardu MIME. Môže byť zle zobrazená."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Uložiť ako"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Prepísať existujúci súbor?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemožno uložiť súbor „%s”."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Zobraziť všetky %s."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Zobrazený je len prvý megabajt textu."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "Dostali ste potvrdenie tejto správy: bola zobrazená príjemcom."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Vyžiadali ste si potvrdenie o prijatí tejto správy."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Táto správa chce aby ste odoslali potvrdenie o prijatí."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Odoslať potvrdenie"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8100,7 +8041,7 @@ msgstr ""
 "Táto správa bola čiastočne prijatá,\n"
 "a bola zmazaná zo servera."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8109,15 +8050,15 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Označiť na stiahnutie"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Označiť na odstránenie"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8126,12 +8067,12 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s a bude stiahnutá."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Odznačiť"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8140,11 +8081,11 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s a bude zmazaná."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Potvrdenie o príjme"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8154,19 +8095,19 @@ msgstr ""
 "Viac ako jeden účet používa adresu, na ktorú bola táto správa odoslaná.\n"
 "Prosím vyberte účet, ktorý chcete použiť na odoslanie potvrdenia o príjme:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "Odo_slať potvrdenie"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nemožno tlačiť: správa neobsahuje text."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8174,7 +8115,7 @@ msgstr ""
 "\n"
 "  V tejto zložke nie sú správy"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8182,7 +8123,7 @@ msgstr ""
 "\n"
 "  Správa bola odstránená"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8190,16 +8131,16 @@ msgstr ""
 "\n"
 "  Správa bola odstránená alebo presunutá do inej zložky"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "Nastala chyba pri učení.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Presúvam správy…"
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Mažem správy…"
 
@@ -8299,7 +8240,7 @@ msgid "Go back to email"
 msgstr "Naspäť na správu"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nemožno uložiť časť viacdielnej správy: %s"
@@ -8377,78 +8318,78 @@ msgstr "Veľkosť:"
 msgid "Description:"
 msgstr "Popis:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "Spojenie NNTP k %s:%d bolo prerušené.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Účet „%s”: Pripájanie k serveru NNTP: %s:%d…\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Chyba pri prihlasovaní k %s:%d …\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan nepodporuje návratový kód 480, takže teraz zvoľte pokračovať\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Mode reader zlyhalo, napriek tomu pokračujem\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Chyba pri vytváraní relácie s %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Chyba pri autentifikácii na %s:%d…\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Claws Mail potrebuje na prístup k serveru News pripojenie k sieti."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "nemožno zvoliť skupinu: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "nemožno nastaviť skupinu: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah článkov: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "nemožno získať xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "prijímam xover %d - %d v %s…\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "nemožno získať xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "neplatný xover riadok\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9928,7 +9869,7 @@ msgstr "CSS v tomto súbore bude použité na všetky časti HTML"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "P_rehliadať"
@@ -9937,93 +9878,93 @@ msgstr "P_rehliadať"
 msgid "Select stylesheet"
 msgstr "Vyberte štýlopis"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Načítavanie vzdialeného obsahu je vypnuté."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Načítať obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Zapnúť vzdialený obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Povoliť JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Povoliť zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Povoliť Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Otvoriť odkazy v externom prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s je poškodený alebo nepodporovaný kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Hľadať na webe"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Otvoriť v prehliadači (zapnúť vzdialený obsah)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Otvoriť obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Kopírovať odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Stiahnuť odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Uložiť obrázok ako"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Kopírovať obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Importovať kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Vkusný"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Vkusný zobrazovač HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10116,11 +10057,11 @@ msgstr ""
 "Pridá hlavičku X-FETCH-TIME s dátumom a časom prijatia správy vo formáte "
 "RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "Zásuvný modul GData: Vyžadovaná autorizácia"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10138,29 +10079,29 @@ msgstr ""
 "nižšie, aby tse povolili prístup Claws Mail k svojmu zoznamu kontaktov "
 "Google."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Krok 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr "Kliknite tu na otvorenie autorizačnej stránky Google v prehliadači"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Step 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Zadajte kód:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Zásuvný modul GData: Chyba dopytovania kontaktov: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10169,7 +10110,7 @@ msgstr[1] "Pridané %d z"
 msgstr[2] "Pridaných %d z"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
@@ -10177,41 +10118,41 @@ msgstr[0] "1 kontakt do vyrovnávacej pamäte"
 msgstr[1] "%d kontakty do vyrovnávacej pamäte"
 msgstr[2] "%d kontaktov do vyrovnávacej pamäte"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Zásuvný modul GData: Štart asynchrónneho hľadania kontaktov\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Zásuvný modul GData: Chyba hľadania skupín: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "Zásuvný modul GData: Skupiny prijaté\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Zásuvný modul GData: Štart asynchrónneho hľadania skupín\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Zásuvný modul GData: Chyba autorizácie: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "Zásuvný modul GData: Autorizácia úspešná\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Zásuvný modul GData: Štart interaktívnej autorizácie\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "Zásuvný modul GData: Získaný autorizačný kód, požadujem autorizáciu\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10219,26 +10160,26 @@ msgstr ""
 "Zásuvný modul GData: Nebol získaný autorizačný kód, požiadavka autorizácie "
 "zrušená\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Zásuvný modul GData: Chyba obnovenia autorizácie: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Zásuvný modul GData: Obnovenie autorizácie úspešné: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Zásuvný modul GData: Pokus o obnovenie autorizácie\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autentifikácia"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Používateľské meno:"
 
@@ -10284,7 +10225,7 @@ msgstr ""
 "\n"
 "Spätná väzba na <berndth at gmx.de> je vítaná."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "Integrácia GData"
 
@@ -10507,7 +10448,7 @@ msgstr "Časový limit požiadavky"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "sekunda(y)"
@@ -10795,28 +10736,28 @@ msgid "Specify authentication"
 msgstr "Zadať autentifikáciu"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Heslo"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Metóda autentifikácie"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automatické"
 
@@ -11909,158 +11850,163 @@ msgstr "Podpis nebol overený"
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Nemožno získať kľúč – nie je spustený gpg-agent."
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "Digitálny podpis nemožno overiť - %s."
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Platný podpis od „%s” [absolútna]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Platný podpis od „%s” [plná]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Platný podpis od „%s” [čiastočná]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Platný podpis od „%s”"
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "Nie je dostupný kľúč 0x%s na overenie tohoto podpisu"
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vypršaný podpis od „%s”"
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Platný podpis od „%s”, ale kľúču vypršala platnosť"
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Platný podpis od „%s”, ale kľúč bol odvolaný"
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Chybný podpis od „%s”."
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "Nie je dostupný kľúč 0x%s na overenie tohoto podpisu"
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "Podpis nebol overený"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "Chyba kontroly podpisu: žiadny stav\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Chyba overenia podpisu: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "%s podpísané pomocou kľúča %s s ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Platný podpis od uid „%s” (Dôveryhodnosť %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Kľúču od %s skončila platnosť.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Skončená platnosť podpisu od uid „%s” (Dôveryhodnosť: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Odvolaný kľúč od uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ZLÝ podpis od „%s”\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid „%s” (Dôveryhodnosť %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "Odvolaný"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Dôvera vlastníka: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "Bez kľúča!"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "Odtlačok primárneho kľúča:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "UPOZORNENIE: Adresa podpisu „%s” sa nezhoduje so záznamom DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Overená adresa podpisu je „%s”\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nemožno získať údaje zo správy, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nemožno inicializovať údaje, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "Zadanie súkromného kľúča je nejednoznačné"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Súkromný kľúč nebol nájdený (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Chyba pri určení súkromného kľúča: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Protokol Gpgme „%s” je nepoužiteľný. Systém „%s” nie je správne "
 "nainštalovaný."
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12069,12 +12015,12 @@ msgstr ""
 "Protokol Gpgme „%s” je nepoužiteľný. Systém „%s” je nainštalovaný vo verzii "
 "%s, ale je potrebná verzia %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Protokol Gpgme „%s” je nepoužiteľný (neznámy problém)"
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12082,18 +12028,18 @@ msgstr ""
 "GnuPG nie je správne nainštalované, alebo používate zastaralú\n"
 "verziu. Podpora OpenPGP bude vypnutá."
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
 "Pred vygenerovaním páru kľúčov musíte uložiť údaje o účte pomocou „OK”.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "Nebol nájdený žiadny PGP kľúč"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -12103,12 +12049,12 @@ msgstr ""
 "podpisovať správy, ani prijímať šifrované správy.\n"
 "Prajete si teraz vygenerovať nový pár kľúčov?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nemožno vygenerovať nový pár kľúčov: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12116,11 +12062,11 @@ msgstr ""
 "Prebieha generácia vášho nového páru kľúčov… Prosím, pohybujte myšou, aby "
 "ste zvýšili entropiu v systéme…"
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Nemožno vygenerovať nový pár kľúčov: neznáma chyba"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12133,19 +12079,19 @@ msgstr ""
 "\n"
 "Prajete si exportovať tento pár na kľúčový server?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "Kľúč vygenerovaný"
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "Kľúč vyexportovaný."
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "Nemožno exportovať kľúč."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "Export kľúčov nie je v systéme Windows implementovaný."
 
@@ -12375,9 +12321,9 @@ msgstr "Zobraziť konzolu Python…"
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Prechádzať"
 
@@ -12685,7 +12631,7 @@ msgstr ""
 "Táto možnosť zachová aktuálne meno zložky, hoci autor zmení nadpis kanála."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Overiť platnosť certifikátu SSL"
 
@@ -12842,17 +12788,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Aktualizácia komentárov pre „%s”…"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Vyžadovaná autorizácia)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (Neautorizované)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (Nenájdené)"
 
@@ -12988,21 +12934,21 @@ msgstr ""
 "prosím dajte pozor na to, že hlavičky emailu, ako predmet, nie sú systémom S/"
 "MIME šifrované."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Ohlasovanie SPAM…"
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Ohlásiť SPAM online…"
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "Hlásenie SPAM"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13018,19 +12964,19 @@ msgstr ""
 " * spamcop.net\n"
 " * nominačný systém lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Hlásenie SPAM"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Zapnuté"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Poslať ďalej na:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -13325,7 +13271,7 @@ msgid "Next month"
 msgstr "Ďalší mesiac"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13359,7 +13305,7 @@ msgstr ""
 "stretnutia a kalendáre, zverejňovať informácie o svojom čase a prijímať "
 "informácie od iných."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Kalendár"
 
@@ -13541,63 +13487,63 @@ msgstr "Účastníci:"
 msgid "Action:"
 msgstr "Akcia:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Nové stretnutie…"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Exportovať kalendár…"
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "Prihlá_siť sa do webCal…"
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "P_remenovať…"
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "Aktualizovať _prihlásenia"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "Zobrazenie _zoznamu"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "_Týždenný pohľad"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "_Mesačný pohľad"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Stretnutia"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "v minulosti"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "dnes"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "zajtra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "tento týždeň"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "neskôr"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13606,17 +13552,17 @@ msgstr ""
 "\n"
 "Toto sú plánované udalosti %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Časový limit (%d sekúnd) pripojenia k %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Chyba %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13629,7 +13575,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13642,7 +13588,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13653,7 +13599,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13664,42 +13610,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nemožno vytvoriť adresár %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail potrebuje na aktualizáciu kanála Webcal prístup k sieti."
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Prijímanie kalendára pre %s…"
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "nové prihlásenie"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail potrebuje sieťový prístup na aktualizáciu prihlásenia."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Prihlásiť sa do WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Zadajte WebCal URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Nemožno spracovať URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Naozaj sa chcete odhlásiť?"
 
@@ -14074,83 +14020,83 @@ msgstr "Nemožno exportovať informácie o voľný/obsadený."
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Nemožno exportovať voľný/obsadený do „%s”\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Pripomienky"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Upozorni ma"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "minút pred udalosťou"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Export kalendára"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Automaticky exportovať kalendár do"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Kalendár môžete exportovať do lokálneho súboru alebo URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Zadajte umiestnenie súboru alebo URL (http://server/cesta/súbor.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "V exporte zahrnúť webcal prihlásenia"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Príkaz na spustenie po exporte kalendára"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Zaregistrovať Claws kalendár v Orage prostredia XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Umožniť Orage (verzia vyššia ako 4.4) prístup ku kalendáru Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Exportovať ako kalendárový server GNOME shell"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Registrovať rozhranie D-Bus kalendárového servera na export kalendára Claws "
 "Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Informácie voľný/obsadený"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Automaticky exportovať stav voľný/obsadený do"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Zadajte lokálny súbor alebo URL (http://server/cesta/súbor.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Príkaz, spustený po exporte voľný/obsadený"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Získať stav voľný/obsadený ostatných z "
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14159,7 +14105,7 @@ msgstr ""
 "Zadajte lokálny súbor alebo URL (http://server/cesta/súbor.ifb). Použite %u "
 "pre ľavú časť emailovej adresy, %d pre doménu"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "Voľby SSL"
 
@@ -14214,12 +14160,12 @@ msgstr "nastala chyba relácie POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "príkaz TOP nie je podporovaný\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14227,7 +14173,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Lokálna schránka mbox"
 
@@ -14255,11 +14201,11 @@ msgstr "Celé meno"
 msgid "Mail address"
 msgstr "Emailová adresa"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Automatická konfigurácia"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -14349,7 +14295,7 @@ msgstr ""
 "Správy väčšie ako táto hodnota budú stiahnuté čiastočne. Po ich zvolení ich "
 "bude možné buď stiahnuť úplne, alebo ich odstrániť."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14361,71 +14307,66 @@ msgstr "Maximálny počet príspevkov na stiahnutie"
 msgid "unlimited if 0 is specified"
 msgstr "neobmedzené, ak je zadané 0"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Hľadaný text:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Zložka servera IMAP"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(zväčša prázdne)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Zobraziť len odoberané zložky"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Na šírku pásma efektívny režim (bráni prijímaniu vzdialených značiek)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "V tomto režime je prenášaných menej dát, ale komunikácia s niektorými "
 "servermi môže byť pomalšia."
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filtrovať správy pri prijatí aj pomocou zásuvných modulov"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "„Prijať poštu” kontroluje nové správy v tomto účte"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Hlavička"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Generovať hlavičku Message-ID"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Poslať emailovú adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Pridať hlavičku „user agent”"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Pridať používateľom definované hlavičky"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentifikácia SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14433,179 +14374,179 @@ msgstr ""
 "Ak necháte tieto polia prázdne, bude použité to isté prihlasovacie meno a "
 "heslo ako pri prijímaní."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentifikovať cez POP3 pred odosielaním"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "Časový limit autentifikácie POP: "
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "minút"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Automaticky vložiť podpis"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Slovníky kontroly preklepov"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Predvolený slovník"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Prednastavený alternatívny slovník"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Nová"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Predvolený systém súkromia"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Vždy podpisovať správy"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Vždy šifrovať správy"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "Vždy podpísať správy pri odpovedi na podpísanú správu"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Vždy šifrovať odpoveď na šifrovanú správu"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Zašifrovať odoslané správy aj vlastným kľúčom"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Uložiť odoslané zašifrované správy ako prostý text"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Nepoužívať SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Použiť SSL pre spojenie POP3"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použiť príkaz STARTTLS na nadviazanie relácie SSL"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použiť SSL pre IMAP4 spojenie"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Použiť SSL pre NNTP spojenie"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívať SSL (v prípade potreby použiť STARTTLS)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Použiť SSL pre SMTP spojenie"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Certifikáty klienta"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Certifikát na prijímanie"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Súbor klientského certifikátu ako súbor PKCS12 alebo PEM"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Certifikát na odosielanie"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Automaticky akceptovať platné certifikáty SSL"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Použiť neblokujúce SSL"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Vypnite túto voľbu ak máte problémy pri SSL spojeniach"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "POP3 port"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "IMAP4 port"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Názov domény"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14613,15 +14554,15 @@ msgstr ""
 "Názov domény bude použitý na generovanie Message-ID, a pri pripájaní k "
 "serverom SMTP."
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz na komunikáciu so serverom"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Presunúť zmazané správy do koša a ihneď vymazať"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14629,108 +14570,108 @@ msgstr ""
 "Presúva zmazané emaily do koša, namiesto použitia príznaku Zmazané bez ich "
 "zmazania."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Označiť správy posielané ďalej ako prečítané a zafarbiť:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Uložiť správy do fronty"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov účtu."
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná emailová adresa."
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Nebolo zadané ID používateľa."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "Nebol zadaný POP3 server."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "Predvolená zložka doručených správ neexistuje."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "Nebol zadaný IMAP4 server."
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "Nebol zadaný názov lokálnej schránky."
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "Nebol zadaný príkaz na odosielanie pošty."
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablóny"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Nastavenie nového účtu"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s – Nastavenie účtu"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Zlyhalo (zlá adresa)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Vyberte súbor so podpisom"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Zvoľte súbor certifikátu"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (zásuvný modul nie je načítaný)"
@@ -15758,7 +15699,7 @@ msgstr "Zobrazenie"
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Nastavenia"
 
@@ -15902,7 +15843,7 @@ msgstr "Chybové správy"
 msgid "Status messages for filtering/processing log"
 msgstr "Záznam stavových správ filtrovania/spracovania"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Ostatné"
 
@@ -16529,15 +16470,15 @@ msgstr "Vyberte farbu zložky"
 msgid "Colors"
 msgstr "Farby"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Zvoliť predvolené klávesové skratky"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Zvoľte sadu klávesových skratiek:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16545,35 +16486,35 @@ msgstr ""
 "Môžete modifikovať skratky každého menu stlačením\n"
 "požadovanej skratky po ukázaní myšou na položku."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Pridať adresu k príjemcom po dvojitom kliknutí"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Pri ukončení"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Potvrdiť ukončenie"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Vyprázdniť kôš pri ukončení"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Upozorniť, ak sú správy vo fronte"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Klávesové skratky"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Povoliť prispôsobenie klávesových skratiek"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16583,15 +16524,15 @@ msgstr ""
 "vybratím položky menu a stlačením kombinácie kláves.\n"
 "Zrušte túto voľbu, ak chcete zamknúť klávesové skratky."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr " Zvoliť predvolené klávesové skratky… "
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Spracovanie metadát"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16599,33 +16540,33 @@ msgstr ""
 "Bezpečnejší režim požiada OS o zápis metadát priamo;\n"
 "priamy zápis predchádza strate dát pri havárii, ale trvá dlhšie."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Bezpečnejšie"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Rýchlejšie"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Časový limit spojení"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Potvrdiť vyprázdnenie koša"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Potvrdiť filtrovacie pravidlá špecifické pre jednotlivé účty pri ručnom "
 "filtrovaní"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Použiť bezpečné mazanie súborov, ak je to možné"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16633,7 +16574,7 @@ msgstr ""
 "Použiť bezpečné mazanie súborov, ak je to možné\n"
 "(program „shred” nie je dostupný)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16642,32 +16583,11 @@ msgstr ""
 "zmazaním, čo umožňuje bezpečné zmazanie. Podrobnosti hľadajte v manuálovej "
 "stránke shred."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchronizovať zložky hneď ako je to možné"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Zadajte heslo"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Zadajte heslo"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Zadajte heslo"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Rôzne"
 
@@ -16924,8 +16844,8 @@ msgstr ""
 "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá, keď bude "
 "správa obsahovať iné znaky ako ASCII"
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Odosielanie"
 
@@ -17651,35 +17571,35 @@ msgstr "Nie sú dostupné žiadne informácie"
 msgid "No recipient keys defined."
 msgstr "Neboli definované žiadne kľúče príjemcov."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba pri dekódovaní BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Pokus o doručenie už prebieha."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Nemožno otvoriť súbor %s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "Hlavička správy vo fronte je poškodená."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "nastala chyba počas relácie SMTP."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 "Nebol nájdený zadaný účet na odoslanie a pri relácii SMTP nastala chyba."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17687,20 +17607,20 @@ msgstr ""
 "Nemožno zistiť informácie na odoslanie. Správa asi nebola vygenerovaná "
 "programom Claws Mail."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "Nemožno vytvoriť dočasný súbor na odosielanie príspevkov news."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "Chyba pri zápise do dočasného súboru na odosielanie príspevkov news."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Filtrujem správy…\n"
 
@@ -17998,88 +17918,88 @@ msgstr "Zadajte text, ktorým má nahradiť „%s”"
 msgid "Enter variable"
 msgstr "Zadajte premennú"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Odosielam správu pomocou príkazu: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nemožno vykonať príkaz: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Pri odosielaní správy nastala chyba: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Robím POP pred SMTP…"
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP pred SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru SMTP: %s:%d…"
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "Správa bola odoslaná úspešne."
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Posielam HELO…"
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "Autentifikácia"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Odosielam správu…"
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "Odosielam EHLO…"
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "Odosielam MAIL FROM…"
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "Odosielam RCPT TO…"
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "Odosielam DATA…"
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Odpájam sa…"
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Odosielam správu"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18959,12 +18879,12 @@ msgstr "Prosím zvoľte linku."
 msgid "Select All"
 msgstr "Vybrať všetko"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Víta vás Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -19057,128 +18977,128 @@ msgstr ""
 " učiniť na adrese <%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Prosím, zadajte názov schránky."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Prosím, zadajte svoje meno a emailovú adresu."
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Prosím, zadajte váš server príchodzej pošty, a používateľské meno."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Prosím, zadajte svoje používateľské meno."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Prosím, zadajte svoj SMTP server."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Prosím, zadajte svoje používateľské meno SMTP."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Vaše meno:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Vaša emailová adresa:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Vaša organizácia:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Meno poštovej schránky:"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 "Môžete zadať aj absolútnu cestu k zložke, napr.: „/home/jozef/Dokumenty/Mail”"
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 "Číslo portu môžete zadať tak, že ho pridáte na koniec: „mail.firma.sk:25”"
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "Adresa servera SMTP:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Použiť autentifikáciu"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(nechajte prázdne, ak je rovnaké ako na príjem)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "Meno SMTP:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "Heslo SMTP:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Použiť SSL na pripojenie k serveru SMTP"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Použiť SSL pomocou STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Klientský SSL certifikát (voliteľné)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Adresa servera:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Lokálna poštová schránka:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Typ servera:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 "Číslo portu môžete zadať tak, že ho pridáte na koniec: „mail.priklad.sk:110”"
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Použiť SSL na pripojenie k serveru prijímania"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "Zložka servera IMAP:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Zobraziť len odoberané zložky"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19186,15 +19106,15 @@ msgstr ""
 "Varovanie: táto verzia Claws Mail\n"
 "bola zostavená bez podpory protokolu IMAP."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Sprievodca nastavením Claws Mail"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Claws Mail vás víta"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19207,31 +19127,31 @@ msgstr ""
 "Začneme získaním základných údajov o vás, a vašich poštových nastaveniach, "
 "aby ste mohli začať Claws Mail používať za menej ako päť minút."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "O vás"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Polia, označené tučným písmom, musia byť vyplnené"
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Príjímanie pošty"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Odosielanie pošty"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Ukladanie správy na disk"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Konfigurácia dokončená"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19239,9 +19159,6 @@ msgstr ""
 "Program Claws Mail je pripravený.\n"
 "Kliknite na Uložiť a začnite."
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Digitálny podpis nemožno overiť - %s."
-
 #~ msgid "+_Insert"
 #~ msgstr "+_Vložiť"
 
diff --git a/po/sv.po b/po/sv.po
index 8f547e1..f995c00 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.13.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-18 22:21+0100\n"
 "PO-Revision-Date: 2015-12-18 22:28+0100\n"
 "Last-Translator: Andreas Rönnquist <gusnan at openmailbox.org>\n"
 "Language-Team: Swedish\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -30,15 +30,15 @@ msgstr ""
 "Det finns något \"Skriv meddelande\"-fönster öppet.\n"
 "Stäng alla \"Skriv meddelande\"-fönster innan du redigerar konton."
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "Kan inte skapa mapp."
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "Redigera konton"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -48,43 +48,43 @@ msgstr ""
 "listan, kryssrutan indikerar vilka konton som kommer att inkluderas. Fet "
 "stil anger standardkontot."
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " _Sätt som standardkonto "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Konton med fjärrmappar kan inte kopieras."
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopia av %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Vill du verkligen ta bort konto '%s'?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(Ingen titel)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "Ta bort konto"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "H"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hämta e-post' hämtar e-post från valda e-postkonton"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -97,11 +97,11 @@ msgstr "'Hämta e-post' hämtar e-post från valda e-postkonton"
 msgid "Name"
 msgstr "Namn"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "Server"
 
@@ -154,10 +154,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -418,18 +418,18 @@ msgid "_Book"
 msgstr "Adress_bok"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "V_erktyg"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "_Hjälp"
 
@@ -468,13 +468,13 @@ msgstr "_Ta bort adressbok"
 msgid "_Save"
 msgstr "_Spara"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "St_äng"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "Markera _allt"
 
@@ -483,7 +483,7 @@ msgid "C_ut"
 msgstr "Klipp _ut"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopiera"
@@ -533,8 +533,8 @@ msgstr "Hitta dubbletter..."
 msgid "Edit custom attributes..."
 msgstr "Ändra anpassade attribut..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "_Om"
 
@@ -650,7 +650,7 @@ msgstr "Stark(are) autentisering krävs"
 msgid "Sources"
 msgstr "Källor"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adressbok"
@@ -701,7 +701,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
@@ -814,7 +814,7 @@ msgid "Person"
 msgstr "Person"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Mapp"
 
@@ -949,18 +949,19 @@ msgstr "Adress(er) uppdaterade"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Uppdatering misslyckades. Ändringar inte skrivna till Katalogen."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9473
 msgid "Notice"
 msgstr "Meddelande"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5680 src/compose.c:6203
+#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:746 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4892
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5621 src/inc.c:669
 #: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
 msgid "Error"
 msgstr "Fel"
@@ -993,43 +994,43 @@ msgstr "LDAP Namn"
 msgid "Attribute Value"
 msgstr "Attributvärde"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "Inget"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "en visare"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "en MIME-tolkare"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "mappar"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "filtrerar"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "ett sekretessgränssnitt"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "en notifierare"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "ett verktyg"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "Gör ingenting"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1037,25 +1038,25 @@ msgstr ""
 "Denna insticksmodul tillhandahåller %s (%s), som redan tillhandahålls av "
 "insticksmodulen %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "Insticksmodulen är redan laddad"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "Kunde inte allokera minne till insticksmodul"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Denna modul är inte licensierad under en licens som är kompatibel med GPL v3 "
 "eller senare."
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "Denna modul är för Claws-Mail GTK1."
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1064,7 +1065,7 @@ msgstr ""
 "Din version av Claws Mail är nyare än den version som '%s' insticksmodulen "
 "byggdes med. "
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1072,16 +1073,16 @@ msgstr ""
 "Din version av Claws Mail är nyare än den version som insticksmodulen "
 "byggdes med."
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Din version av Claws Mail är för gammal för '%s' insticksmodulen."
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Din version av Claws Mail är för gammal för insticksmodulen."
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "SSL-handskakning misslyckades\n"
 
@@ -1470,7 +1471,7 @@ msgstr "_Ta bort"
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_Meddelande"
 
@@ -1538,7 +1539,7 @@ msgstr "_Radbruten"
 msgid "_Unwrapped"
 msgstr "Ej radbr_uten"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Markera _alla"
@@ -1603,7 +1604,7 @@ msgstr "Ta bort rad"
 msgid "Delete to end of line"
 msgstr "Ta bort till slutet av raden"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Sök"
@@ -1648,47 +1649,47 @@ msgstr "Sekretess_system"
 msgid "_Priority"
 msgstr "_Prioritet"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "_Teckenkodning"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "Hebreiska"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "Arabiska"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "Japansk (EUC-JP)"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "Kinesiska"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "Koreanska"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_Adressbok"
 
@@ -1696,7 +1697,7 @@ msgstr "_Adressbok"
 msgid "_Template"
 msgstr "_Mall"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "Aktiviteter"
 
@@ -1732,11 +1733,11 @@ msgstr "Visa linjal"
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "_Alla"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "Av_sändare"
 
@@ -1760,27 +1761,27 @@ msgstr "L_åg"
 msgid "_Lowest"
 msgstr "_Lägsta"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "_Automatiskt"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7 bitars ASCII (US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turkisk (ISO-8859-_9)"
 
@@ -1829,47 +1830,47 @@ msgstr "Meddelandetexten av \"Vidarebefordra\"-mallen har ett fel på rad %d."
 msgid "Fw: multiple emails"
 msgstr "Vb: många meddelande"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "\"Omdirigera\"-mallen har ett fel i meddelandetexten på rad %d."
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Svara till:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4935 src/compose.c:4937
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskussionsgrupper:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Uppföljning Till:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Svar-På:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4932 src/compose.c:4940
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "Till:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Kunde inte bifoga en fil (omvandling av teckenuppsättning misslyckades)."
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1884,16 +1885,16 @@ msgstr[1] ""
 "Följande filer har bifogats: \n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Citattecknen\" av mallen är ogiltiga."
 
-#: src/compose.c:3605
+#: src/compose.c:3602
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kunde inte ta storleken på filen '%s'."
 
-#: src/compose.c:3616
+#: src/compose.c:3613
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1901,57 +1902,57 @@ msgid ""
 msgstr ""
 "Du är på väg att infoga en fil på %s i meddelandetexten. Vill du fortsätta?"
 
-#: src/compose.c:3619
+#: src/compose.c:3616
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3617 src/compose.c:10529 src/compose.c:11390
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: src/compose.c:3744
+#: src/compose.c:3741
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:3745
+#: src/compose.c:3742
 msgid "Empty file"
 msgstr "Tom fil"
 
-#: src/compose.c:3746
+#: src/compose.c:3743
 msgid "_Attach anyway"
 msgstr "Bifog_a ändå"
 
-#: src/compose.c:3755
+#: src/compose.c:3752
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan inte läsa %s."
 
-#: src/compose.c:3782
+#: src/compose.c:3779
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4772 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [Redigerat]"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4779 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Skriv meddelande%s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4782 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[inget ämne] - Skriv meddelande%s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4784 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "Skriv meddelande"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4811 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1959,51 +1960,51 @@ msgstr ""
 "Konto för att skicka e-post är inte specificerat.\n"
 "Var god välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5031 src/compose.c:5063 src/compose.c:5105
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:5035
+#: src/compose.c:5032
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Den enda mottagaren är standard kopie-adressen. Skicka ändå?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5033 src/compose.c:5065 src/compose.c:5098 src/compose.c:5622
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Skicka"
 
-#: src/compose.c:5067
+#: src/compose.c:5064
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Den enda mottagaren är standard blindkopie-adressen. Skicka ändå?"
 
-#: src/compose.c:5084
+#: src/compose.c:5081
 msgid "Recipient is not specified."
 msgstr "Mottagare har inte specificerats."
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5100 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Kö"
 
-#: src/compose.c:5104
+#: src/compose.c:5101
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Ämnesraden är tom. %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5102 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Skicka ändå?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Köa det ändå?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5105 src/toolbar.c:425
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5158 src/compose.c:9993
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2013,7 +2014,7 @@ msgstr ""
 "\n"
 "Fel vid omvandling av teckenuppsättning."
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5161 src/compose.c:9996
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2023,7 +2024,7 @@ msgstr ""
 "\n"
 "Kunde inte få tag i mottagarens krypteringsnyckel."
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5167 src/compose.c:9990
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2034,7 +2035,7 @@ msgstr ""
 "\n"
 "Signeringsfel: %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5170
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2045,11 +2046,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5175
+#: src/compose.c:5172
 msgid "Could not queue message for sending."
 msgstr "Kunde inte lägga meddelandet i kön för att skickas."
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5187 src/compose.c:5247
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2057,7 +2058,7 @@ msgstr ""
 "Meddelandet var lagt i kö men kunde inte skickas.\n"
 "Använd \"Sänd köade meddelande\" från huvudfönstret för att försöka igen."
 
-#: src/compose.c:5246
+#: src/compose.c:5243
 #, c-format
 msgid ""
 "%s\n"
@@ -2066,7 +2067,7 @@ msgstr ""
 "%s\n"
 "Använd \"Sänd köade meddelande\" från huvudfönstret för att försöka igen."
 
-#: src/compose.c:5621
+#: src/compose.c:5618
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2077,7 +2078,7 @@ msgstr ""
 "till den specificerade %s kodningen.\n"
 "Skicka som det %s?"
 
-#: src/compose.c:5679
+#: src/compose.c:5676
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2090,72 +2091,73 @@ msgstr ""
 "\n"
 "Skicka ändå?"
 
-#: src/compose.c:5790
+#: src/compose.c:5787
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Kunde inte dekryptera e-posten: %s"
 
-#: src/compose.c:5911
+#: src/compose.c:5908
 msgid "Encryption warning"
 msgstr "Varning om kryptering"
 
-#: src/compose.c:5912
+#: src/compose.c:5909
 msgid "C_ontinue"
 msgstr "F_ortsätt"
 
-#: src/compose.c:5961
+#: src/compose.c:5958
 msgid "No account for sending mails available!"
 msgstr "Det finns inget konto för att skicka e-post tillgängligt!"
 
-#: src/compose.c:5970
+#: src/compose.c:5967
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Valt konto är inte NNTP: Omöjligt att skicka."
 
-#: src/compose.c:6205
+#: src/compose.c:6202
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bilagan %s existerar inte längre. Ignorera?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6203 src/mainwindow.c:651 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Avbryt sändning"
 
-#: src/compose.c:6206
+#: src/compose.c:6203
 msgid "Ignore attachment"
 msgstr "Ignorera bilaga"
 
-#: src/compose.c:6246
+#: src/compose.c:6243
 #, c-format
 msgid "Original %s part"
 msgstr "Ursprunglig %s del"
 
-#: src/compose.c:6824
+#: src/compose.c:6825
 msgid "Add to address _book"
 msgstr "Lägg till i adress_boken"
 
-#: src/compose.c:6985
+#: src/compose.c:6986
 msgid "Delete entry contents"
 msgstr "Ta bort innehållet i inmatningsfältet"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6990 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Använd <tabb> för automatisk ifyllning från adressbok"
 
-#: src/compose.c:7204
+#: src/compose.c:7212
 msgid "Mime type"
 msgstr "Mime typ"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:7273
+#: src/compose.c:7281
 msgid "Save Message to "
 msgstr "Spara meddelande i "
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7318 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2166,23 +2168,23 @@ msgstr "Spara meddelande i "
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: src/compose.c:7783
+#: src/compose.c:7791
 msgid "Hea_der"
 msgstr "Brevhuvud"
 
-#: src/compose.c:7788
+#: src/compose.c:7796
 msgid "_Attachments"
 msgstr "Bilagor"
 
-#: src/compose.c:7802
+#: src/compose.c:7810
 msgid "Othe_rs"
 msgstr "Öv_rigt"
 
-#: src/compose.c:7817
+#: src/compose.c:7825
 msgid "S_ubject:"
 msgstr "Ämne:"
 
-#: src/compose.c:8041
+#: src/compose.c:8049
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2191,19 +2193,19 @@ msgstr ""
 "Felstavningsprogram kunde inte starta.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8188
 msgid "_From:"
 msgstr "_Från:"
 
-#: src/compose.c:8197
+#: src/compose.c:8205
 msgid "Account to use for this email"
 msgstr "Konto att använda för denna e-post"
 
-#: src/compose.c:8199
+#: src/compose.c:8207
 msgid "Sender address to be used"
 msgstr "Avsändaradress att användas"
 
-#: src/compose.c:8365
+#: src/compose.c:8373
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2212,68 +2214,68 @@ msgstr ""
 "Sekretesssystemet '%s' kan inte laddas. Du kommer inte att kunna signera "
 "eller kryptera detta meddelande."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "Ingen"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8575 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Mallens meddelandetext har ett fel på rad %d."
 
-#: src/compose.c:8683
+#: src/compose.c:8691
 msgid "Template From format error."
 msgstr "Fel i Från-mallformat."
 
-#: src/compose.c:8701
+#: src/compose.c:8709
 msgid "Template To format error."
 msgstr "Fel i Till-mallformat."
 
-#: src/compose.c:8719
+#: src/compose.c:8727
 msgid "Template Cc format error."
 msgstr "Fel i Kopia-mallformat."
 
-#: src/compose.c:8737
+#: src/compose.c:8745
 msgid "Template Bcc format error."
 msgstr "Fel i Blindkopia-mallformat."
 
-#: src/compose.c:8755
+#: src/compose.c:8763
 msgid "Template Reply-To format error."
 msgstr "Fel i malformat för Svara-Till."
 
-#: src/compose.c:8774
+#: src/compose.c:8782
 msgid "Template subject format error."
 msgstr "Fel i Ärende-mallformat."
 
-#: src/compose.c:9043
+#: src/compose.c:9051
 msgid "Invalid MIME type."
 msgstr "Felaktig MIME-typ"
 
-#: src/compose.c:9058
+#: src/compose.c:9066
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:9132
+#: src/compose.c:9140
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:9149
+#: src/compose.c:9157
 msgid "MIME type"
 msgstr "MIME-typ"
 
-#: src/compose.c:9190
+#: src/compose.c:9198
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:9210
+#: src/compose.c:9218
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:9211
+#: src/compose.c:9219
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:9462
+#: src/compose.c:9470
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2284,17 +2286,17 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9959 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna skicka "
 "denna e-post."
 
-#: src/compose.c:9977
+#: src/compose.c:9985
 msgid "Could not queue message."
 msgstr "Kunde inte köa meddelandet."
 
-#: src/compose.c:9979
+#: src/compose.c:9987
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2305,15 +2307,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10165
 msgid "Could not save draft."
 msgstr "Kunde inte spara utkast."
 
-#: src/compose.c:10161
+#: src/compose.c:10169
 msgid "Could not save draft"
 msgstr "Kunde inte spara utkast."
 
-#: src/compose.c:10162
+#: src/compose.c:10170
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2321,24 +2323,24 @@ msgstr ""
 "Kunde inte spara utkast.\n"
 "Vill du avbryta avsluta eller kasta denna e-post?"
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Cancel exit"
 msgstr "_Avbryt avslutande"
 
-#: src/compose.c:10164
+#: src/compose.c:10172
 msgid "_Discard email"
 msgstr "_Överge e-post"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10332 src/compose.c:10346
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:10352
+#: src/compose.c:10360
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunde inte läsas."
 
-#: src/compose.c:10354
+#: src/compose.c:10362
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2347,54 +2349,54 @@ msgstr ""
 "Filen '%s' innehåller ogiltiga tecken\n"
 "för den aktuella teckenkodningen, inmatning kan bli fel."
 
-#: src/compose.c:10441
+#: src/compose.c:10449
 msgid "Discard message"
 msgstr "Överge meddelande"
 
-#: src/compose.c:10442
+#: src/compose.c:10450
 msgid "This message has been modified. Discard it?"
 msgstr "Detta meddelande har ändrats. Vill du överge det?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Överge"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10451 src/compose.c:10455
 msgid "_Save to Drafts"
 msgstr "_Spara till Utkast"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: src/compose.c:10446
+#: src/compose.c:10454
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Detta meddelande har ändrats. Vill du spara de senaste ändringarna?"
 
-#: src/compose.c:10447
+#: src/compose.c:10455
 msgid "_Don't save"
 msgstr "_Spara inte"
 
-#: src/compose.c:10518
+#: src/compose.c:10526
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vill du använda mallen '%s' ?"
 
-#: src/compose.c:10520
+#: src/compose.c:10528
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10529 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:11379
+#: src/compose.c:11387
 msgid "Insert or attach?"
 msgstr "Infoga eller bifoga"
 
-#: src/compose.c:11380
+#: src/compose.c:11388
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2402,16 +2404,16 @@ msgstr ""
 "Vill du infoga innehållet i filen(-erna) i meddelandetexten, eller bifoga "
 "det till meddelandet?"
 
-#: src/compose.c:11382
+#: src/compose.c:11390
 msgid "_Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:11599
+#: src/compose.c:11607
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Citatformatfel på rad %d."
 
-#: src/compose.c:11894
+#: src/compose.c:11902
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2628,8 +2630,8 @@ msgid " Check File "
 msgstr " Undersök fil "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "Fil"
 
@@ -2776,7 +2778,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2948,7 +2950,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Maximalt antal poster som ska returneras i sökresultatet."
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "Grundläggande"
 
@@ -3083,15 +3085,15 @@ msgid "Stylesheet"
 msgstr "Stilmall"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "Ingen"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "Standard"
 
@@ -3595,27 +3597,27 @@ msgstr "Papperskorg"
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Behandlar (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopierar %s till %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Flyttar meddelande %s till %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Uppdaterar cache %s...."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "Behandlar meddelanden..."
 
@@ -3637,11 +3639,11 @@ msgstr "Välj mapp"
 msgid "NewFolder"
 msgstr "Nymapp"
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215
+#: src/imap_gtk.c:271 src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:424 src/plugins/rssyl/rssyl_cb_menu.c:206
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Ett mappnamn kan inte innehålla '%c'."
@@ -3649,7 +3651,7 @@ msgstr "Ett mappnamn kan inte innehålla '%c'."
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Mappen '%s' finns redan."
@@ -3673,7 +3675,7 @@ msgstr "Markera alla som lästa rekursi_vt"
 msgid "R_un processing rules"
 msgstr "Kör behandlingsregler"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_Sök i mapp..."
 
@@ -3731,12 +3733,12 @@ msgstr "Vill du verkligen markera alla meddelanden i denna mapp som lästa?"
 msgid "Mark all as read"
 msgstr "Markera alla som lästa"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Avsöker mapp %s%c%s..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Avsöker mapp %s...."
@@ -3783,7 +3785,7 @@ msgstr "Öppnar mapp %s..."
 msgid "Folder could not be opened."
 msgstr "Mappen kunde inte öppnas."
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "Töm papperskorg"
 
@@ -4024,7 +4026,7 @@ msgstr ""
 "Lokal: %s (teckenkodning: %s)\n"
 "Operativsystem: okänt"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "Claws Mail-laget"
 
@@ -5016,9 +5018,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
@@ -5055,14 +5057,14 @@ msgstr "Inlästa insticksmoduler"
 msgid "Page Index"
 msgstr "Sidindex"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "_Dölj"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5503,234 +5505,193 @@ msgstr "Filstorlek:"
 msgid "Load Image"
 msgstr "Ladda bild"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4-förbindelse bruten\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP-fel vid %s:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr "autentiserad\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr "Icke autentiserad\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr "dåligt tillstånd\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr "strömfel\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr "tolkningsfel (väldigt troligt följs inte RFS från servern)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr "Förbindelse vägrad\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr " minnesfel\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr " fatalt fel\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr "protokollfel (mycket troligt följer inte servern RFC-standarden)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr " anslutning inte accepterad\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " APPEND-fel\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " NOOP-fel\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " LOGOUT-fel\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " CAPABILITY-fel\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " CHECK-fel\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " CLOSE-fel\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " EXPUNGE-fel\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " COPY-fel\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " UID-fel\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " CREATE-fel\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " DELETE-fel\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " EXAMINE-fel\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " FETCH-fel\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " UID FETCH-fel\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " LIST-fel\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " LOGIN-fel\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr " LSUB-fel\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " RENAME-fel\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " SEARCH-fel\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " UID SEARCH-fel\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " SELECT-fel\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " STATUS-fel\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " STORE-fel\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " UID STORE-fel\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " SUBSCRIBE-fel\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " UNSUBSCRIBE-fel\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " STARTTLS-fel\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " INVAL-fel\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " EXTENSION-fel\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " SASL-fel\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " SSL-fel\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr "Okänt fel [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5742,7 +5703,7 @@ msgstr ""
 "CRAM-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-"
 "stöd och om CRAM-MD5 SASL insticksmodulen är installerad."
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5754,7 +5715,7 @@ msgstr ""
 "DIGEST-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-"
 "stöd och om DIGEST-MD5 SASL insticksmodulen är installerad."
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5766,51 +5727,38 @@ msgstr ""
 "SCRAM-SHA-1-inloggning fungerar endast om libetpan har kompilerats med SASL-"
 "stöd och om SCRAM SASL-insticksmodulen är installerad."
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"CRAM-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-"
-"stöd och om CRAM-MD5 SASL insticksmodulen är installerad."
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Anslutning till %s misslyckades: inloggning avslogs, %s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Anslutning till %s misslyckades: inloggning avslogs, %s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Anslutning till %s misslyckades"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-anslutning till %s har blivit nedkopplad. Ansluter igen...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna kontakta "
 "IMAP-servern."
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5824,104 +5772,104 @@ msgstr ""
 "Vill du fortsätta att ansluta till den här servern? Kommunikationen kommer "
 "inte vara säker."
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "Försätt ansluta"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Konto '%s': Ansluter till IMAP4-server: %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Kan inte ansluta till IMAP4-server: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan inte ansluta till IMAP4-server: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "Kan inte starta TLS session.\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kunde inte logga in på IMAP4-server %s.\n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kunde inte logga in på IMAP-server %s."
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "Lägger till meddelanden..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "Kopierar meddelanden..."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "kan inte sätta borttaget-flaggor\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Letar efter icke prenumererade mappar i %s..."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Letar efter undermappar till %s...."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST mislyckades\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan inte döpa om brevlåda: %s till %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST misslyckades\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "Flaggar meddelande..."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "Servern kräver TLS för att logga in.\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan inte uppdatera egenskaper.\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5930,20 +5878,20 @@ msgstr ""
 "Anslutning till %s misslyckades: servern kräver TLS, men Claws-Mail har "
 "kompilerats utan stöd för TLS.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "Serverinloggningar är avaktiverade.\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "Hämtar meddelande..."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan inte sätta borttaget-flaggor: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5994,7 +5942,7 @@ msgstr "Pren_umerationer"
 msgid "_Subscribe..."
 msgstr "_Prenumerera"
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "Säg _upp prenumeration"
 
@@ -6031,20 +5979,20 @@ msgstr "Ärv egenskaper från överliggande mapp"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Ange nytt namn för '%s':"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6067,7 +6015,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen '%s'."
@@ -6094,7 +6042,7 @@ msgstr "_Sök"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Välj en undermapp till %s att prenumerera på: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "Prenumerera"
 
@@ -6128,8 +6076,8 @@ msgstr "prenumerera"
 msgid "unsubscribe"
 msgstr "säg upp prenumeration"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428
+#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Använd på undermappar"
 
@@ -6320,58 +6268,58 @@ msgstr "Välj Pine Fil"
 msgid "Import Pine file into Address Book"
 msgstr "Impora Pine-fil till Adressbok"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr ""
 "Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna hämta e-"
 "post."
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s misslyckades\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "Vänta"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Färdig (%d meddelande (%s) mottaget)"
 msgstr[1] "Färdig (%d meddelanden (%s) mottagna)"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "Klart (inga nya meddelande)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "Förbindelse misslyckades"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Aut. misslyckades"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Time out"
 
@@ -6407,7 +6355,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "Autentiserar"
 
@@ -6432,7 +6380,7 @@ msgstr "Tar emot antal nya meddelanden (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot storleken på meddelanden (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "Avslutar"
 
@@ -6483,7 +6431,7 @@ msgstr "Socket fel."
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-fel på anslutning till %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "Anslutning avslutades av motstående värddator."
 
@@ -6505,11 +6453,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades"
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6518,7 +6466,7 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6871,814 +6819,809 @@ msgstr "Nätverkshanteraren: nätverket är online.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "Nätverkshanteraren: nätverket är frånkopplat.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "_Arkiv"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "_Visa"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "_Konfiguration"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "Ändra sorteringsordning för brevlådor"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "_Importera mbox-fil..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "_Exportera till mbox-fil..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "Exportera _valda till mbox-fil..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "_Töm alla papperskorgar"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "_Spara epost som..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "_Spara del som..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "Sidinstä_llningar..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "Synkronisera mappar"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "Markera _tråd"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "_Leta i aktuellt meddelande..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "S_nabbsök"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "Visa eller g_öm"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "Verk_tygsraden"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "Välj visade _kolumner"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "I _mapplista... "
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "I m_eddelandelista"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "La_yout"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "_Sortera"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "_Attrahera efter ämne"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "E_xpandera alla trådar"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "Ko_llapsa alla trådar"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "_Gå till"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "_Föregående meddelande"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "_Nästa meddelande"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "Fö_regående olästa meddelande"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "N_ästa olästa meddelanden"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "Föregående n_ytt meddelande"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "N_ästa nya meddelande"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "Föregående _markerade meddelande"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "Nästa m_arkerade meddelande"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "Föregående _färgade meddelande"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "Nästa fär_gade meddelande"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "Föregående öppnat meddelande"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "Nästa öppnade meddelande"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "Överliggande meddelande"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "Nästa olästa _mapp"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "Annan ma_pp..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "Nästa del"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Föregående del"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "Meddelanderullning"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "Föregående rad"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "Nästa rad"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "Föregående sida"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "Nästa sida"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "Avkoda"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "_Öppna i nytt fönster"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "Meddel_andets källkod"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr " Meddelandedel"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "Visa som text"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Öppna"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "Öppna _med..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "Citat"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "_Uppdatera sammanfatting"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "Ta emot"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "Hämta från a_ktuellt konto"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "Hämta från _alla konton"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "Avbryt hämtnin_g"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "_Skicka köade meddelanden"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "Skriv e-postmeddela_nde"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "Nytt diskussionsgruppsmeddelande"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "Sva_ra"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Svara t_ill"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "Sänd_lista"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "Följ upp och svara till"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "Vidarebe_fordra"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "_Vidarebefordra som bilaga"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Omdiri_gera"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "Sänd_lista"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "Skicka"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "_Hjälp"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "Säg upp prenumeration"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "Visa arkiv"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "Kontakta ägare"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "_Flytta..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "Fly_tta till papperskorg"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "Ta _bort..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "Flytt_a tråd till papperskorg"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "Ta bort trå_d"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "Avbryt ett diskussionsgruppmeddelande"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_Markera"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "_Avmarkera"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "Markera som _oläst"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "Markera som _läst"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "Markera alla som lästa"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorera tråd"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "Sluta ignorera tråd"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Bevaka tråd"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "Sluta bevaka tråd"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "Markera som _skräppost"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "Markera som ej skräppost"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Lås"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Lås upp"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "Färgm_arkera"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "_Etiketter"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "_Omredigera"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Kontrollera signatur"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "Lägg till avsändaren till adressbo_ken"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "_Samla in adress(er)"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "Från nuvarande m_app..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "Från markerade _meddelanden..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "_Filtrera alla meddelanden i mapp"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "Filtrera _markerade meddelanden"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "Kör behandlingsregler för mappen"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "Skapa filter_regel"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatiskt"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "Efter _Från"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "Efter _Till"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "Efter _Ämne"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Skapa behandlingsregel"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "Lista _webbadresser..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "L_eta efter nya meddelanden i alla mappar"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "I markerad mapp"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "I alla mappar"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "Kör"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "Utplåna"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "SSL-cer_tifikat"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "Filtreringslo_gg"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "Nätverks_logg"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "Gl_öm alla sessionslösenord"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "Gl_öm alla sessionslösenord"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "_Ändra aktuellt konto"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "Egen_skaper för aktuellt konto..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "Skapa _nytt konto..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "R_edigera konton..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "E_genskaper"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "Förbehandla..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "Efterbehandla..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "_Filtrering..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "Mallar..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "_Aktiviteter..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "Etiketter..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "Insticksmoduler..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ med frågor från användare"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "Ikonförk_laring"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "Sätt som standardklient"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "Frånkopplat _läge"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "Men_yrad"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "_Meddelandevy"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "_Statusrad"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "Kolumnrubriker"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "Tr_ådvy"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "Dölj lästa trådar"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "_Dölj lästa meddelanden"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "Dölj borttagna meddelanden"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "_Helskärm"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "Visa alla brev_huvuden"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "Ko_llapsa alla"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "Kollapsa från nivå _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "Kollapsa från nivå _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "Text under ikoner"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "Text bredvid ikoner"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "Endast _ikoner"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "Endast _text"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "_Standard"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "_Tre kolumner"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "_Brett meddelande"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "Bred meddelandelista"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "Liten skärm"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "Efter _Nummer"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "Efter storlek"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "Efter _datum"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "Efter Datum för tråd"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "Efter _ämne"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "Efter färgmarkering"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "Efter etikett"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "Efter _markering"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "Efter _status"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "Efter _bilaga"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "Efter poäng"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "Efter låst"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "S_ortera inte"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Stigande"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Fallande"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "Upptäck _automatiskt"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "Lägg till etiketter..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Något/några fel inträffade. Klicka här för att se loggen."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "Du är ansluten. Klicka här för att koppla ifrån"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "Du är inte ansluten. Klicka här för att ansluta"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "Välj konto"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Nätverkslogg"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "Felsökningslogg för filtrerings- och behandllingsregler"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filtreringslogg aktiverad\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filtreringslogg avaktiverad\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelande från papperskorgar?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "A_vsluta inte"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7688,18 +7631,18 @@ msgstr ""
 "Om en existerande brevlåda specificeras, kommer den\n"
 "att genomsökas automatiskt."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Brevlådan '%s' finns redan."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7708,78 +7651,78 @@ msgstr ""
 "Skapande av brevlåda misslyckades.\n"
 "Några filer finns kanske redan, eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "Inte tillåtet att skicka"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Fel vid import av mbox-fil."
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "Export till mbox-fil misslyckades"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "Avsluta Claws Mail?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "Synkronisera mappar"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "Vill du synkronisera dina mappar nu?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "_Synkronisera"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Ta bort %d meddelandedubbletter i %d mappar.\n"
 msgstr[1] "Ta bort %d dubblerade meddelande i %d mappar.\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "Behandlingsregler att applicera före mappregler"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "Behandlingsregler att applicera efter mappregler"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "Filtreringskonfiguration"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Kan inte registrera som standardklient: omöjligt att hitta sökväg till "
 "exekverbar fil."
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws-Mail har blivit registrerad som standardklient."
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Kan inte registrera som standardklient: omöjligt att skriva till registret."
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7859,7 +7802,7 @@ msgstr "Skriv mbox-fil"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Filen finns redan. Vill du skriva över den?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Skriv över"
@@ -7905,19 +7848,19 @@ msgstr "Slutet av meddelande nått; fortsätt från början?"
 msgid "Search finished"
 msgstr "Sökning färdig"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Meddelandevy"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<Igen Returväg hittad>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7932,11 +7875,11 @@ msgstr ""
 "Returväg: %s\n"
 "Det rekommenderas att du inte skickar något läskvitto."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "_Skicka inte"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7948,46 +7891,46 @@ msgstr ""
 "officiellt adresserat till dig.\n"
 "Det rekommenderas att du inte skickar något läskvitto."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Hämtar meddelande (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Kunde inte dekryptera: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Meddelandet följer inte MIME-standarden. Det kan återges fel."
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "Spara som"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "Skriv över befintlig fil?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kan inte spara filen '%s'."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "Visa alla %s."
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "Endast den första megabyten text visas."
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -7995,19 +7938,19 @@ msgstr ""
 "Du har fått ett läskvitto för detta meddelande : det har visats för "
 "mottagaren."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "Detta meddelande begär returkvitto."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "Detta meddelande begär returkvitto."
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "Skicka kvitto"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8015,7 +7958,7 @@ msgstr ""
 "Detta meddelande har tagits emot delvis,\n"
 "och har tagits bort från servern."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8024,15 +7967,15 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s."
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "Markera för nerladdning"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "Markera för borttagning"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8041,12 +7984,12 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s och kommer att laddas ner."
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Avmarkera"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8055,11 +7998,11 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s och kommer att tas bort."
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Återsänd läskvittounderrättelse"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8071,19 +8014,19 @@ msgstr ""
 "Vänligen välj vilket av kontona som du vill använda för att skicka "
 "läskvittot:"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_Skicka Underrättelse"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan inte skriva ut: meddelandet innehåller ingen text."
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8091,7 +8034,7 @@ msgstr ""
 "\n"
 "  Det finns inga meddelanden i denna mapp"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8099,7 +8042,7 @@ msgstr ""
 "\n"
 "  Meddelandet har blivit borttaget"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8107,16 +8050,16 @@ msgstr ""
 "\n"
 "  Meddelandet har flyttats till papperskorgen eller till en annan mapp"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "fel uppstod vid inlärning.\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "Flyttar meddelanden..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Tar bort meddelanden..."
 
@@ -8218,7 +8161,8 @@ msgid "Go back to email"
 msgstr "Gå tillbaka till e-post"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190
+#: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kan inte spara del av flerdelsmeddelande: %s"
@@ -8296,80 +8240,80 @@ msgstr "Storlek:"
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "NNTP-anslutning till %s:%d har kopplats från.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Konto '%s': Ansluter till NNTP-server: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Fel vid inloggning till %s:%d ...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan stöder inte returkod 480 så vi väljer att fortsätta för tillfället\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Mode Reader misslyckades, fortsätter ändå\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Fel vid skapande av session med %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Fel vid autentisering mot %s:%d ...\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws-Mail behöver vara anslutet till nätverket för att ansluta till "
 "diskussionsgruppsservern."
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "kunde inte välja grupp: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "kunde inte ställa in grupp: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "felaktigt artikelomfång: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "kunde inte hämta xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "hämtar xover %d - %d i %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "kunde inte hämta xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "felaktig xover-rad\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -9143,7 +9087,8 @@ msgstr ""
 "Kontrollera inte efter saknade bilagor vid vidarebefordran och "
 "omdirigeringar av meddelanden"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Signaturer"
 
@@ -9252,12 +9197,14 @@ msgstr ""
 "\n"
 "Alternativ finns i /Konfiguration/Egenskaper/Insticksmoduler/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Skräppost"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Skräppostinlärning"
@@ -9848,7 +9795,7 @@ msgstr "CSSen i denna fil kommer att appliceras på alla HTML-delar"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Bläddra"
@@ -9857,93 +9804,93 @@ msgstr "Bläddra"
 msgid "Select stylesheet"
 msgstr "Välj stilmall"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "Laddning av fjärrinnehåll är avaktiverat."
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Ladda bilder"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "Tillåt externt innehåll"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "Aktivera Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "Aktivera Insticksmoduler"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "Aktivera Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "Öppna länkar med extern browser"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ett fel uppstod: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s är ett felaktigt eller ett flöde som inte stöds"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Sök webben"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "Öppna i visare"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "Öppna i Visare (aktivera fjärrinnehåll)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "Öppna i browser"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "Öppna Bild"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "Kopiera Länk"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "Ladda ner Länk"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "Spara Bild Som"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "Kopiera Bild"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "Importera flöde"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML-Visare"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10039,11 +9986,11 @@ msgstr ""
 "Lägger till X-FETCH-TIME-huvudet med datum och tid för mottagande av "
 "meddelande i RFC822-format"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "GData-insticksmodulen: Auktorisering krävs"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -10061,29 +10008,29 @@ msgstr ""
 "den koden i fältet nedan för att ge Claws Mail åtkomst till din Google-"
 "kontaktlista."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "Steg 1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr "Klicka här för att öppna Google's auktoriseringsssida i en webbläsare"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "Steg 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "Mata in kod:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Insticksmodulen GData: Fel vid förfrågan av kontakter: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10091,49 +10038,49 @@ msgstr[0] "Lade till %d av"
 msgstr[1] "Lade till %d av"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 kontakt till cachen"
 msgstr[1] "%d kontakter till cachen"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Insticksmodulen GData: Startar asynkron kontaktförfrågan\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Insticksmodulen GData: Fel vid förfrågan efter grupper: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "Insticksmodulen GData: Grupper mottagna\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Insticksmodulen GData: Startar asynkron gruppförfrågan\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "GData-insticksmodul: Autentiseringsfel: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData-insticksmodul: Auktorisering framgångsrik\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "GData-insticksmodul: Startar interaktiv auktorisering\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 "GData-insticksmodul: Fick auktoriseringskod, efterfrågar auktorisering\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10141,26 +10088,26 @@ msgstr ""
 "GData-insticksmodul: Ingen auktoriseringskod mottagen, "
 "auktoriseringsförfrågan avvisad\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData-Insticksmodul: Auktoriseringfönyelsefel: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData-insticksmodul: Auktoriseringsförnyelse framgångsrik\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-insticksmodul: Försöker förnya auktorisering\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autentisering"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "Användarnamn:"
 
@@ -10206,7 +10153,7 @@ msgstr ""
 "Google Contacts i Tab-komplettering av adresser.\n"
 "Respons till <berndth at gmx.de> är välkommet."
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "GData-integrering"
 
@@ -10434,7 +10381,7 @@ msgstr "Efterfrågad tidsgräns"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "sekund(er)"
@@ -10722,28 +10669,28 @@ msgid "Specify authentication"
 msgstr "Specificera autentisering"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "Användar-ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "Lösenord"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "Automatiskt"
 
@@ -11670,7 +11617,8 @@ msgstr "Förfaller efter"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "'0' kommer att lagra lösenfrasen för hela sessionen"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "minut(er)"
@@ -12297,9 +12245,9 @@ msgstr "Visa Python-konsol..."
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "Bläddra"
 
@@ -12606,7 +12554,7 @@ msgstr ""
 "ändrar titel på flödet."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "Verifiera SSL-certifikatets giltighet"
 
@@ -12766,17 +12714,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Uppdaterar kommentarer för '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (Behörighet krävs)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (Obehörig)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (Hittades inte)"
 
@@ -12913,21 +12861,21 @@ msgstr ""
 "Vänligen notera att brevhuvuden, så som Ämne, inte krypteras av S/MIME-"
 "systemet. "
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "Rapporterar skräppost..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "Rapportera skräppost online..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "Skräppostrapportering"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12943,19 +12891,19 @@ msgstr ""
 " * spamcop.net\n"
 " * nomineringssystemet på lists.debian.org."
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "Skräppostrapportering"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "Vidarebefordra till:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "Lösenord:"
 
@@ -13165,7 +13113,8 @@ msgid "Show"
 msgstr "Visa"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "dagar"
 
@@ -13258,7 +13207,7 @@ msgid "Next month"
 msgstr "Nästa månad"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13292,7 +13241,7 @@ msgstr ""
 "dina möten och kalendrar, publicera din ledig/upptagen-information och ta "
 "emot denna information från andra."
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -13474,63 +13423,63 @@ msgstr "Närvarande:"
 msgid "Action:"
 msgstr "Aktivitet:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "_Nytt möte"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "_Exportera kalender..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "_Prenumerera på webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "Byt namn..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "Updatera pren_umerationer"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "_Listvy"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "_Veckovy"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "_Månadsvy"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "Möten"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "i det förflutna"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "idag"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "imorgon"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "den här veckan"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "senare"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13539,17 +13488,17 @@ msgstr ""
 "\n"
 "Detta är aktiviteterna som är planerade %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Timeout (%d sekunder) vid anslutning till %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "Fel: %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13562,7 +13511,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13575,7 +13524,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13586,7 +13535,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13597,46 +13546,46 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Kunde inte skapa mapp %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws-Mail måste vara anslutet till nätverket för att kunna uppdatera Webcal-"
 "flödet."
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Hämtar kalender för %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "ny prenumeration"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 "Claws-Mail måste vara anslutet till nätverket för att uppdatera "
 "prenumerationen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "Prenumerera på WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "Mata in WebCal URL-en:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "Kunde inte tolka URLen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "Vill du verkligen avbryta prenumerationen?"
 
@@ -14007,83 +13956,83 @@ msgstr "Kunde inte exportera ledig/upptagen-information."
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Kunde inte exportera ledig/upptagen till '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "Påminnelser"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "Varna mig"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "minuter före en aktivitet"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "Kalenderexport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "Exportera kalender automatiskt till"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "Du kan exportera till en lokal fil eller URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Specificera en lokal fil eller URL (http://server/mapp/fil.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "Inkludera webcal-prenumerationer i export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "Kommando att köra efter kalnderexport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registrera Claws kalender i XFCE's Orage clock"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Tillåter Orage (nyare versioner än 4.4) att se Claws-Mails kalender"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "Exportera som GNOME shell kalenderserver"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Registrera D-Bus kalenderservergränssnitt för att exportera Claws Mails "
 "kalender"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "Ledig/Upptagen information"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "Exportera automatiskt ledig/upptagen-status till"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Specificera en lokal fil eller URL (http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "Kommando att köra efter export av ledig/upptagen-status"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "Hämta andras ledig/upptagen-status från"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14092,7 +14041,7 @@ msgstr ""
 "Specificera en lokal fil eller URL (http://server/sökväg/fil.ifb). Använd %u "
 "för vänsterdelen av emailadressen, %d för domänen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "SSL-alternativ"
 
@@ -14147,12 +14096,12 @@ msgstr "fel uppstod i POP3 session\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-kommandot stöds ej\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14160,7 +14109,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "Server för diskussionsgrupper (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "Lokal mbox-fil"
 
@@ -14188,11 +14137,11 @@ msgstr "Fullst. namn"
 msgid "Mail address"
 msgstr "Epostadress"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "Auto-konfiguration"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -14282,7 +14231,7 @@ msgstr ""
 "Meddelande som är större än denna gräns kommer att tas emot delvis. När du "
 "väljer dem kommer du kunna ta emot hela eller ta bort dem."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14294,71 +14243,66 @@ msgstr "Maximalt antal artiklar att ladda ner"
 msgid "unlimited if 0 is specified"
 msgstr "obegränsad om 0 väljs"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "Hitta text:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Mapp på IMAP server"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(vanligtvis tom)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "Visa enbart prenumererade mappar"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreddseffektivt läge (förhindrar hämtning av fjärretiketter)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Detta läge använder mindre bandbredd, men kan vara långsammare med vissa "
 "servrar."
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "Tillåt insticksmoduler filtrera vid mottagning"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Hämta e-post' hämtar nya meddelanden för detta konto"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Brevhuvud"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "Generera Meddelande-ID"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "Skicka kontots email-adress i Meddelande-ID"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "Lägg till huvud för användaragent"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentisering (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14366,180 +14310,180 @@ msgstr ""
 "Om du ej fyller i dessa, kommer samma användar-ID och lösenord som vid "
 "mottagning att användas."
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentisera med POP3 innan avsändning"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "POP autentiseringstimeout"
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "minuter"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "Infoga signatur automatiskt"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "Kommando utdata"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "Ordlistor för stavningskontroll"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Standardordlista:"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Standard alternativordlista"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Nytt"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Svara"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "Standard sekretesssystem"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "Signera alltid meddelanden"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "Kryptera alltid meddelanden"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "Signera alltid meddelanden som svar på ett signerat meddelande"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Kryptera alltid meddelanden som svar på ett krypterat meddelande"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Kryptera skickade meddelanden med din egen nyckel tillsammans med mottagarens"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "Spara skickade krypterade meddelanden i klartext"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "Använd inte SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "Använd SSL för POP3-förbindelse"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Använd STARTTLS-kommando för att starta SSL-session"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "Använd SSL för IMAP4-förbindelse"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "Använd SSL för NNTP-förbindelse"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "Skicka (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Använd inte SSL (men, om nödvändigt, använd STARTTLS)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "Använd SSL för SMTP-förbindelse"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "Klientcertifikat"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "Certifikat för mottagning"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Klient-certifikat som PKCS12 eller PEM-fil"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "Certifikat för sändning"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "Acceptera giltiga SSL-certifikat automatiskt"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "Använd icke-blockerande SSL"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Stäng av detta om du har SSL-anslutningsproblem"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "SMTP-port"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "POP3-port"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "IMAP4-port"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "NNTP-port"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "Domännamn"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14547,15 +14491,15 @@ msgstr ""
 "Domännamnet kommer att användas i det genererade Meddelande-ID't, och vid "
 "anslutning till SMTP-servrar."
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "Använd kommando för att kommunicera med server"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Flytta borttagna meddelanden till papperskorgen och utplåna omedelbart"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
@@ -14563,108 +14507,108 @@ msgstr ""
 "Flyttar borttagna meddelanden till papperskorgen istället för att använda "
 "\\Deleted-flaggan utan att utplåna."
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markera kross-postade meddelanden som läst med färg:"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "Spara skickade meddelanden i"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "Spara köade meddelanden i"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "Lagra utkast i"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "Lagra bortagna meddelande i"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "Konto har inte angivits"
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "Epostadress har inte angivits"
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "SMTP-server har inte angivits"
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "Användar-ID har inte angivits."
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "POP3-server har inte angivits."
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "Standardmapp för Inkorgen finns inte."
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-server har inte angivits"
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "NNTP-server har inte angivits"
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "lokal brevlåda har inte angivits"
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "Epost kommando har inte angivits"
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Mallar"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "Sekretess"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "Inställningar för nytt konto"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Kontoegenskaper"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "Misslyckades (fel adress)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "Välj fil med signatur"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "Välj certifikatsfil"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (insticksmodulen kunde inte laddas)"
@@ -14786,20 +14730,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Vill du verkligen ta bort alla denna aktiviteter? "
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
+#: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Posten sparades inte"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Posten sparades inte. Stänga ändå?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Fortsätt redigera"
 
@@ -15699,7 +15644,7 @@ msgstr "Visa"
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Egenskaper"
 
@@ -15845,7 +15790,7 @@ msgstr "Felmeddelanden"
 msgid "Status messages for filtering/processing log"
 msgstr "Statusmeddelanden för loggning av filtrering- och behandlingsregler"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "Övrigt"
 
@@ -16473,15 +16418,15 @@ msgstr "Välj färg för mapp"
 msgid "Colors"
 msgstr "Färger"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "Välj fördefinierade tangentbordsgenvägar"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "Välj förinställning:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16489,35 +16434,35 @@ msgstr ""
 "Du kan också ändra varje meny-genväg genom att trycka\n"
 "någon tangent(er) när du har muspekaren på menyvalet."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "Lägg till adress till destination vid dubbelklick"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "Vid avslut"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "Bekräfta avslut"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "Töm papperskorg vid avslut"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "Varna om det finns köade meddelanden"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "Tangentbordsgenvägar"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Tillåt konfigurerbara tangentbordsgenvägar"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16527,15 +16472,15 @@ msgstr ""
 "att ha fokus på menyvalet och samtidigt trycka en tangentkombination.\n"
 "Lämna  ej ikryssad om du vil låsa alla nuvarande tangentbordsgenvägar."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Välj fördefinierade tangentbordsgenvägar"
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "Hantering av Metadata"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16543,31 +16488,31 @@ msgstr ""
 "Säker hantering av metadata instruerar OS'et att skriva metadata till disk\n"
 "med en gång; Det undviker dataförluster vid krascher, men kan ta lite tid."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "Säker"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "Snabb"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Tidsgräns för socket I/O"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "Fråga före tömning av papperskorg"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "Fråga om kontospecifika filterregler vid manuell filtrering"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "Använd säker filborttagning, om möjligt"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16575,7 +16520,7 @@ msgstr ""
 "Använd säker filborttagning, om möjligt\n"
 "(programmet 'shred' är inte tillgängligt)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16584,32 +16529,11 @@ msgstr ""
 "före borttagning. Detta gör borttagning långsammare. Läs i manualen till "
 "'shred' för att få information om nackdelar."
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synkronisera frånkopplade mappar så fort som möjligt "
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "Ange lösenord"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "Ange lösenord"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "Ange lösenord"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "Blandat"
 
@@ -16866,8 +16790,8 @@ msgstr ""
 "Specificera vilken Content-Transfer-Encoding som ska användas när meddelande "
 "innehåller icke ASCII-tecken"
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "Skickar"
 
@@ -17597,28 +17521,28 @@ msgstr "Ingen information tillgänglig"
 msgid "No recipient keys defined."
 msgstr "Ingen mottagarnyckel är definierad."
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fel vid avkodning av BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Försöker redan sända."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Kunde inte öppna filen %s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "Köat meddelande har felaktigt brevhuvud."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "Ett fel uppstod i SMTP-session."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -17626,7 +17550,7 @@ msgstr ""
 "Inget specifikt konto har hittats för att skicka, och ett fel inträffade "
 "under SMTP-session."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17634,23 +17558,23 @@ msgstr ""
 "Kunde inte bestämma sändningsinformation. Möjligen har e-postmeddelandet "
 "inte skapats av Claws-Mail."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr ""
 "Kunde inte skapa tillfällig fil för skickande av diskussionsgruppmeddelande."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Ett fel uppstod när tillfällig fil för skickande av "
 "diskussionsgruppmeddelande skrevs."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Fel uppstod medan meddelande till %s skickades."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "Filtrerar meddelade...\n"
 
@@ -17954,88 +17878,88 @@ msgstr "Skriv in text att ersätta '%s'"
 msgid "Enter variable"
 msgstr "Mata in variabel"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Skickar meddelande med kommando: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Kunde inte exekvera kommando: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ett fel uppstod medan kommando: %s kördes"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "Gör POP före SMTP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP innan SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Konto '%s': Ansluter till SMTP-server: %s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "Post skickad utan problem"
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "Skickar HELO"
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "(meddelande)verifiering"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "Skickar meddelande..."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "Skickar EHLO..."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "Skickar MAIL FROM..."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "Skickar RCPT TO..."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "Skickar DATA..."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "Avslutar..."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Skickar meddelande (%d / %d byte)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "Ett fel uppstod medans meddelandet skickades"
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18913,12 +18837,12 @@ msgstr "Vänligen välj webbadress att öppna."
 msgid "Select All"
 msgstr "Markera alla"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Välkommen till Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -19010,47 +18934,47 @@ msgstr ""
 "Om du önskar donera till Claws Mail projektet kan du göra så på <%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "Ange brevlådenamnet."
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "Ange ditt namn och epostadress"
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "Ange din mottagande server och användarnamn."
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "Ange ditt användarnamn."
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "Ange din SMTP-server."
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "Ange ditt SMTP-användarnamn."
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Ditt namn:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "Din e-postadress:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Din organisation:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "Brevlådenamn:"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19058,7 +18982,7 @@ msgstr ""
 "Du kan också ange en absolut sökväg, till exempel: \"/home/john/Documents/"
 "Mail\""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19066,55 +18990,55 @@ msgstr ""
 "Du kan ange portnummer genom att lägga till det på slutet: \"mail.example."
 "com:25\""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "SMTP-serveradress:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "Använd autentisering"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(tomt för samma som vid mottagning)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "SMTP användarnamn:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "SMTP lösenord:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "Använd SSL för att ansluta till SMTP-server"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "Använd SSL via STARTTLS"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "Klient SSL-certifikat (frivilligt)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "Serveradress:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "Lokal brevlåda:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "Servertyp:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19122,19 +19046,19 @@ msgstr ""
 "Du kan ange portnummer genom att lägga till det på slutet: \"mail.example."
 "com:110\""
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "Använd SSL för att ansluta till mottagande server"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "IMAP-serverkatalog:"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "Visa endast prenumererade mappar"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19142,15 +19066,15 @@ msgstr ""
 "Varning: denna version av Claws-Mail\n"
 "har byggts utan IMAP-stöd."
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws-Mails konfigurationsguide"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "Välkommen till Claws-Mail"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19164,31 +19088,31 @@ msgstr ""
 "vanligaste e-postinställningar så att du kan börja använda Claws Mail på "
 "mindre än fem minuter."
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "Om Dig"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "Fetmarkerade fält måste fyllas i"
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "Tar emot post"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "Skickar post"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "Sparar brev på disk"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "Konfigurationen är klar"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 764422c..e82f606 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.1.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-02-19 23:02+0100\n"
+"POT-Creation-Date: 2015-12-14 11:20+0000\n"
 "PO-Revision-Date: 2015-09-04 11:00+8\n"
 "Last-Translator: Mark Chang <mark.cyj at gmail.com>\n"
 "Language-Team: Mark Chang <mark.cyj at gmail.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -25,15 +25,15 @@ msgstr ""
 "發現已開啟的新郵件視窗\n"
 "編輯帳號前請先關閉所有的新郵件視窗"
 
-#: src/account.c:440
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "無法新增資料夾"
 
-#: src/account.c:727
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "編輯帳號"
 
-#: src/account.c:744
+#: src/account.c:741
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -42,43 +42,43 @@ msgstr ""
 "「收信」功能可從你已設定的帳號中標示為「已勾選」的項目,依序收取信件,其中預"
 "設的帳號將以粗體顯示。"
 
-#: src/account.c:815
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " 設定為預設帳號 "
 
-#: src/account.c:907
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "包含遠端資料夾的帳號無法被複製"
 
-#: src/account.c:914
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "複製 %s"
 
-#: src/account.c:1074
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "你確認要刪除帳號「%s」嗎?"
 
-#: src/account.c:1076
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(無標題)"
 
-#: src/account.c:1077
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "刪除帳號"
 
-#: src/account.c:1557
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1563
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "「收信」將從選取的帳號下取回郵件"
 
-#: src/account.c:1570 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7216 src/editaddress.c:1265
+#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
 #: src/editaddress.c:1322 src/editaddress.c:1342
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -91,11 +91,11 @@ msgstr "「收信」將從選取的帳號下取回郵件"
 msgid "Name"
 msgstr "名稱"
 
-#: src/account.c:1578 src/prefs_account.c:1101 src/prefs_account.c:4063
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/account.c:1586 src/ssl_manager.c:102
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "伺服器"
 
@@ -146,10 +146,10 @@ msgstr ""
 
 #: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1806
+#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
 msgid "Unknown error"
 msgstr "未知的錯誤"
 
@@ -405,18 +405,18 @@ msgid "_Book"
 msgstr "通訊錄(_B)"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
+#: src/messageview.c:213
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
+#: src/messageview.c:214
 msgid "_Help"
 msgstr "協助(_H)"
 
@@ -455,13 +455,13 @@ msgstr "刪除通訊錄"
 msgid "_Save"
 msgstr "儲存"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "關閉"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
 msgid "_Select all"
 msgstr "全選"
 
@@ -470,7 +470,7 @@ msgid "C_ut"
 msgstr "剪下"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "複製"
@@ -520,8 +520,8 @@ msgstr "尋找重複連絡人..."
 msgid "Edit custom attributes..."
 msgstr "編輯使用者屬性"
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
+#: src/messageview.c:339
 msgid "_About"
 msgstr "關於"
 
@@ -637,7 +637,7 @@ msgstr "需要更強而有力的認證碼"
 msgid "Sources"
 msgstr "來源"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "通訊錄"
@@ -687,7 +687,7 @@ msgstr ""
 
 #: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1969
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
@@ -800,7 +800,7 @@ msgid "Person"
 msgstr "人員"
 
 #: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2771 src/prefs_folder_column.c:78
+#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "資料夾"
 
@@ -935,19 +935,20 @@ msgstr "地址更新"
 msgid "Update failed. Changes not written to Directory."
 msgstr "更新錯誤!所有的改變將不會被儲存"
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:159 src/compose.c:5683 src/compose.c:6206
-#: src/compose.c:11900 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
+#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:750 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4892
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:670
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
 msgid "Error"
 msgstr "錯誤"
 
@@ -979,87 +980,87 @@ msgstr "LDAP名稱"
 msgid "Attribute Value"
 msgstr "屬性值"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:63
 msgid "Nothing"
 msgstr "什麼都沒有"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:64
 msgid "a viewer"
 msgstr "觀察器"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:65
 msgid "a MIME parser"
 msgstr "MIME轉譯器"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:66
 msgid "folders"
 msgstr "資料夾"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:67
 msgid "filtering"
 msgstr "過濾中"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:68
 msgid "a privacy interface"
 msgstr "私有界面"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:69
 msgid "a notifier"
 msgstr "通知器"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:70
 msgid "an utility"
 msgstr "實用的"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:71
 msgid "things"
 msgstr "東西"
 
-#: src/common/plugin.c:333
+#: src/common/plugin.c:332
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "這個外掛提供了 %s (%s), 而這個功能已經在 %s 外掛中被提供了"
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "此外掛功能已經載入"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "此外掛功能發生記憶體配置錯誤"
 
-#: src/common/plugin.c:485
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr "此模組並未取得GPL v3或更新版本的相容許可"
 
-#: src/common/plugin.c:494
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "此模組適用於 Claws Mail GTK1"
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要新"
 
-#: src/common/plugin.c:791
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要新"
 
-#: src/common/plugin.c:800
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要舊"
 
-#: src/common/plugin.c:802
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要舊"
 
-#: src/common/session.c:183 src/imap.c:1208
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "SSL 交握失敗\n"
 
@@ -1448,7 +1449,7 @@ msgstr "移除(_R)"
 msgid "_Properties..."
 msgstr "屬性(_P)"
 
-#: src/compose.c:586 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "郵件(_M)"
 
@@ -1516,7 +1517,7 @@ msgstr "已換行(_W)"
 msgid "_Unwrapped"
 msgstr "不換行(_U)"
 
-#: src/compose.c:624 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "全選(_a)"
@@ -1581,7 +1582,7 @@ msgstr "刪除列"
 msgid "Delete to end of line"
 msgstr "刪除至列尾"
 
-#: src/compose.c:643 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "尋找(_F)"
@@ -1626,47 +1627,47 @@ msgstr "隱私系統(_S)"
 msgid "_Priority"
 msgstr "優先權(_P)"
 
-#: src/compose.c:672 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
 msgid "Character _encoding"
 msgstr "字元編碼(_e)"
 
-#: src/compose.c:677 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
 msgid "Western European"
 msgstr "西歐"
 
-#: src/compose.c:678 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
 msgid "Baltic"
 msgstr "波羅的海"
 
-#: src/compose.c:679 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
 msgid "Hebrew"
 msgstr "希伯來"
 
-#: src/compose.c:680 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
 msgid "Arabic"
 msgstr "阿拉伯"
 
-#: src/compose.c:681 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
 msgid "Cyrillic"
 msgstr "西里爾"
 
-#: src/compose.c:682 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
 msgid "Japanese"
 msgstr "日文"
 
-#: src/compose.c:683 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
 msgid "Chinese"
 msgstr "中文"
 
-#: src/compose.c:684 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
 msgid "Korean"
 msgstr "韓文"
 
-#: src/compose.c:685 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
 msgid "Thai"
 msgstr "泰文"
 
-#: src/compose.c:688 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "通訊錄"
 
@@ -1674,7 +1675,7 @@ msgstr "通訊錄"
 msgid "_Template"
 msgstr "樣板"
 
-#: src/compose.c:692 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "動作"
 
@@ -1710,11 +1711,11 @@ msgstr "顯示尺標"
 msgid "_Normal"
 msgstr "一般"
 
-#: src/compose.c:713 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
 msgid "_All"
 msgstr "所有"
 
-#: src/compose.c:714 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "傳送者"
 
@@ -1738,27 +1739,27 @@ msgstr "低"
 msgid "_Lowest"
 msgstr "最低"
 
-#: src/compose.c:729 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
 msgid "_Automatic"
 msgstr "自動"
 
-#: src/compose.c:730 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
 msgid "Unicode (_UTF-8)"
 msgstr "萬國碼 (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
 msgstr "中歐 (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
 msgstr "希臘 (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
 msgid "Turkish (ISO-8859-_9)"
 msgstr "士耳其語 (ISO-8859-_9)"
 
@@ -1805,46 +1806,46 @@ msgstr "轉寄信件內的內容樣板在第%d行出現一個錯誤"
 msgid "Fw: multiple emails"
 msgstr "回覆:多重郵件"
 
-#: src/compose.c:2540
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "改寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:2607 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "副本:"
 
-#: src/compose.c:2610 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "密件副本:"
 
-#: src/compose.c:2613 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "回信給:"
 
-#: src/compose.c:2616 src/compose.c:4938 src/compose.c:4940
+#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "新聞群組:"
 
-#: src/compose.c:2619 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "跟隨至:"
 
-#: src/compose.c:2622 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "回覆至:"
 
-#: src/compose.c:2626 src/compose.c:4935 src/compose.c:4943
+#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "收件者:"
 
-#: src/compose.c:2835
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "無法夾帶檔案(字元轉換失敗)"
 
-#: src/compose.c:2841
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1859,73 +1860,73 @@ msgstr[1] ""
 "下列檔案已經夾帶:\n"
 "%s"
 
-#: src/compose.c:3114
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "樣板內\"引用標示\"有誤"
 
-#: src/compose.c:3605
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "無法取得檔案'%s'大小"
 
-#: src/compose.c:3616
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "你可以在訊息內容中插入一個檔案 %s,確認要這樣幹嗎?"
 
-#: src/compose.c:3619
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "你確定嗎?"
 
-#: src/compose.c:3620 src/compose.c:10521 src/compose.c:11382
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/compose.c:3744
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空白的"
 
-#: src/compose.c:3745
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "清空檔案"
 
-#: src/compose.c:3746
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "直接夾檔(_A)"
 
-#: src/compose.c:3755
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s"
 
-#: src/compose.c:3782
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "訊息: %s"
 
-#: src/compose.c:4775 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " 已編輯"
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新信件 %s"
 
-#: src/compose.c:4785 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[無主題] - 新信件 %s"
 
-#: src/compose.c:4787 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "新信件"
 
-#: src/compose.c:4814 src/messageview.c:889
+#: src/compose.c:4820 src/messageview.c:890
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1933,51 +1934,51 @@ msgstr ""
 "尚未指定郵件的傳送地址\n"
 "傳送前請選擇一個郵件地址"
 
-#: src/compose.c:5034 src/compose.c:5066 src/compose.c:5108
-#: src/prefs_account.c:3272 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
+#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "傳送"
 
-#: src/compose.c:5035
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "只存在一個副本收件者,確認寄出?"
 
-#: src/compose.c:5036 src/compose.c:5068 src/compose.c:5101 src/compose.c:5625
-#: src/folderview.c:2438 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
+#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: src/compose.c:5067
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "只存在一個密件副本收件者,確認寄出?"
 
-#: src/compose.c:5084
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "尚未指定收件者"
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "草稿(_Q)"
 
-#: src/compose.c:5104
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "主題空白 %s"
 
-#: src/compose.c:5105 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "確認寄出?"
 
-#: src/compose.c:5106 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "儲存至草稿?"
 
-#: src/compose.c:5108 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "稍後寄送"
 
-#: src/compose.c:5161 src/compose.c:9985
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -1987,7 +1988,7 @@ msgstr ""
 "\n"
 "字元轉換失敗"
 
-#: src/compose.c:5164 src/compose.c:9988
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -1997,7 +1998,7 @@ msgstr ""
 "\n"
 "無法取得收件者的加密金鑰"
 
-#: src/compose.c:5170 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2008,7 +2009,7 @@ msgstr ""
 "\n"
 "簽名天敗:  %s"
 
-#: src/compose.c:5173
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2019,11 +2020,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/compose.c:5175
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "無法將寄送信件儲存在草稿"
 
-#: src/compose.c:5190 src/compose.c:5250
+#: src/compose.c:5196 src/compose.c:5256
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2031,7 +2032,7 @@ msgstr ""
 "草稿信件無法被傳送\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5246
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2040,7 +2041,7 @@ msgstr ""
 "%s\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5621
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2050,7 +2051,7 @@ msgstr ""
 "無法轉換訊息的字元編碼至指定的 %s 編碼\n"
 "確認以 %s 傳送?"
 
-#: src/compose.c:5679
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2062,72 +2063,73 @@ msgstr ""
 "訊息內容將被打斷以利傳輸\n"
 "確定要傳送嗎?"
 
-#: src/compose.c:5790
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "郵件 %s 無法被加密"
 
-#: src/compose.c:5911
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "加密警告"
 
-#: src/compose.c:5912
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "繼續(_o)"
 
-#: src/compose.c:5961
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "傳送郵件時找不到有效的帳號"
 
-#: src/compose.c:5970
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "選擇的帳號並非NNTP:無法傳輸"
 
-#: src/compose.c:6205
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "附加檔案%s不存在,忽略嗎?"
 
-#: src/compose.c:6206 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "終止傳送"
 
-#: src/compose.c:6206
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "忽略附加檔案"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "原始的第%s部份"
 
-#: src/compose.c:6824
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "新增至通訊錄"
 
-#: src/compose.c:6985
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "刪除目錄"
 
-#: src/compose.c:6989 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "按下 <tab> 可自動完成郵件地址"
 
-#: src/compose.c:7204
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "Mime格式"
 
-#: src/compose.c:7210 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:7273
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "儲存訊息到"
 
-#: src/compose.c:7310 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7327 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2138,23 +2140,23 @@ msgstr "儲存訊息到"
 msgid "_Browse"
 msgstr "瀏覽"
 
-#: src/compose.c:7783
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "標頭"
 
-#: src/compose.c:7788
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "附件檔"
 
-#: src/compose.c:7802
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "其它"
 
-#: src/compose.c:7817
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "主旨"
 
-#: src/compose.c:8041
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2163,87 +2165,87 @@ msgstr ""
 "拼字檢查無法正確啟用\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "寄件者:"
 
-#: src/compose.c:8197
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "此郵件使用的帳號"
 
-#: src/compose.c:8199
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "使用的寄件者地址"
 
-#: src/compose.c:8365
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr "無法載入隱私系統'%s',此訊息將無法被簽證或加密"
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "空白(_N)"
 
-#: src/compose.c:8567 src/prefs_template.c:760
+#: src/compose.c:8584 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "此樣板內容的第%d行發現錯誤"
 
-#: src/compose.c:8683
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "樣板中寄件者欄位格式錯誤"
 
-#: src/compose.c:8701
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "樣板中收件者欄位格式錯誤"
 
-#: src/compose.c:8719
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "樣板中副本收件者欄位格式錯誤"
 
-#: src/compose.c:8737
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "樣板中密件副本收件者欄位格式錯誤"
 
-#: src/compose.c:8755
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "樣板中回覆收件者欄位格式錯誤"
 
-#: src/compose.c:8774
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "樣板中主旨欄位格式錯誤"
 
-#: src/compose.c:9043
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "無效的MINE型式"
 
-#: src/compose.c:9058
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或空白"
 
-#: src/compose.c:9132
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "屬性"
 
-#: src/compose.c:9149
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "MIME型式"
 
-#: src/compose.c:9190
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "編碼中"
 
-#: src/compose.c:9210
+#: src/compose.c:9227
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:9211
+#: src/compose.c:9228
 msgid "File name"
 msgstr "檔案名稱"
 
-#: src/compose.c:9462
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2254,15 +2256,15 @@ msgstr ""
 "強制終止此行程嗎?\n"
 "行程id: %d"
 
-#: src/compose.c:9951 src/messageview.c:1096
+#: src/compose.c:9968 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail 需要網路的存取權才能傳送此郵件"
 
-#: src/compose.c:9977
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "此訊息無法稍後再送出"
 
-#: src/compose.c:9979
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2273,15 +2275,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10157
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10161
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10162
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2289,24 +2291,24 @@ msgstr ""
 "無法儲存為草稿\n"
 "確定要終止離開或放棄此郵件?"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "終止離開"
 
-#: src/compose.c:10164
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "放棄郵件"
 
-#: src/compose.c:10324 src/compose.c:10338
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:10352
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "無法讀取檔案'%s'"
 
-#: src/compose.c:10354
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2315,69 +2317,69 @@ msgstr ""
 "目前的編碼檔案'%s'包含無效的字元\n"
 "插入可能是無效的"
 
-#: src/compose.c:10441
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "放棄訊息"
 
-#: src/compose.c:10442
+#: src/compose.c:10459
 msgid "This message has been modified. Discard it?"
 msgstr "此訊息已經被修改過了,要放棄嗎?"
 
-#: src/compose.c:10443 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "放棄"
 
-#: src/compose.c:10443 src/compose.c:10447
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "儲存至草稿(_S)"
 
-#: src/compose.c:10445 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "儲存異動"
 
-#: src/compose.c:10446
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr "此訊息已經被修改過了,要儲存最後的修改嗎?"
 
-#: src/compose.c:10447
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "不要儲存"
 
-#: src/compose.c:10518
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "確定要使用樣板 '%s'嗎?"
 
-#: src/compose.c:10520
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "使用樣板"
 
-#: src/compose.c:10521 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10538 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "覆蓋(_R)"
 
-#: src/compose.c:11379
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "確定插入或附加檔案?"
 
-#: src/compose.c:11380
+#: src/compose.c:11397
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr "確定要插入檔案至訊息內容中?還是要將檔案附加至郵件中?"
 
-#: src/compose.c:11382
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "附加檔案(_A)"
 
-#: src/compose.c:11599
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "第%d格式有誤"
 
-#: src/compose.c:11894
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2592,8 +2594,8 @@ msgid " Check File "
 msgstr "檢查檔案"
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1961
-#: src/wizard.c:1191 src/wizard.c:1611
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "檔案"
 
@@ -2739,7 +2741,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3345
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
@@ -2902,7 +2904,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "搜尋結果中可以接收的最大登入數量"
 
-#: src/editldap.c:778 src/prefs_account.c:3236
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "基本"
 
@@ -3034,15 +3036,15 @@ msgid "Stylesheet"
 msgstr "樣式"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
 #: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
 msgid "None"
 msgstr "無"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
+#: src/prefs_other.c:407
 msgid "Default"
 msgstr "預設"
 
@@ -3530,27 +3532,27 @@ msgstr "回收桶"
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/folder.c:2012
+#: src/folder.c:2011
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "處理中 (%s)...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "正在複製 %s 到 %s...\n"
 
-#: src/folder.c:3257
+#: src/folder.c:3256
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "正在移動 %s 到 %s...\n"
 
-#: src/folder.c:3565
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "正在為 %s 更新緩衝中..."
 
-#: src/folder.c:4428
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "郵件處理中..."
 
@@ -3572,11 +3574,11 @@ msgstr "選擇資料夾"
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215
+#: src/imap_gtk.c:271 src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263
+#: src/news_gtk.c:314 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:424 src/plugins/rssyl/rssyl_cb_menu.c:206
+#: src/plugins/vcalendar/vcal_folder.c:2043
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' 不能被包含在資料夾名稱內"
@@ -3584,7 +3586,7 @@ msgstr "'%c' 不能被包含在資料夾名稱內"
 #: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "資料夾 '%s' 已經存在"
@@ -3608,7 +3610,7 @@ msgstr "遞迴地標示所有為已讀(_v)"
 msgid "R_un processing rules"
 msgstr "立即執行規則(u)"
 
-#: src/folderview.c:240 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "搜尋資料夾(_S)..."
 
@@ -3664,12 +3666,12 @@ msgstr "確定要將此資料內所有的郵件標示為已讀嗎?"
 msgid "Mark all as read"
 msgstr "將所有的郵件標示為已讀"
 
-#: src/folderview.c:1015 src/imap.c:4638 src/mainwindow.c:5193 src/setup.c:91
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "掃描資料夾 %s%c%s..."
 
-#: src/folderview.c:1019 src/imap.c:4643 src/mainwindow.c:5198 src/setup.c:96
+#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "掃描資料夾 %s..."
@@ -3714,7 +3716,7 @@ msgstr "開啟 %s..."
 msgid "Folder could not be opened."
 msgstr "資料夾無法開啟"
 
-#: src/folderview.c:2379 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "清空回收桶"
 
@@ -3928,7 +3930,6 @@ msgstr ""
 "系統資訊\n"
 
 #: src/gtk/about.c:168
-#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
@@ -3937,7 +3938,6 @@ msgstr ""
 "作業系統: %s %s (%s)"
 
 #: src/gtk/about.c:177
-#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
@@ -3946,7 +3946,6 @@ msgstr ""
 "作業系統: %s"
 
 #: src/gtk/about.c:186
-#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
@@ -3954,7 +3953,7 @@ msgstr ""
 "地區: %s (charset: %s)\n"
 "作業系統: 不明"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr "Claws Mail 團隊"
 
@@ -4065,8 +4064,8 @@ msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
 msgstr ""
-"你將會伴隨此程式收到一份 GNU General Public License 的複本,如果沒有收到,請"
-"參閱"
+"你將會伴隨此程式收到一份 GNU General Public License 的複本,如果沒有收到,"
+"請參閱"
 
 #: src/gtk/about.c:698 src/main.c:2541
 msgid "Session statistics\n"
@@ -4247,7 +4246,6 @@ msgid "Replace unknown word"
 msgstr "取代未知的單字"
 
 #: src/gtk/gtkaspell.c:1460
-#, c-format
 msgid "Replace \"%s\" with: "
 msgstr "以...取代\"%s\""
 
@@ -4832,7 +4830,8 @@ msgstr "圖例"
 #: src/gtk/icon_legend.c:140
 msgid ""
 "The following icons are used to show the status of messages and folders:"
-msgstr "以下圖示用來顯示郵件和資料夾狀態:"
+msgstr ""
+"以下圖示用來顯示郵件和資料夾狀態:"
 
 #: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
@@ -4934,9 +4933,9 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 #: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:749 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "外掛程式"
 
@@ -4953,7 +4952,6 @@ msgid "Description"
 msgstr "說明"
 
 #: src/gtk/pluginwindow.c:374
-#, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr "參閱 %sClaws Mail website%s 以取得更詳細的資訊"
 
@@ -4973,14 +4971,14 @@ msgstr "已載入的外掛程式"
 msgid "Page Index"
 msgstr "頁索引"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3235 src/prefs_account.c:3253 src/prefs_account.c:3271
-#: src/prefs_account.c:3289 src/prefs_account.c:3307 src/prefs_account.c:3325
-#: src/prefs_account.c:3344 src/prefs_account.c:3436
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5417,234 +5415,191 @@ msgstr "檔案大小:"
 msgid "Load Image"
 msgstr "載入圖片"
 
-#: src/imap.c:583
+#: src/imap.c:582
 msgid "IMAP4 connection broken\n"
 msgstr "IMAP4 連線中斷\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
-#, c-format
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
 msgid "IMAP error on %s:"
 msgstr "IMAP 發生%s錯誤:"
 
-#: src/imap.c:622
-#, fuzzy
-msgid "authenticated"
+#: src/imap.c:621
+msgid " authenticated\n"
 msgstr " 已認證\n"
 
-#: src/imap.c:625
-#, fuzzy
-msgid "not authenticated"
+#: src/imap.c:624
+msgid " not authenticated\n"
 msgstr "沒有認證\n"
 
-#: src/imap.c:628
-#, fuzzy
-msgid "bad state"
+#: src/imap.c:627
+msgid " bad state\n"
 msgstr " 錯誤狀態\n"
 
-#: src/imap.c:631
-#, fuzzy
-msgid "stream error"
+#: src/imap.c:630
+msgid " stream error\n"
 msgstr " stream 錯誤\n"
 
-#: src/imap.c:634
-#, fuzzy
-msgid "parse error (very probably non-RFC compliance from the server)"
+#: src/imap.c:633
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr " 解析錯誤(很可能是因為不符合伺服器的RFC規範)\n"
 
-#: src/imap.c:638
-#, fuzzy
-msgid "connection refused"
+#: src/imap.c:637
+msgid " connection refused\n"
 msgstr "連線被拒絕\n"
 
-#: src/imap.c:641
-#, fuzzy
-msgid "memory error"
+#: src/imap.c:640
+msgid " memory error\n"
 msgstr "記憶體錯誤\n"
 
-#: src/imap.c:644
-#, fuzzy
-msgid "fatal error"
+#: src/imap.c:643
+msgid " fatal error\n"
 msgstr " 內部錯誤\n"
 
-#: src/imap.c:647
-#, fuzzy
-msgid "protocol error (very probably non-RFC compliance from the server)"
+#: src/imap.c:646
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr " 協定錯誤(很可能是因為不符合伺服器的RFC規範)\n"
 
-#: src/imap.c:651
-#, fuzzy
-msgid "connection not accepted"
+#: src/imap.c:650
+msgid " connection not accepted\n"
 msgstr " 連線沒有被接受\n"
 
-#: src/imap.c:654
-#, fuzzy
-msgid "APPEND error"
+#: src/imap.c:653
+msgid " APPEND error\n"
 msgstr " APPEND 錯誤\n"
 
-#: src/imap.c:657
-#, fuzzy
-msgid "NOOP error"
+#: src/imap.c:656
+msgid " NOOP error\n"
 msgstr " NOOP 錯誤\n"
 
-#: src/imap.c:660
-#, fuzzy
-msgid "LOGOUT error"
+#: src/imap.c:659
+msgid " LOGOUT error\n"
 msgstr " 登出錯誤\n"
 
-#: src/imap.c:663
-#, fuzzy
-msgid "CAPABILITY error"
+#: src/imap.c:662
+msgid " CAPABILITY error\n"
 msgstr " 容量錯誤\n"
 
-#: src/imap.c:666
-#, fuzzy
-msgid "CHECK error"
+#: src/imap.c:665
+msgid " CHECK error\n"
 msgstr " 檢查錯誤\n"
 
-#: src/imap.c:669
-#, fuzzy
-msgid "CLOSE error"
+#: src/imap.c:668
+msgid " CLOSE error\n"
 msgstr " 關閉錯誤\n"
 
-#: src/imap.c:672
-#, fuzzy
-msgid "EXPUNGE error"
+#: src/imap.c:671
+msgid " EXPUNGE error\n"
 msgstr " 刪除錯誤\n"
 
-#: src/imap.c:675
-#, fuzzy
-msgid "COPY error"
+#: src/imap.c:674
+msgid " COPY error\n"
 msgstr " 複製錯誤\n"
 
-#: src/imap.c:678
-#, fuzzy
-msgid "UID COPY error"
+#: src/imap.c:677
+msgid " UID COPY error\n"
 msgstr " UID 複制錯誤\n"
 
-#: src/imap.c:681
-#, fuzzy
-msgid "CREATE error"
+#: src/imap.c:680
+msgid " CREATE error\n"
 msgstr " 建立錯誤\n"
 
-#: src/imap.c:684
-#, fuzzy
-msgid "DELETE error"
+#: src/imap.c:683
+msgid " DELETE error\n"
 msgstr " 刪除錯誤\n"
 
-#: src/imap.c:687
-#, fuzzy
-msgid "EXAMINE error"
+#: src/imap.c:686
+msgid " EXAMINE error\n"
 msgstr " 檢驗錯誤\n"
 
-#: src/imap.c:690
-#, fuzzy
-msgid "FETCH error"
+#: src/imap.c:689
+msgid " FETCH error\n"
 msgstr " 擷取錯誤\n"
 
-#: src/imap.c:693
-#, fuzzy
-msgid "UID FETCH error"
+#: src/imap.c:692
+msgid " UID FETCH error\n"
 msgstr " UID取得錯誤\n"
 
-#: src/imap.c:696
-#, fuzzy
-msgid "LIST error"
+#: src/imap.c:695
+msgid " LIST error\n"
 msgstr " LIST 錯誤\n"
 
-#: src/imap.c:699
-#, fuzzy
-msgid "LOGIN error"
+#: src/imap.c:698
+msgid " LOGIN error\n"
 msgstr " 登入錯誤\n"
 
-#: src/imap.c:702
-#, fuzzy
-msgid "LSUB error"
+#: src/imap.c:701
+msgid " LSUB error\n"
 msgstr " LSUB 錯誤\n"
 
-#: src/imap.c:705
-#, fuzzy
-msgid "RENAME error"
+#: src/imap.c:704
+msgid " RENAME error\n"
 msgstr " 重新命名錯誤\n"
 
-#: src/imap.c:708
-#, fuzzy
-msgid "SEARCH error"
+#: src/imap.c:707
+msgid " SEARCH error\n"
 msgstr " 搜尋錯誤\n"
 
-#: src/imap.c:711
-#, fuzzy
-msgid "UID SEARCH error"
+#: src/imap.c:710
+msgid " UID SEARCH error\n"
 msgstr " UID搜尋錯誤\n"
 
-#: src/imap.c:714
-#, fuzzy
-msgid "SELECT error"
+#: src/imap.c:713
+msgid " SELECT error\n"
 msgstr " 選擇錯誤\n"
 
-#: src/imap.c:717
-#, fuzzy
-msgid "STATUS error"
+#: src/imap.c:716
+msgid " STATUS error\n"
 msgstr " 狀態錯誤\n"
 
-#: src/imap.c:720
-#, fuzzy
-msgid "STORE error"
+#: src/imap.c:719
+msgid " STORE error\n"
 msgstr " 儲存錯誤\n"
 
-#: src/imap.c:723
-#, fuzzy
-msgid "UID STORE error"
+#: src/imap.c:722
+msgid " UID STORE error\n"
 msgstr " UID儲存錯誤\n"
 
-#: src/imap.c:726
-#, fuzzy
-msgid "SUBSCRIBE error"
+#: src/imap.c:725
+msgid " SUBSCRIBE error\n"
 msgstr " 訂閱錯誤\n"
 
-#: src/imap.c:729
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+#: src/imap.c:728
+msgid " UNSUBSCRIBE error\n"
 msgstr " 取消定閱錯誤\n"
 
-#: src/imap.c:732
-#, fuzzy
-msgid "STARTTLS error"
+#: src/imap.c:731
+msgid " STARTTLS error\n"
 msgstr " STARTLS錯誤\n"
 
-#: src/imap.c:735
-#, fuzzy
-msgid "INVAL error"
+#: src/imap.c:734
+msgid " INVAL error\n"
 msgstr " INVAL錯誤\n"
 
-#: src/imap.c:738
-#, fuzzy
-msgid "EXTENSION error"
+#: src/imap.c:737
+msgid " EXTENSION error\n"
 msgstr " 擴展錯誤\n"
 
-#: src/imap.c:741
-#, fuzzy
-msgid "SASL error"
+#: src/imap.c:740
+msgid " SASL error\n"
 msgstr " SASL 錯誤\n"
 
-#: src/imap.c:745
-#, fuzzy
-msgid "SSL error"
+#: src/imap.c:744
+msgid " SSL error\n"
 msgstr " SSL 錯誤\n"
 
-#: src/imap.c:749
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#: src/imap.c:748
+msgid " Unknown error [%d]\n"
 msgstr "未知的錯誤 [%d]\n"
 
-#: src/imap.c:953
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5656,7 +5611,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了CRAM-MD5 SASL外掛程式,CRAM-MD5登入才能"
 "正常運作"
 
-#: src/imap.c:959
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5668,7 +5623,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了DIGEST-MD5 SASL外掛程式,DIGEST-MD5登入"
 "才能正常運作"
 
-#: src/imap.c:965
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5680,49 +5635,36 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了SCRAM SASL外掛程式,SCRAM-SHA-1登入才能"
 "正常運作"
 
-#: src/imap.c:971
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and "
-"the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"只有在libetpan被編譯成支援SASL且安裝了CRAM-MD5 SASL外掛程式,CRAM-MD5登入才能"
-"正常運作"
-
-#: src/imap.c:978
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "連線到 %s 失敗:登入被拒絕 %s"
 
-#: src/imap.c:982
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "連線到 %s 失敗:登入被拒絕 %s\n"
 
-#: src/imap.c:1000
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "連線到 %s 失敗"
 
-#: src/imap.c:1007 src/imap.c:1010
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 連線到 %s 已經被中斷,重新連線中...\n"
 
-#: src/imap.c:1040 src/imap.c:3685 src/imap.c:4344 src/imap.c:4441
-#: src/imap.c:4619 src/imap.c:5431
+#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5398
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail 需要有網路的存取能力,才能夠存取 IMAP 伺服器"
 
-#: src/imap.c:1149 src/inc.c:818 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
 msgid "Insecure connection"
 msgstr "不安全的連線"
 
-#: src/imap.c:1150 src/inc.c:819 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5735,104 +5677,104 @@ msgstr ""
 "\n"
 "確認要繼續連線到這個伺服器嗎?此通訊將不安全"
 
-#: src/imap.c:1156 src/inc.c:825 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
 msgid "Con_tinue connecting"
 msgstr "繼續保持連線"
 
-#: src/imap.c:1166
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "帳號 '%s':連線到 IMAP4 伺服器:  %s:%d..."
 
-#: src/imap.c:1214
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d"
 
-#: src/imap.c:1217
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d\n"
 
-#: src/imap.c:1250 src/imap.c:4106
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "無法啟始 TLS 通信\n"
 
-#: src/imap.c:1318
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "無法登入到 IMAP 伺服器 %s \n"
 
-#: src/imap.c:1321
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "無法登入到 IMAP 伺服器 %s"
 
-#: src/imap.c:1748
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "加入郵件..."
 
-#: src/imap.c:1953 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "複製郵件..."
 
-#: src/imap.c:2546
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "無法設定已刪除旗標\n"
 
-#: src/imap.c:2553 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "無法刪掉\n"
 
-#: src/imap.c:2904
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "在沒有訂閱的資料夾 %s 內尋找..."
 
-#: src/imap.c:2907
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "在%s尋找子資料夾..."
 
-#: src/imap.c:3225
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法建立郵件箱:LIST錯誤\n"
 
-#: src/imap.c:3240
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "無法建立郵件箱\n"
 
-#: src/imap.c:3371
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "無法將郵件箱口稱從 %s 變更為 %s\n"
 
-#: src/imap.c:3484
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "無法刪除郵件箱\n"
 
-#: src/imap.c:3763
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST 失敗\n"
 
-#: src/imap.c:3848
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "標示郵件中..."
 
-#: src/imap.c:3951
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾: %s\n"
 
-#: src/imap.c:4103
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "伺服器需要以 TLS 進行登入\n"
 
-#: src/imap.c:4113
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "不能刷新功能\n"
 
-#: src/imap.c:4118
+#: src/imap.c:4085
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5841,20 +5783,20 @@ msgstr ""
 "連線到 %s 失敗:伺服器需要 TLS,但是目前的 Claws Mail 被編譯成不支援 TLS 的版"
 "本\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "伺服器登入被關閉\n"
 
-#: src/imap.c:4349
+#: src/imap.c:4316
 msgid "Fetching message..."
 msgstr "取得郵件中..."
 
-#: src/imap.c:5054
+#: src/imap.c:5021
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "無法設定被刪除的旗標: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6056
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5905,7 +5847,7 @@ msgstr "訂閱內容"
 msgid "_Subscribe..."
 msgstr "訂閱(_S)..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr "取消訂閱(_U)..."
 
@@ -5942,20 +5884,20 @@ msgstr "從上層資料夾繼承屬性"
 
 #: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
 #: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "為 %s 輸入新名稱"
 
 #: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
 #: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2036
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
 #: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
 #: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -5977,7 +5919,7 @@ msgstr ""
 
 #: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
 #: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "不能移除資料夾 '%s'"
@@ -6004,7 +5946,7 @@ msgstr "搜尋(_S)"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "選擇 %s 的一個子資料夾以訂閱:"
 
-#: src/imap_gtk.c:536 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "訂閱"
 
@@ -6037,8 +5979,8 @@ msgstr "訂閱"
 msgid "unsubscribe"
 msgstr "取消訂閱"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428
+#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "套用至子資料夾"
 
@@ -6227,56 +6169,56 @@ msgstr "選擇 Pine 檔案"
 msgid "Import Pine file into Address Book"
 msgstr "匯入 Pine 檔至通訊錄"
 
-#: src/inc.c:187 src/inc.c:296 src/inc.c:323
+#: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail 需要網路才能取得郵件"
 
-#: src/inc.c:345
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s 失敗\n"
 
-#: src/inc.c:418
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "取回新郵件"
 
-#: src/inc.c:479
+#: src/inc.c:478
 msgid "Standby"
 msgstr "待命"
 
-#: src/inc.c:622 src/inc.c:676
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "已取消"
 
-#: src/inc.c:633
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "正在取回"
 
-#: src/inc.c:642
+#: src/inc.c:641
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "完成 (%d 郵件 (%s) 已取回)"
 msgstr[1] "完成 (%d 郵件 (%s) 已取回"
 
-#: src/inc.c:648
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "已完成 (沒有新郵件)"
 
-#: src/inc.c:653
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: src/inc.c:656 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:663 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
 #: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:673 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "超時"
 
@@ -6312,7 +6254,7 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線至 POP3 伺服器: %s:%d\n"
 
 #: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:498
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "認證中..."
 
@@ -6337,7 +6279,7 @@ msgstr "正在取得新郵件 (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在取得郵件大小 (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:516
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "離開中"
 
@@ -6388,7 +6330,7 @@ msgstr "通訊錯誤"
 msgid "Socket error on connection to %s:%d."
 msgstr "連線至 %s:%d 時通訊錯誤"
 
-#: src/inc.c:1193 src/send_message.c:427 src/send_message.c:690
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "遠端伺服器關閉連線"
 
@@ -6410,11 +6352,11 @@ msgstr ""
 "郵件箱已鎖定:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:675
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1217 src/send_message.c:678
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6423,7 +6365,7 @@ msgstr ""
 "認證失敗:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:694
+#: src/inc.c:1222 src/send_message.c:693
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6764,814 +6706,809 @@ msgstr "NetworkManager(網路管理員):網路是上線的\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager(網路管理員):網路是離線的\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:507 src/messageview.c:209
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:512
 msgid "_Configuration"
 msgstr "設定(_C)"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:516
 msgid "_Add mailbox"
 msgstr "新增郵件夾(_A)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:517
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:520
 msgid "Change mailbox order..."
 msgstr "改變郵件夾順序"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:523
 msgid "_Import mbox file..."
 msgstr "匯入mbox檔案"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:524
 msgid "_Export to mbox file..."
 msgstr "匯出mbox檔案"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:525
 msgid "_Export selected to mbox file..."
 msgstr "匯出選擇的項目至mbox檔案"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:527
 msgid "Empty all _Trash folders"
 msgstr "清空所有的垃圾桶"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:530 src/messageview.c:218
 msgid "_Save email as..."
 msgstr "另存電子郵件..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:531 src/messageview.c:219
 msgid "_Save part as..."
 msgstr "另存部份郵件"
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:534 src/messageview.c:220
 msgid "Page setup..."
 msgstr "頁面設定..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:535 src/messageview.c:221
 msgid "_Print..."
 msgstr "列印..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:537
 msgid "Synchronise folders"
 msgstr "同步資料夾"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:539
 msgid "E_xit"
 msgstr "離開"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:544
 msgid "Select _thread"
 msgstr "選擇串列"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:546
 msgid "_Find in current message..."
 msgstr "在目前訊息中尋找(_F)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:548
 msgid "_Quick search"
 msgstr "快速搜尋(_Q)"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:551
 msgid "Show or hi_de"
 msgstr "顯示或隱藏(_d)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:552
 msgid "_Toolbar"
 msgstr "工具列(_T)"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:554
 msgid "Set displayed _columns"
 msgstr "設定顯示行數(_c)"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:555
 msgid "In _folder list..."
 msgstr "在資料夾清單內(_f)"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:556
 msgid "In _message list..."
 msgstr "在郵件清單內(_m)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:561
 msgid "La_yout"
 msgstr "佈局(_y)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:564
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:566
 msgid "_Attract by subject"
 msgstr "藉由主旨(_A)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:568
 msgid "E_xpand all threads"
 msgstr "展開所有串列(_x)"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:569
 msgid "Co_llapse all threads"
 msgstr "關閉所有串列(_l)"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:571 src/messageview.c:232
 msgid "_Go to"
 msgstr "前往(_G)"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:572 src/messageview.c:233
 msgid "_Previous message"
 msgstr "上一封郵件(_P)"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:573 src/messageview.c:234
 msgid "_Next message"
 msgstr "下一封郵件(_N)"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:575 src/messageview.c:236
 msgid "P_revious unread message"
 msgstr "上一封未讀郵件(_r)"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:576 src/messageview.c:237
 msgid "N_ext unread message"
 msgstr "下一封未讀郵件(_e)"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:578 src/messageview.c:239
 msgid "Previous ne_w message"
 msgstr "上一封新郵件(_w)"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:579 src/messageview.c:240
 msgid "Ne_xt new message"
 msgstr "下一封新郵件(_x)"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:581 src/messageview.c:242
 msgid "Previous _marked message"
 msgstr "上一封已標記郵件(_m)"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:582 src/messageview.c:243
 msgid "Next m_arked message"
 msgstr "下一封已標記郵件(_a)"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:584 src/messageview.c:245
 msgid "Previous _labeled message"
 msgstr "上一封已標記郵件(_l)"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:585 src/messageview.c:246
 msgid "Next la_beled message"
 msgstr "下一封已標記郵件(_b)"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:587 src/messageview.c:248
 msgid "Previous opened message"
 msgstr "上一封已開啟郵件"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:588 src/messageview.c:249
 msgid "Next opened message"
 msgstr "下一封已開啟郵件"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:590 src/messageview.c:251
 msgid "Parent message"
 msgstr "父郵件"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:592 src/messageview.c:253
 msgid "Next unread _folder"
 msgstr "下一個未讀資料夾(_f)"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:593 src/messageview.c:254
 msgid "_Other folder..."
 msgstr "其它資料夾(_O)"
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
 msgid "Next part"
 msgstr "下一個部份"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
 msgid "Previous part"
 msgstr "上一個部份"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:599 src/messageview.c:258
 msgid "Message scroll"
 msgstr "郵件捲動"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:600 src/messageview.c:259
 msgid "Previous line"
 msgstr "上一行"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:601 src/messageview.c:260
 msgid "Next line"
 msgstr "下一行"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
 msgstr "上一頁"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
 msgstr "下一頁"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:621 src/messageview.c:280
 msgid "Decode"
 msgstr "解碼"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:628
 msgid "Open in new _window"
 msgstr "在新視窗開啟(_w)"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:629 src/messageview.c:287
 msgid "Mess_age source"
 msgstr "信件來源(_a)"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:631 src/messageview.c:288
 msgid "Message part"
 msgstr "部份信件"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:632 src/messageview.c:289
 msgid "View as text"
 msgstr "以文字模式檢視"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "開啟"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:635 src/messageview.c:292
 msgid "Open with..."
 msgstr "以...開啟"
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:639 src/messageview.c:295
 msgid "Quotes"
 msgstr "引言"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:641
 msgid "_Update summary"
 msgstr "更新結果(_U)"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:644
 msgid "Recei_ve"
 msgstr "接收(_V)"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:645
 msgid "Get from _current account"
 msgstr "從目前的帳號取得(_c)"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:646
 msgid "Get from _all accounts"
 msgstr "從所有的帳號取得(_a)"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:647
 msgid "Cancel receivin_g"
 msgstr "終止接收(_g)"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:650
 msgid "_Send queued messages"
 msgstr "傳送暫存郵件(_S)"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:655
 msgid "Compose a_n email message"
 msgstr "新增郵件(_n)"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:656
 msgid "Compose a news message"
 msgstr "新增郵件"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:658 src/messageview.c:301
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "回覆給(_y)"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:662 src/messageview.c:305
 msgid "Mailing _list"
 msgstr "郵件清單(_l)"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:663
 msgid "Follow-up and reply to"
 msgstr "轉送及回覆"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "轉送(_F)"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "以夾檔方式轉送(_w)"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "重新導向(_t)"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:670
 msgid "Mailing-_List"
 msgstr "郵件清單(_L)"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:671
 msgid "Post"
 msgstr "傳送"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:673
 msgid "Help"
 msgstr "協助"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:677
 msgid "Unsubscribe"
 msgstr "退訂"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:679
 msgid "View archive"
 msgstr "檢視封存"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:681
 msgid "Contact owner"
 msgstr "連絡人擁有者"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:685
 msgid "M_ove..."
 msgstr "移動(_o)..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:686
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:687
 msgid "Move to _trash"
 msgstr "移至垃圾桶(_t)"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:688
 msgid "_Delete..."
 msgstr "刪除(_D)"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:689
 msgid "Move thread to tr_ash"
 msgstr "移至垃圾桶(_a)"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:690
 msgid "Delete t_hread"
 msgstr "刪除串列(_h)"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:691
 msgid "Cancel a news message"
 msgstr "取消新郵件"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
 msgid "_Mark"
 msgstr "標記(_M)"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:696
 msgid "_Unmark"
 msgstr "移除標記(_U)"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:699
 msgid "Mark as unr_ead"
 msgstr "標記為未讀(_e)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:700
 msgid "Mark as rea_d"
 msgstr "標記為已讀(_d)"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:702
 msgid "Mark all read"
 msgstr "標記所有為已讀"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "忽略串列"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:705
 msgid "Unignore thread"
 msgstr "不忽略串列"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "以串列檢視"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:707
 msgid "Unwatch thread"
 msgstr "不以串列檢視"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:710
 msgid "Mark as _spam"
 msgstr "標記為垃圾郵件(_s)"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:711
 msgid "Mark as _ham"
 msgstr "標記為非垃圾郵件(_h)"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "上鎖"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "解鎖"
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:717 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "顏色標記(_b)"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:718 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "標籤(_g)"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:721
 msgid "Re-_edit"
 msgstr "重新編輯(_e)"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "檢查簽名"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:729 src/messageview.c:315
 msgid "Add sender to address boo_k"
 msgstr "新增寄件者至通訊錄(_k)"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:731
 msgid "C_ollect addresses"
 msgstr "郵件地址分類(_o)"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:732
 msgid "From current _folder..."
 msgstr "從目前的資料夾(_f)..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:733
 msgid "From selected _messages..."
 msgstr "從選擇的郵件(_m)..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:736
 msgid "_Filter all messages in folder"
 msgstr "過濾資料夾中所有的郵件(_F)"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:737
 msgid "Filter _selected messages"
 msgstr "過濾所有選擇的郵件(_s)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:738
 msgid "Run folder pr_ocessing rules"
 msgstr "執行資料夾規則(_o)"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:740 src/messageview.c:318
 msgid "_Create filter rule"
 msgstr "建立過濾器規則(_C)"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
+#: src/messageview.c:325
 msgid "_Automatically"
 msgstr "自動地(_A)"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
 msgstr "根據寄件者(_F)"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
+#: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
 msgstr "根據收件者(_T)"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
+#: src/messageview.c:328
 msgid "By _Subject"
 msgstr "根據主旨(_S)"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "建立執行規則"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:753 src/messageview.c:332
 msgid "List _URLs..."
 msgstr "列出URLs(_U)..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:760
 msgid "Ch_eck for new messages in all folders"
 msgstr "檢查所有資料夾內的新郵件(_e)"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:761
 msgid "Delete du_plicated messages"
 msgstr "刪除重覆的郵件(_p)"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:762
 msgid "In selected folder"
 msgstr "在選擇的資料夾內"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:763
 msgid "In all folders"
 msgstr "在所有的資料夾內"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:766
 msgid "E_xecute"
 msgstr "執行(_x)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:767
 msgid "Exp_unge"
 msgstr "刪除(_u)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:770
 msgid "SSL cer_tificates"
 msgstr "SSL 認證(_t)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:774
 msgid "Filtering Lo_g"
 msgstr "過濾日誌(_g)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:776
 msgid "Network _Log"
 msgstr "網路日誌(_L)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:778
 msgid "_Forget all session passwords"
 msgstr "消除所有(_F)"
 
-#: src/mainwindow.c:784
-#, fuzzy
-msgid "Forget _master password"
-msgstr "消除所有(_F)"
-
-#: src/mainwindow.c:788
+#: src/mainwindow.c:781
 msgid "C_hange current account"
 msgstr "更改目前帳號(_h)"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:783
 msgid "_Preferences for current account..."
 msgstr "目前帳號設定(_P)..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:784
 msgid "Create _new account..."
 msgstr "新增帳號(_n)"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:785
 msgid "_Edit accounts..."
 msgstr "編輯帳號(_E)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:788
 msgid "P_references..."
 msgstr "選項(_r)..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:789
 msgid "Pre-pr_ocessing..."
 msgstr "前處理(_o)..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:790
 msgid "Post-pro_cessing..."
 msgstr "後處理(_c)..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:791
 msgid "_Filtering..."
 msgstr "過濾器(_F)..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:792
 msgid "_Templates..."
 msgstr "樣板(_T)..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:793
 msgid "_Actions..."
 msgstr "動作(_A)..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:794
 msgid "Tag_s..."
 msgstr "標籤(_s)..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:796
 msgid "Plu_gins..."
 msgstr "外掛(_g)..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:799
 msgid "_Manual"
 msgstr "手冊(_M)"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:800
 msgid "_Online User-contributed FAQ"
 msgstr "線上協助 FAQ(_O)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:801
 msgid "Icon _Legend"
 msgstr "圖示說明(_L)"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:803
 msgid "Set as default client"
 msgstr "設置為預設客戶端"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:810
 msgid "Offline _mode"
 msgstr "離線模式(_m)"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:811
 msgid "Men_ubar"
 msgstr "選單列(_u)"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:812
 msgid "_Message view"
 msgstr "郵件檢視(_M)"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:814
 msgid "Status _bar"
 msgstr "狀態列(_b)"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:816
 msgid "Column headers"
 msgstr "標頭列"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:817
 msgid "Th_read view"
 msgstr "串列檢視(_r)"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:818
 msgid "Hide read threads"
 msgstr "隱藏讀取串列"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:819
 msgid "_Hide read messages"
 msgstr "隱藏讀取郵件(_H)"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:820
 msgid "Hide deleted messages"
 msgstr "隱藏刪除郵件"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:821
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:822 src/messageview.c:344
 msgid "Show all _headers"
 msgstr "顯示所有標頭(_h)"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:823 src/messageview.c:345
 msgid "_Collapse all"
 msgstr "全部折疊(_C)"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:824 src/messageview.c:346
 msgid "Collapse from level _2"
 msgstr "從第二層開始折疊(_2)"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:825 src/messageview.c:347
 msgid "Collapse from level _3"
 msgstr "從第三層開始折疊(_3)"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:829
 msgid "Text _below icons"
 msgstr "圖示下方顯示字串(_b)"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:830
 msgid "Text be_side icons"
 msgstr "圖示旁顯示字串(_s)"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:831
 msgid "_Icons only"
 msgstr "只顯示圖示(_I)"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:832
 msgid "_Text only"
 msgstr "只顯示字串(_T)"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:839
 msgid "_Standard"
 msgstr "標準(_S)"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:840
 msgid "_Three columns"
 msgstr "三欄(_T)"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:841
 msgid "_Wide message"
 msgstr "寬郵件(_W)"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:842
 msgid "W_ide message list"
 msgstr "寬郵件清單(_i)"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:843
 msgid "S_mall screen"
 msgstr "小螢幕(_m)"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:847
 msgid "By _number"
 msgstr "根據數值(_n)"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:848
 msgid "By s_ize"
 msgstr "根據大小(_i)"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:849
 msgid "By _date"
 msgstr "根據日期(_d)"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:850
 msgid "By thread date"
 msgstr "根據串列日期"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:853
 msgid "By s_ubject"
 msgstr "根據主旨(_u)"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:854
 msgid "By _color label"
 msgstr "根據標籤顏色(_c)"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:855
 msgid "By tag"
 msgstr "根據標籤"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:856
 msgid "By _mark"
 msgstr "根據標記(_m)"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:857
 msgid "By _status"
 msgstr "根據狀態(_s)"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:858
 msgid "By a_ttachment"
 msgstr "根據附加檔案(_t)"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:859
 msgid "By score"
 msgstr "根據分數"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:860
 msgid "By locked"
 msgstr "根據鎖定"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:861
 msgid "D_on't sort"
 msgstr "不排序(_o)"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:865 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "升冪"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:866 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "降冪"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:908 src/messageview.c:389
 msgid "_Auto detect"
 msgstr "自動偵測(_A)"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6268
+#: src/mainwindow.c:1305 src/summaryview.c:6268
 msgid "Apply tags..."
 msgstr "指定標籤"
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1949
 msgid "Some error(s) happened. Click here to view log."
 msgstr "發生一些錯誤,點選這裡以檢視日誌"
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1964
 msgid "You are online. Click the icon to go offline"
 msgstr "目前是上線狀態,按下圖示進入離線狀態"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1967
 msgid "You are offline. Click the icon to go online"
 msgstr "目前是離線狀態,按下圖示進入上線狀態"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1981
 msgid "Select account"
 msgstr "選擇帳號"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2008 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "網路日誌"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2012
 msgid "Filtering/Processing debug log"
 msgstr "過濾器/執行除錯日誌"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2031 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "開啟過濾器日誌\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2033 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "關閉過濾器日誌\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
 #: src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr "無標題的"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2894 src/mainwindow.c:2898
 msgid "Delete all messages in trash folders?"
 msgstr "刪除回收桶中所有的郵件"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2895
 msgid "Don't quit"
 msgstr "不要離開"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "新增郵件夾"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2925
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7580,18 +7517,18 @@ msgstr ""
 "輸入郵件夾的路徑\n"
 "如果指定的郵件夾已經存在,它將被自動的找到"
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "郵件夾 '%s' 已經存在"
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:740
 msgid "Mailbox"
 msgstr "郵件夾"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2941 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 "
@@ -7600,75 +7537,75 @@ msgstr ""
 "郵件箱建立失敗\n"
 "可能有部份檔案已經存在,或是沒有足夠的存取權限"
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3394
 msgid "No posting allowed"
 msgstr "不允許發郵件"
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3977
 msgid "Mbox import has failed."
 msgstr "Mbox 匯入失敗"
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:3986 src/mainwindow.c:3995
 msgid "Export to mbox has failed."
 msgstr "匯出至 mbox 失敗"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit Claws Mail?"
 msgstr "離開 Clasw Mail?"
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4227
 msgid "Folder synchronisation"
 msgstr "資料夾同步"
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4228
 msgid "Do you want to synchronise your folders now?"
 msgstr "同步資料夾?"
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4229
 msgid "_Synchronise"
 msgstr "同步(_S)"
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4670
 msgid "Deleting duplicated messages..."
 msgstr "正在刪除重複的郵件..."
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4707
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "已刪除 %d 重複郵件於 %d 資料夾內\n"
 msgstr[1] "已刪除 %d 重複郵件於 %d 資料夾內\n"
 
-#: src/mainwindow.c:4987 src/summaryview.c:5759
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "在資料夾的規則進行前套用"
 
-#: src/mainwindow.c:4995
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "在資料夾的規則進行後套用"
 
-#: src/mainwindow.c:5003 src/summaryview.c:5770
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "過濾配置"
 
-#: src/mainwindow.c:5118
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "無法註冊為預設的客戶端郵件程式:無法寫入取得可執行的路徑"
 
-#: src/mainwindow.c:5177
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail 已註冊為預設客戶端郵件程式"
 
-#: src/mainwindow.c:5179
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr "無法註冊為預設的客戶端郵件程式:無法寫入 registry"
 
-#: src/mainwindow.c:5337
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7748,7 +7685,7 @@ msgstr "覆寫 mbox 檔案"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "此檔案已經鄉在,要覆寫嗎?"
 
-#: src/mbox.c:555 src/messageview.c:1849 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "覆寫"
@@ -7794,19 +7731,19 @@ msgstr "已到達郵件的尾端,從最前面開始搜尋嗎?"
 msgid "Search finished"
 msgstr "搜尋完畢"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:298 src/textview.c:238
 msgid "Compose _new message"
 msgstr "寫新郵件(_n)"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1591
+#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - 郵件視窗"
 
-#: src/messageview.c:840
+#: src/messageview.c:841
 msgid "<No Return-Path found>"
 msgstr "<找不到回覆路徑>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7821,11 +7758,11 @@ msgstr ""
 "回覆路徑: %s\n"
 "建議你不要傳送回條"
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:873
 msgid "_Don't Send"
 msgstr "不傳送(_D)"
 
-#: src/messageview.c:868
+#: src/messageview.c:869
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7837,64 +7774,64 @@ msgstr ""
 "並沒有給你官方郵件地址\n"
 "建議你不要傳送回條"
 
-#: src/messageview.c:1373
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "取得郵件 (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1009
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "無法解碼: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "郵件不符合 MIME 標準,可能解讀錯誤"
 
-#: src/messageview.c:1841 src/messageview.c:1844 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4837
+#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
 #: src/summaryview.c:4840 src/textview.c:3063
 msgid "Save as"
 msgstr "另存新檔"
 
-#: src/messageview.c:1850
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "覆寫已存在的檔案嗎?"
 
-#: src/messageview.c:1858 src/summaryview.c:4857 src/summaryview.c:4860
+#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
 #: src/summaryview.c:4875
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "無法儲存檔案 '%s'"
 
-#: src/messageview.c:1911
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "顯示全部 %s"
 
-#: src/messageview.c:1913
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "只有文字中第一個 megabyte 會顯示"
 
-#: src/messageview.c:1944
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "你已收到此郵件的回條:接收者將會看到"
 
-#: src/messageview.c:1947
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "你在此郵件中要求回覆回條"
 
-#: src/messageview.c:1953
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "此郵件要求回覆回條"
 
-#: src/messageview.c:1954
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "傳送回條"
 
-#: src/messageview.c:1997
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7902,7 +7839,7 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "而且已經待伺服器被刪除"
 
-#: src/messageview.c:2003
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7911,15 +7848,15 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s"
 
-#: src/messageview.c:2007 src/messageview.c:2029
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "標示欲下載項目"
 
-#: src/messageview.c:2008 src/messageview.c:2020
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "標示欲刪除項目"
 
-#: src/messageview.c:2013
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7928,12 +7865,12 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s 將被下載"
 
-#: src/messageview.c:2018 src/messageview.c:2031
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "未標示"
 
-#: src/messageview.c:2024
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7942,11 +7879,11 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s 將被刪除"
 
-#: src/messageview.c:2097
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "回覆回條通知"
 
-#: src/messageview.c:2098
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -7956,19 +7893,19 @@ msgstr ""
 "超過一個帳號使用了此郵件的收件者地址\n"
 "請選擇一個帳號用來傳送回條通知"
 
-#: src/messageview.c:2102 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/messageview.c:2102
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "傳送通知(_S)"
 
-#: src/messageview.c:2191
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "無法列印:此郵件不包含文字"
 
-#: src/messageview.c:2953
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -7976,7 +7913,7 @@ msgstr ""
 "\n"
 "  此資料夾內沒有郵件"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -7984,7 +7921,7 @@ msgstr ""
 "\n"
 "  郵件已被刪除"
 
-#: src/messageview.c:2962
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -7992,16 +7929,16 @@ msgstr ""
 "\n"
 "  郵件已被刪除或移至其它資料夾"
 
-#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4207
+#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
 #: src/summaryview.c:7037
 msgid "An error happened while learning.\n"
 msgstr "學習過程中發生錯誤\n"
 
-#: src/mh.c:527
+#: src/mh.c:530
 msgid "Moving messages..."
 msgstr "移動郵件中..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "刪除郵件中..."
 
@@ -8099,7 +8036,8 @@ msgid "Go back to email"
 msgstr "回到電子郵件"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190
+#: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "無法儲存多重郵件的一個部份:%s"
@@ -8177,77 +8115,77 @@ msgstr "大小:"
 msgid "Description:"
 msgstr "描述:"
 
-#: src/news.c:303
+#: src/news.c:302
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "連線至 %s:%d 的 NNTP 已經斷線\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "帳號 '%s': 連線至 NNTP 伺服器:%s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:356
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "登入%s:%d時發生錯誤...\n"
 
-#: src/news.c:438
+#: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr "Libetpan 不支援回傳值480,因此將繼續執行\n"
 
-#: src/news.c:447
+#: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "雖然模式讀取器失效,但仍將繼續\n"
 
-#: src/news.c:451
+#: src/news.c:450
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "用 %s:%d 建立資料發生錯誤\n"
 
-#: src/news.c:466
+#: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "向 %s:%d 認證時發生錯誤\n"
 
-#: src/news.c:491
+#: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Claws Mail 需要網路才能存取新聞伺服器"
 
-#: src/news.c:862
+#: src/news.c:861
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "無法選擇群組: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1050 src/news.c:1220
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "無法設定群組: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1059
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "無效的文章範圍 %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1129 src/news.c:1153 src/news.c:1177
 msgid "couldn't get xhdr\n"
 msgstr "無法取得 xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1213
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "取得 xover %d - %d 於 %s 內...\n"
 
-#: src/news.c:1229
+#: src/news.c:1228
 msgid "couldn't get xover\n"
 msgstr "無法取得 xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1243
 msgid "invalid xover line\n"
 msgstr "無效的 xover 線\n"
 
-#: src/news.c:1446
+#: src/news.c:1445
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News account(s) are "
@@ -8936,15 +8874,14 @@ msgid "Attachment handling"
 msgstr "已掌握附加檔案"
 
 #: src/plugins/attachwarner/attachwarner.c:217
-#, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
 "attached. Mention appears on line %d, which begins with text: %s\n"
 "\n"
 "%s"
 msgstr ""
-"一個在你所傳送的郵件中所提及的附加檔案,事實上並不存在,這個描述是出現在第%d"
-"行,這字串這個為開頭為: %s\n"
+"一個在你所傳送的郵件中所提及的附加檔案,事實上並不存在,"
+"這個描述是出現在第%d行,這字串這個為開頭為: %s\n"
 "\n"
 "%s"
 
@@ -9004,7 +8941,8 @@ msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr "轉發或改寄郵件時,不要檢查是否缺少附件"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "簽名"
 
@@ -9108,12 +9046,14 @@ msgstr ""
 "\n"
 "可以在/Configuration/Preferences/Plugins/Bogofilter中找到所有的選項"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "垃圾郵件偵測"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "垃圾郵件學習中"
@@ -9685,7 +9625,7 @@ msgstr "此檔案內的CSS將套用在所有的HTML上"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1993
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "瀏覽(W)"
@@ -9694,93 +9634,93 @@ msgstr "瀏覽(W)"
 msgid "Select stylesheet"
 msgstr "選擇風格"
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
 msgstr "不載入遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "載入圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Enable remote content"
 msgstr "使用遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
 msgstr "啟用 Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
 msgstr "啟用外掛程式"
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
 msgstr "啟用 Java"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
 msgstr "以外部瀏覽器開啟連結"
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "發生錯誤: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s 是一個畸形或不支援的輸入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "搜尋瀏覽器"
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
 msgstr "在檢視器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
 msgstr "在檢視器中開啟 (啟用遠端的內容)"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
 msgstr "在瀏覽器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
 msgstr "開啟圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
 msgstr "複製連結"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
 msgstr "下載連結"
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
 msgstr "另存圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
 msgstr "複製圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
 msgstr "匯入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML 檢視器"
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1049
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9869,11 +9809,11 @@ msgid ""
 "RFC822 format"
 msgstr "將RFC822格式郵件內之取得時程和時間加入 the X-FETCH-TIME 標頭"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:126
 msgid "GData plugin: Authorization required"
 msgstr "GData外掛程式: 需要認證"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: src/plugins/gdata/cm_gdata_contacts.c:128
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -9888,29 +9828,29 @@ msgstr ""
 "按下下方的按鈕以參訪Google的認證頁。當你確認了認證後,將可以取得認證碼。在下"
 "方的區域中輸入這組認證碼後,你將可以使用Claws Mail對Google連絡人清單進行存取 "
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:143
 msgid "Step 1:"
 msgstr "步驟1:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:149
 msgid "Click here to open the Google authorization page in a browser"
 msgstr "按下這裡在瀏覽器內開啟Google認證頁"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Step 2:"
 msgstr "步驟2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:159
 msgid "Enter code:"
 msgstr "輸入認證碼:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:325
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "GData外掛程式: 連個人查詢錯誤: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#: src/plugins/gdata/cm_gdata_contacts.c:341
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -9918,73 +9858,73 @@ msgstr[0] "新增 %d 至"
 msgstr[1] "新增 %d 至"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:343
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] "1 個連絡人加入至快取"
 msgstr[1] "%d 個連絡人加入至快取"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:354
+#: src/plugins/gdata/cm_gdata_contacts.c:353
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "GData外掛程式: 開始進行非同步連絡人查詢\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:374
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "GData外掛程式: 群組查詢錯誤: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:411
 msgid "GData plugin: Groups received\n"
 msgstr "GData外掛程式: 群組已接收\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:418
 msgid "GData plugin: Starting async groups query\n"
 msgstr "GData外掛程式: 開始非同步的群組查尋\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:443
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "GData外掛程式:認證錯誤: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:450
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData外掛程式: 認證成功\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:460
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "GData外掛程式: 開始進行內部認證\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:470
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "GData外掛程式: 已取得認證碼,要求認證\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:477
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr "GData外掛程式:沒有收到認證碼,認證要求取消\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData外掛程式: 認證刷新失敗: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:503
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData外掛程式: 認證刷新成功\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:558
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData外掛程式: 正在嘗試刷新認證\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1747
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "認證"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:159 src/wizard.c:1555
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "使用者名稱"
 
@@ -10025,7 +9965,7 @@ msgstr ""
 "截至目前,只實作了將Google連絡人加入Tab-address自動完成的功能\n"
 "歡迎回饋給 <berndth at gmx.de>"
 
-#: src/plugins/gdata/gdata_plugin.c:192
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "GData整合"
 
@@ -10085,7 +10025,6 @@ msgid "Error reading cache stats"
 msgstr "讀取暫存狀態錯誤"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
-#, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr "使用在 %s 內的 %d 檔案, %d 目錄和 %d 其它項目以及 %d 錯誤"
 
@@ -10246,7 +10185,7 @@ msgstr "要求已超時"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
 #: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "秒"
@@ -10533,28 +10472,28 @@ msgid "Specify authentication"
 msgstr "指定認證"
 
 #: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1280
-#: src/prefs_account.c:1793
+#: src/plugins/vcalendar/vcal_prefs.c:345
+#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
 msgid "User ID"
 msgstr "使用者名稱"
 
 #: src/plugins/managesieve/sieve_prefs.c:247
 #: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1286
-#: src/prefs_account.c:1813 src/prefs_account.c:2519 src/prefs_account.c:2541
-#: src/wizard.c:1209 src/wizard.c:1629
+#: src/plugins/vcalendar/vcal_prefs.c:353
+#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1208 src/wizard.c:1628
 msgid "Password"
 msgstr "密碼"
 
 #: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1765
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "認證方式"
 
 #: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1774 src/prefs_send.c:291
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "自動"
 
@@ -11456,7 +11395,8 @@ msgstr "過期了"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "設定為 '0' 將會為整個程序儲存密碼"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "分"
@@ -11573,7 +11513,6 @@ msgid "Encrypt to %s <%s>"
 msgstr "加密至 %s <%s>"
 
 #: src/plugins/pgpcore/select-keys.c:607
-#, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
 "If you choose to encrypt the message with this key, you don't\n"
@@ -11613,156 +11552,160 @@ msgstr "這個簽名尚未被檢查"
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: 無法取得金鑰 - 沒有執行gpg-agent"
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:229
+#, c-format
+msgid "The signature can't be checked - %s."
+msgstr "這個簽名無法被檢查 - %s"
+
+#: src/plugins/pgpcore/sgpgme.c:241
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "來自於 \"%s\" 的良好簽名 [最根本的]"
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "來自於 \"%s\" 的良好簽名 [完整的]"
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "來自於 \"%s\" 的良好簽名 [最低限度的]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "來自於 \"%s\" 的良好簽名"
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "金鑰 0x%s 用來驗證這一個簽名是無效的"
-
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "來自於 \"%s\" 的過期簽名"
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:261
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "來自於 \"%s\" 的良好簽名,但是金鑰已經過期了"
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:264
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "來自於 \"%s\" 的良好簽名,但是金鑰已經被撤回"
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "來自於 \"%s\" 的不良簽名,"
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:271
+#, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "金鑰 0x%s 用來驗證這一個簽名是無效的"
+
+#: src/plugins/pgpcore/sgpgme.c:276
 msgid "The signature has not been checked"
 msgstr "這個簽名尚未被檢查過"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "檢查簽名發生錯誤:沒有狀態\n"
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "檢查簽名發生錯誤: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:331
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "此簽名是以 %s 製作,使用 %s 金鑰 ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的良好簽名 (有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "逾期的金鑰 uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的逾期簽名 (有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "已撤銷的金鑰 uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "來自 \"%s\" 的不良簽名\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
-#, c-format
+#: src/plugins/pgpcore/sgpgme.c:370
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid\"%s\"(有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "已撤銷"
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "擁有者信任: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "沒有金鑰!"
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "主要的金鑰指紋:"
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:398
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "警告:簽名者的地址 \"%s\" 和DNS項目不符合\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "已驗證的簽名者地址是 \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "無法取得來自郵件 %s 的資料"
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "無法初始化資料, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "密鑰規格模稜兩可"
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "無不到密鑰 (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "設定密鑰錯誤: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:721
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "Gpgme 協定 '%s' 無法使用:引擎 '%s' 尚未被正確的安裝"
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -11771,12 +11714,12 @@ msgstr ""
 "Gpgme 協定 '%s' 無法使用:已安裝引擎 '%s' ,版本為 %s,但是 需要的版本應為 "
 "%s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme 協定 '%s' 無法使用 (未知的問題)"
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11784,17 +11727,17 @@ msgstr ""
 "GnuPG 尚未正確的安裝,或是需要升級\n"
 "OpenPGP支援已關閉"
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:785
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr "你必需要先按下\"OK\"鍵,以儲存帳號的資訊,才能產生一對金鑰\n"
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "找不到PGP金鑰"
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:791
 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"
@@ -11804,22 +11747,22 @@ msgstr ""
 "件\n"
 "你確定現在要產生一對新的金鑰嗎?"
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "無法產生一對新的金鑰: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr "你的新金鑰對正在建立中... 請將移動滑鼠以利產生... generate entropy..."
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "無法產生新的金鑰對: 未知的錯誤"
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -11832,19 +11775,19 @@ msgstr ""
 "\n"
 "你要將它匯出至金鑰伺服器嗎?"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "金鑰已產生"
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "金鑰已匯出"
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "無法匯出金鑰"
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:936
 msgid "Key export isn't implemented in Windows."
 msgstr "Windows系統下並沒有實作金鑰匯出的功能"
 
@@ -12068,9 +12011,9 @@ msgstr "顯示 Python 控制台..."
 msgid "Refresh"
 msgstr "更新"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2508
-#: src/prefs_account.c:2530 src/prefs_account.c:2794 src/wizard.c:1199
-#: src/wizard.c:1619
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
+#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
+#: src/wizard.c:1618
 msgid "Browse"
 msgstr "瀏覽"
 
@@ -12365,7 +12308,7 @@ msgstr ""
 "效"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "驗證 SSL 認證的有效期限"
 
@@ -12522,17 +12465,17 @@ msgid "Updating comments for '%s'..."
 msgstr "為 '%s' 更新註解..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1599
 msgid "401 (Authorisation required)"
 msgstr "401 (要求認證)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1602
 msgid "403 (Unauthorised)"
 msgstr "403 (無法認證)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1605
 msgid "404 (Not found)"
 msgstr "404 (找不到)"
 
@@ -12568,7 +12511,6 @@ msgid "Untitled feed"
 msgstr "無標題的 Feed"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:154
-#, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: 可能在 '%s' 中存在不合法的 feed 沒有主旨\n"
 
@@ -12662,21 +12604,21 @@ msgid ""
 "MIME system."
 msgstr "請注意,郵件的標頭,像是主旨,無法使用 S/MIME 系統進行加密"
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
 msgstr "正在提報垃圾郵件..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
 msgstr "線上提報垃圾郵件..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
-#: src/plugins/spam_report/spam_report_prefs.c:81
+#: src/plugins/spam_report/spam_report.c:339
+#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "垃圾郵件提報"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:382
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12692,19 +12634,19 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:418
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "垃圾郵件提報"
 
-#: src/plugins/spam_report/spam_report_prefs.c:124
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "啟用"
 
-#: src/plugins/spam_report/spam_report_prefs.c:156
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "轉寄至:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1567
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "密碼:"
 
@@ -12900,7 +12842,8 @@ msgid "Show"
 msgstr "顯示"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "天"
 
@@ -12993,7 +12936,7 @@ msgid "Next month"
 msgstr "下個月"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:750
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13024,7 +12967,7 @@ msgstr ""
 "你也將可以訂閱一個遠端的wdbCal feed,匯出你的會議和行程表,公開你的空閒/忙碌"
 "狀態、資訊,也可以公開你從其它地方取到的資訊(會議或行程)  "
 
-#: src/plugins/vcalendar/plugin.c:111
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "行事曆"
 
@@ -13206,63 +13149,63 @@ msgstr "出席人員:"
 msgid "Action:"
 msgstr "動作:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr "新會議(_N)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr "匯出行事曆(_E)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
 msgstr "向webCal訂閱(_S)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr "修改名稱(_R)"
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr "更新訂閱(_p)"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr "檢視清單(_L)"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr "以週檢視(_W)"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr "以月份檢視(_M)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1094
 msgid "Meetings"
 msgstr "會議"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1479
 msgid "in the past"
 msgstr "在過去"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1482
 msgid "today"
 msgstr "今天"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1485
 msgid "tomorrow"
 msgstr "明天"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1488
 msgid "this week"
 msgstr "本週"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1491
 msgid "later"
 msgstr "稍後"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -13271,17 +13214,17 @@ msgstr ""
 "\n"
 "這些是已計劃的事件 %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1590
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "已超時 (%d 秒),發生在連線至 %s 時\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1608
 #, c-format
 msgid "Error %ld"
 msgstr "錯誤 %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1805
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13294,7 +13237,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13307,7 +13250,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13318,7 +13261,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
+#: src/plugins/vcalendar/vcal_folder.c:1823
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -13329,42 +13272,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1855
 #, c-format
 msgid "Could not create directory %s"
 msgstr "無法建立目錄 %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1893
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail 需要網路的存取能力以更新Webcal feed"
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1904
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "為 %s 取得行事曆..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1905
 msgid "new subscription"
 msgstr "新的訂閱"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail 需要網路的存取能力以進行訂閱更新"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Subscribe to WebCal"
 msgstr "向WebCal訂閱"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "Enter the WebCal URL:"
 msgstr "輸入WebCal的URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Could not parse the URL."
 msgstr "無法解析此URL"
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Do you really want to unsubscribe?"
 msgstr "你確定要取消訂閱?"
 
@@ -13732,81 +13675,81 @@ msgstr "無法匯出 空閒/忙碌 的資訊"
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "無法匯出 空閒/忙碌 至'%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:282
 msgid "Reminders"
 msgstr "提示功能"
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:291
 msgid "Alert me"
 msgstr "事件觸發前"
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:303
 msgid "minutes before an event"
 msgstr "分鐘提醒我"
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:315
 msgid "Calendar export"
 msgstr "匯出時程表"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:326
 msgid "Automatically export calendar to"
 msgstr "自動匯出時程表到"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:335
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "You can export to a local file or URL"
 msgstr "你可以匯出到一個本地檔案或URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:337
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "選擇一個本地檔案或URL (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
+#: src/plugins/vcalendar/vcal_prefs.c:367
 msgid "Include webcal subscriptions in export"
 msgstr "在匯出內容中包含網路時程表訂閱"
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:377
 msgid "Command to run after calendar export"
 msgstr "在時程表匯出後執行命令"
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:406
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "在 XFCE's Orage clock 中註冊 Claws的 時程表"
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:408
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "允許 Orage (V4.4版本以上) 接受 Claws Mail 的時程表"
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:421
 msgid "Export as GNOME shell calendar server"
 msgstr "匯出為 GNOME 格式的行事曆伺服器"
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr "註冊為 D-Bus 格式的行事曆伺服器界面以匯出 Claws Mail 的行事曆"
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:433
 msgid "Free/Busy information"
 msgstr "空閒/忙碌訊息"
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:445
 msgid "Automatically export free/busy status to"
 msgstr "自動匯出空閒/忙碌狀態到"
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:456
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "指定一個本地檔案或 URL (http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:486
 msgid "Command to run after free/busy status export"
 msgstr "在匯出空閒/忙碌狀態後執行命令"
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:513
 msgid "Get free/busy status of others from"
 msgstr "從其它的寄件者取得空閒/忙碌狀態"
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:521
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -13815,7 +13758,7 @@ msgstr ""
 "指定一個本地檔案或 URL (http://server/path/file.ifb 。使用 %u 作為郵件地址左"
 "側資訊, %d 作為網域名稱"
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
+#: src/plugins/vcalendar/vcal_prefs.c:535
 msgid "SSL options"
 msgstr "SSL 選項"
 
@@ -13870,12 +13813,12 @@ msgstr "POP3通信發生錯誤\n"
 msgid "TOP command unsupported\n"
 msgstr "未支援的頂端命令\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2436
-#: src/wizard.c:1493
+#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
+#: src/wizard.c:1492
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2451
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -13883,7 +13826,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "新聞 (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1495
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "本地 mbox 檔案"
 
@@ -13911,11 +13854,11 @@ msgstr "全名"
 msgid "Mail address"
 msgstr "郵件地址"
 
-#: src/prefs_account.c:1128 src/wizard.c:1518
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "自動配置"
 
-#: src/prefs_account.c:1130 src/wizard.c:1519
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "取消"
 
@@ -14004,7 +13947,7 @@ msgid ""
 msgstr ""
 "郵件超過此限制將被部份接收,當選擇它們後,你將可以把它們全部下找或刪除。"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2466
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
@@ -14016,368 +13959,363 @@ msgstr "可允許最大的郵件下載數量"
 msgid "unlimited if 0 is specified"
 msgstr "若設為0代表沒有限制"
 
-#: src/prefs_account.c:1581
-#, fuzzy
-msgid "Plain text"
-msgstr "尋找字串:"
-
-#: src/prefs_account.c:1594
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "IMAP 伺服器目錄"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(通常是空白的)"
 
-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "只顯示訂閱資料夾"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "寬頻效果模式 (防止接到遠端的標籤)"
 
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "此模式使用較少的頻寬,對於某此伺服器可能會有速度較慢的情況發生"
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "接收郵件時允許使用外掛程式進行過濾"
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'接收郵件' 檢查此帳號的新郵件"
 
-#: src/prefs_account.c:1720 src/prefs_customheader.c:208
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "郵件標頭"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "產生  Message-ID"
 
-#: src/prefs_account.c:1725
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "將傳送帳號的郵件地址放入  Message-ID"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "加入使用者代理郵件標頭"
 
-#: src/prefs_account.c:1735
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "加入使用者自訂郵件標頭"
 
-#: src/prefs_account.c:1750
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 認證 (SMTP AUTH)"
 
-#: src/prefs_account.c:1835
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "若以下欄位空白,將以使用者名稱和密碼進行接收"
 
-#: src/prefs_account.c:1846
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "傳送前用 POP3 認證"
 
-#: src/prefs_account.c:1861
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "POP 認證超時:"
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1867
 msgid "minutes"
 msgstr "分"
 
-#: src/prefs_account.c:1939 src/prefs_account.c:1985
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "簽名"
 
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "自動插入簽名"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "簽名分隔線"
 
-#: src/prefs_account.c:1972
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account.c:2005
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "自動設置轉寄地址"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "併字檢查字典"
 
-#: src/prefs_account.c:2067 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "預設定典"
 
-#: src/prefs_account.c:2080 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "預設替代定典"
 
-#: src/prefs_account.c:2166 src/prefs_account.c:3290
+#: src/prefs_account.c:2164 src/prefs_account.c:3288
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "新郵件"
 
-#: src/prefs_account.c:2181 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "回覆"
 
-#: src/prefs_account.c:2196 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "預設的隱私系統"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "總是進行郵件簽章"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "總是將郵件加密"
 
-#: src/prefs_account.c:2276
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "當回覆簽章郵件時,總是將郵件進行簽章"
 
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "當回覆已加密郵件時,總是將郵件進行加密"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "除了收件者外,將已傳送的郵件用私有金鑰進行加密"
 
-#: src/prefs_account.c:2284
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "將已傳送的加密郵件儲存為明碼文件"
 
-#: src/prefs_account.c:2440 src/prefs_account.c:2455 src/prefs_account.c:2469
+#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
 msgstr "不使用 SSL"
 
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "使用 SSL 進行連線"
 
-#: src/prefs_account.c:2446 src/prefs_account.c:2461 src/prefs_account.c:2492
+#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
 msgstr "使用 STARTTLS 命令開始 SSL 通訊"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "使用 SSL 進行 IMAP4 連線"
 
-#: src/prefs_account.c:2478
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "使用 SSL 進行 NNTP 連線"
 
-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "傳送 (SMTP)"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "不使用 SSL (若需要,使用 STARTTLS)"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "使用 SSL 進行 SMTP 連線"
 
-#: src/prefs_account.c:2497
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "客戶端認證"
 
-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "進行接收認證"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2512 src/prefs_account.c:2532
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
+#: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "客戶端認證檔案為 PKCS12 或 PEM 檔"
 
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "進行傳送認證"
 
-#: src/prefs_account.c:2560
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "自動接放不明的合法 SSL 認證"
 
-#: src/prefs_account.c:2563
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "使用非阻斷式 SSL"
 
-#: src/prefs_account.c:2575
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "如果發生 SSL 連線問題,請把此功能關閉"
 
-#: src/prefs_account.c:2693
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "SMTP 通訊埠"
 
-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "POP3 通訊埠"
 
-#: src/prefs_account.c:2707
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "IMAP4 通訊埠"
 
-#: src/prefs_account.c:2714
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "NNTP 通訊埠"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "網域名稱"
 
-#: src/prefs_account.c:2723
+#: src/prefs_account.c:2721
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr "網域名稱將被用來產生 Message-ID 以及當要連接到 SMTP 伺服器時"
 
-#: src/prefs_account.c:2737
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "以命令和伺服器進行通訊"
 
-#: src/prefs_account.c:2745
+#: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
 msgstr "將刪除的郵件移至回收桶並立即刪除"
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
 msgstr "將郵件加註已刪除旗標而不刪除,以取代將刪隱的郵件移至回收桶內"
 
-#: src/prefs_account.c:2751
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "標示已傳送郵件為已讀並更改顏色"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "郵已傳送郵件放在"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "將暫存郵件放在"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "將草稿郵件放在"
 
-#: src/prefs_account.c:2813
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "將刪除的郵件放在"
 
-#: src/prefs_account.c:2873
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "未指定帳號名稱"
 
-#: src/prefs_account.c:2877
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "未指定郵件地方"
 
-#: src/prefs_account.c:2884
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "未指定 SMTP 伺服器"
 
-#: src/prefs_account.c:2889
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "使用者 ID 未指定"
 
-#: src/prefs_account.c:2894
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "未指定 POP3 伺服器"
 
-#: src/prefs_account.c:2914
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "預設收件夾不存在"
 
-#: src/prefs_account.c:2920
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 伺服器未指定"
 
-#: src/prefs_account.c:2925
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "NNTP 伺服器未指定"
 
-#: src/prefs_account.c:2931
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "本地郵件夾名稱未指定"
 
-#: src/prefs_account.c:2937
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "郵件命令未指定"
 
-#: src/prefs_account.c:3254
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account.c:3308 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "樣版"
 
-#: src/prefs_account.c:3326
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "隱私"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "進階"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "新帳號選項"
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帳號選項"
 
-#: src/prefs_account.c:3851 src/wizard.c:1383
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "失敗 (錯誤的地址)"
 
-#: src/prefs_account.c:3936
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "繼擇簽名檔案"
 
-#: src/prefs_account.c:3954 src/prefs_account.c:3971 src/wizard.c:1060
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "選擇認證檔案"
 
-#: src/prefs_account.c:4067
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "通訊協定"
 
-#: src/prefs_account.c:4207
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (未載入外掛程式)"
@@ -14499,20 +14437,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "你真的要刪除所有的動作嗎?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
+#: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "項目尚未儲存"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "項目尚未儲存,仍然要關閉嗎?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "繼續編輯(_C)"
 
@@ -15225,8 +15164,8 @@ msgid ""
 "However, you can set them for the whole mailbox tree by using \"Apply to "
 "subfolders\"."
 msgstr ""
-"當此資料夾不是最上層的資料夾時,這些選項將無法被儲存,然而,你可以用 \"套用至"
-"子資料夾\" 功能將它們套用到整個 郵件箱樹狀結構上"
+"當此資料夾不是最上層的資料夾時,這些選項將無法被儲存,然而,你可以用 \"套用"
+"至子資料夾\" 功能將它們套用到整個 郵件箱樹狀結構上"
 
 #: src/prefs_folder_item.c:274 src/prefs_folder_item.c:876
 msgid ""
@@ -15399,7 +15338,7 @@ msgstr "顯示"
 msgid "Fonts"
 msgstr "字型"
 
-#: src/prefs_gtk.c:925 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "選項"
 
@@ -15542,7 +15481,7 @@ msgstr "錯誤郵件"
 msgid "Status messages for filtering/processing log"
 msgstr "記錄過濾/執行日誌的狀態郵件"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
 msgid "Other"
 msgstr "其它"
 
@@ -16167,15 +16106,15 @@ msgstr "挑選資料夾的顏色"
 msgid "Colors"
 msgstr "顏色"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:96
 msgid "Choose preset keyboard shortcuts"
 msgstr "選擇預設的快捷鍵"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:110
 msgid "Select preset:"
 msgstr "選擇預設:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:125
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16183,35 +16122,35 @@ msgstr ""
 "你可以透過把滑鼠焦點放在項目上時,按下任何按鍵,\n"
 "來修改每一個功能項目的快捷鍵"
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:478
 msgid "Add address to destination when double-clicked"
 msgstr "雙擊時將郵件地址加入通訊錄"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:481
 msgid "On exit"
 msgstr "離開時"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:484
 msgid "Confirm on exit"
 msgstr "離開時需確認"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:491
 msgid "Empty trash on exit"
 msgstr "離開時清空回收桶"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:494
 msgid "Warn if there are queued messages"
 msgstr "若有任何的暫存郵件時提出警示"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:496
 msgid "Keyboard shortcuts"
 msgstr "快捷鍵"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:499
 msgid "Enable customisable keyboard shortcuts"
 msgstr "啟用使用者自訂的快捷鍵"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:502
 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"
@@ -16221,15 +16160,15 @@ msgstr ""
 "快捷鍵設定\n"
 "若你希望保持所有已存在的快捷鍵,請取消勾選。"
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:509
 msgid " Choose preset keyboard shortcuts... "
 msgstr "選擇已設定的快捷鍵..."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:519
 msgid "Metadata handling"
 msgstr "原始數據控制"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:520
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16237,31 +16176,31 @@ msgstr ""
 "安全模式會要求系統將原始數據直接寫入磁碟,它將避免在任何的崩潰情況下\n"
 "遺失數據,但是這樣將會花費一些時間。"
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:524
 msgid "Safer"
 msgstr "更安全"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:526
 msgid "Faster"
 msgstr "更是"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:544
 msgid "Socket I/O timeout"
 msgstr "Socket I/O 超時"
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:566
 msgid "Ask before emptying trash"
 msgstr "清空回收桶前詢問"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:568
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "手動進行過濾時,詢問要使用那一個帳號使用的過濾規則"
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:573
 msgid "Use secure file deletion if possible"
 msgstr "如果可以,使用安全的檔案刪除"
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:577
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16269,7 +16208,7 @@ msgstr ""
 "如果可以,使用安全的檔案刪除\n"
 "('shred'程式是無效的)"
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:582
 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."
@@ -16277,32 +16216,11 @@ msgstr ""
 "使用'shred'程式,以隨機的方式在檔案刪除前覆寫檔案,這樣將使刪除變慢。請仔細閱"
 "讀'shred'的man page,以取得更詳細的警示說明"
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:586
 msgid "Synchronise offline folders as soon as possible"
 msgstr "儘快的同步離線資料夾"
 
-#: src/prefs_other.c:607
-#, fuzzy
-msgid "Master password"
-msgstr "輸入密碼"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master password"
-msgstr "輸入密碼"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"password. If no master password is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master password"
-msgstr "輸入密碼"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "雜項"
 
@@ -16555,8 +16473,8 @@ msgid ""
 "characters"
 msgstr "當郵件內容包含非ASCII編碼字元時需指定傳送加碼方式"
 
-#: src/prefs_send.c:359 src/send_message.c:503 src/send_message.c:507
-#: src/send_message.c:512
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "傳送"
 
@@ -17024,7 +16942,6 @@ msgid "Select theme folder"
 msgstr "選擇佈景主題資料夾"
 
 #: src/prefs_themes.c:500
-#, c-format
 msgid "Install theme '%s'"
 msgstr "安裝佈景主題 '%s'"
 
@@ -17279,53 +17196,53 @@ msgstr "無可用訊息"
 msgid "No recipient keys defined."
 msgstr "接收的金鑰尚未定義"
 
-#: src/procmime.c:434 src/procmime.c:436 src/procmime.c:437
+#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64編碼錯誤]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "已嘗試傳送"
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1550 src/procmsg.c:1609
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "無法開啟檔案 %s"
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1619
 msgid "Queued message header is broken."
 msgstr "暫存的郵件標頭已損毀"
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1639
 msgid "An error happened during SMTP session."
 msgstr "SMTP傳送過程中發生錯誤"
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1653
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr "找不到已指定的帳號進行郵件傳送,而且在 SMTP 通信時 發生錯誤"
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1661
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr "無法偵測傳送的資訊,可能是因為Claws Mail無法產生郵件 "
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
 msgstr "無法為新傳送郵件建立暫存檔案"
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1696
 msgid "Error when writing temporary file for news sending."
 msgstr "為新傳送郵件建立暫存檔案時發生錯誤"
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1710
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "當發出郵件至 %s 時,發生錯誤"
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2262
 msgid "Filtering messages...\n"
 msgstr "過濾郵件...\n"
 
@@ -17618,88 +17535,88 @@ msgstr "輸入文字以覆蓋 '%s'"
 msgid "Enter variable"
 msgstr "輸入變數"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "使用此命令傳送郵件: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "不能執行此命令: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "當執行此命令時發生錯誤: %s"
 
-#: src/send_message.c:352
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/send_message.c:357
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "在SMTP之前執行POP..."
 
-#: src/send_message.c:360
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "在SMTP之前POP"
 
-#: src/send_message.c:365
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "帳號'%s':連線到SMTP伺服器: %s:%d..."
 
-#: src/send_message.c:422
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "郵件傳送成功"
 
-#: src/send_message.c:488
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "傳送 HELO..."
 
-#: src/send_message.c:489 src/send_message.c:494 src/send_message.c:499
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "傳送郵件..."
 
-#: src/send_message.c:493
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "傳送 HELO..."
 
-#: src/send_message.c:502
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "傳送郵件來自..."
 
-#: src/send_message.c:506
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "傳送 RCPT 到..."
 
-#: src/send_message.c:511
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "傳送 DATA..."
 
-#: src/send_message.c:515
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "離開中..."
 
-#: src/send_message.c:544
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "傳送郵件 (%d / %d 位元)"
 
-#: src/send_message.c:597
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "傳送郵件"
 
-#: src/send_message.c:666 src/send_message.c:686
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "在傳送郵件時發生錯誤"
 
-#: src/send_message.c:669
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18576,12 +18493,12 @@ msgstr "請選擇一個要開啟的 URL"
 msgid "Select All"
 msgstr "全選"
 
-#: src/wizard.c:521
+#: src/wizard.c:520
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "歡迎光臨 Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:543
 #, c-format
 msgid ""
 "\n"
@@ -18671,125 +18588,125 @@ msgstr ""
 "<%s>.\n"
 "\n"
 
-#: src/wizard.c:620
+#: src/wizard.c:619
 msgid "Please enter the mailbox name."
 msgstr "請輸入郵件箱名稱"
 
-#: src/wizard.c:648
+#: src/wizard.c:647
 msgid "Please enter your name and email address."
 msgstr "請輸入你的名字和郵件地址"
 
-#: src/wizard.c:659
+#: src/wizard.c:658
 msgid "Please enter your receiving server and username."
 msgstr "請輸入你的接收伺服器和使用者名稱"
 
-#: src/wizard.c:669
+#: src/wizard.c:668
 msgid "Please enter your username."
 msgstr "請輸入你的使用者名稱"
 
-#: src/wizard.c:679
+#: src/wizard.c:678
 msgid "Please enter your SMTP server."
 msgstr "請輸入你的 SMTP 伺服器"
 
-#: src/wizard.c:690
+#: src/wizard.c:689
 msgid "Please enter your SMTP username."
 msgstr "請輸入你的 SMTP 使用者名稱"
 
-#: src/wizard.c:969
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "你的姓名:"
 
-#: src/wizard.c:980
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "你的郵件地址:"
 
-#: src/wizard.c:991
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "你的組識:"
 
-#: src/wizard.c:1025
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "郵件箱"
 
-#: src/wizard.c:1033
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr "你也可以指定一個絕對路徑,例如: \"/home/john/Documents/Mail\""
 
-#: src/wizard.c:1104
+#: src/wizard.c:1103
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr "你可以藉由在最後加上通訊埠來指定: \"mail.example.com:25\""
 
-#: src/wizard.c:1107
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "SMTP 伺服器地址:"
 
-#: src/wizard.c:1113
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "使用認證"
 
-#: src/wizard.c:1122
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(留下空白代表使用和接收伺服器使用一樣的設定)"
 
-#: src/wizard.c:1136
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "SMTP 使用者名稱:"
 
-#: src/wizard.c:1147
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "SMTP 密碼:"
 
-#: src/wizard.c:1160
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "使用 SSL 和 SMTP 伺服器建立連線"
 
-#: src/wizard.c:1171 src/wizard.c:1591
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "採用 STARTTLS 使用 SSL"
 
-#: src/wizard.c:1183 src/wizard.c:1603
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "客戶端的 SSL 認證 (選項)"
 
-#: src/wizard.c:1251 src/wizard.c:1283 src/wizard.c:1538
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "伺服器地址:"
 
-#: src/wizard.c:1315
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "本地郵件夾:"
 
-#: src/wizard.c:1484
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "伺服器型式:"
 
-#: src/wizard.c:1494
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1549
+#: src/wizard.c:1548
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr "你可以藉由在最後加上通訊埠來指定: \"mail.example.com:110\""
 
-#: src/wizard.c:1580
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "使用 SSL 和接收伺服器建立連線"
 
-#: src/wizard.c:1645
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "IMAP 伺服器路徑"
 
-#: src/wizard.c:1656
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "只顯示已訂閱資料夾"
 
-#: src/wizard.c:1664
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -18797,15 +18714,15 @@ msgstr ""
 "警告:這個版本的 Clasw Mail\n"
 "已被編譯為不支援 IMAP"
 
-#: src/wizard.c:1782
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail 設定精靈"
 
-#: src/wizard.c:1816
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "歡迎來到 Clasw Mail"
 
-#: src/wizard.c:1824
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -18818,31 +18735,31 @@ msgstr ""
 "我們將會從定義一些基本的資訊開始,關於你和你常用的郵件選項。如此你就可以在少"
 "於5分鐘的時間內,開始使用 Claws Mail  "
 
-#: src/wizard.c:1837
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "關於你"
 
-#: src/wizard.c:1845 src/wizard.c:1860 src/wizard.c:1875 src/wizard.c:1891
+#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
 msgid "Bold fields must be completed"
 msgstr "粗體欄位需要被完成"
 
-#: src/wizard.c:1852
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "接收郵件"
 
-#: src/wizard.c:1867
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "傳送郵件"
 
-#: src/wizard.c:1883
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "儲存郵件在磁碟上"
 
-#: src/wizard.c:1899
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "配置完成"
 
-#: src/wizard.c:1907
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -18850,9 +18767,6 @@ msgstr ""
 "Claws Mail 已經設定完成\n"
 "按下 儲存鍵 開始使用"
 
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "這個簽名無法被檢查 - %s"
-
 #~ msgid "+_Insert"
 #~ msgstr "插入(+_I)"
 
diff --git a/src/mh.c b/src/mh.c
index 913a41c..0736e58 100644
--- a/src/mh.c
+++ b/src/mh.c
@@ -791,7 +791,7 @@ static gint mh_create_tree(Folder *folder)
 	rootpath = LOCAL_FOLDER(folder)->rootpath;
 #ifdef G_OS_UNIX
 	if (*rootpath == '/') {
-#elif defined G_OS_WIN32
+#elif G_OS_WIN32
 	if (g_ascii_isalpha(*rootpath) && !strncmp(rootpath + 1, "\:", 2)) {
 #endif
 		/* Folder path is absolute. */
diff --git a/src/password.c b/src/password.c
index 7e37e28..4f9ee16 100644
--- a/src/password.c
+++ b/src/password.c
@@ -30,12 +30,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#if defined G_OS_UNIX
+#ifdef G_OS_UNIX
 #include <fcntl.h>
 #include <unistd.h>
-#elif defined G_OS_WIN32
-#include <windows.h>
-#include <wincrypt.h>
 #endif
 
 #include "common/passcrypt.h"
@@ -274,10 +271,8 @@ gchar *password_encrypt_gnutls(const gchar *password,
 	gnutls_datum_t key, iv;
 	int ivlen, keylen, digestlen, blocklen, ret, i;
 	unsigned char hashbuf[BUFSIZE], *buf, *encbuf, *base, *output;
-#if defined G_OS_UNIX
+#ifdef G_OS_UNIX
 	int rnd;
-#elif defined G_OS_WIN32
-	HCRYPTPROV rnd;
 #endif
 
 	g_return_val_if_fail(password != NULL, NULL);
@@ -304,48 +299,38 @@ gchar *password_encrypt_gnutls(const gchar *password,
 	memcpy(key.data, &hashbuf, keylen);
 	key.size = keylen;
 
+#ifdef G_OS_UNIX
 	/* Prepare our source of random data. */
-#if defined G_OS_UNIX
 	rnd = open("/dev/urandom", O_RDONLY);
 	if (rnd == -1) {
 		perror("fopen on /dev/urandom");
-#elif defined G_OS_WIN32
-	if (!CryptAcquireContext(&rnd, NULL, NULL, PROV_RSA_FULL, 0) &&
-			!CryptAcquireContext(&rnd, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
-		debug_print("Could not acquire a CSP handle.\n");
-#endif
 		g_free(key.data);
 		g_free(iv.data);
 		return NULL;
 	}
+#endif
 
 	/* Prepare random IV for cipher */
 	iv.data = malloc(ivlen);
 	iv.size = ivlen;
-#if defined G_OS_UNIX
+#ifdef G_OS_UNIX
 	ret = read(rnd, iv.data, ivlen);
 	if (ret != ivlen) {
 		perror("read into iv");
-		close(rnd);
-#elif defined G_OS_WIN32
-	if (!CryptGenRandom(rnd, ivlen, iv.data)) {
-		debug_print("Could not read random data for IV\n");
-		CryptReleaseContext(rnd, 0);
-#endif
 		g_free(key.data);
 		g_free(iv.data);
+		close(rnd);
 		return NULL;
 	}
+#endif
 
 	/* Initialize the encryption */
 	ret = gnutls_cipher_init(&handle, algo, &key, &iv);
 	if (ret < 0) {
 		g_free(key.data);
 		g_free(iv.data);
-#if defined G_OS_UNIX
+#ifdef G_OS_UNIX
 		close(rnd);
-#elif defined G_OS_WIN32
-		CryptReleaseContext(rnd, 0);
 #endif
 		return NULL;
 	}
@@ -354,28 +339,20 @@ gchar *password_encrypt_gnutls(const gchar *password,
 	 * rest with zero bytes. */
 	buf = malloc(BUFSIZE + blocklen);
 	memset(buf, 0, BUFSIZE);
-#if defined G_OS_UNIX
+#ifdef G_OS_UNIX
 	ret = read(rnd, buf, blocklen);
 	if (ret != blocklen) {
 		perror("read into buffer");
-		close(rnd);
-#elif defined G_OS_WIN32
-	if (!CryptGenRandom(rnd, blocklen, buf)) {
-		debug_print("Could not read random data for IV\n");
-		CryptReleaseContext(rnd, 0);
-#endif
 		g_free(buf);
 		g_free(key.data);
 		g_free(iv.data);
+		close(rnd);
 		gnutls_cipher_deinit(handle);
 		return NULL;
 	}
 
 	/* We don't need any more random data. */
-#if defined G_OS_UNIX
 	close(rnd);
-#elif defined G_OS_WIN32
-	CryptReleaseContext(rnd, 0);
 #endif
 
 	memcpy(buf + blocklen, password, strlen(password));
@@ -421,10 +398,8 @@ gchar *password_decrypt_gnutls(const gchar *password,
 	int ivlen, keylen, digestlen, blocklen, ret, i;
 	gsize len;
 	unsigned char hashbuf[BUFSIZE], *buf;
-#if defined G_OS_UNIX
+#ifdef G_OS_UNIX
 	int rnd;
-#elif defined G_OS_WIN32
-	HCRYPTPROV rnd;
 #endif
 
 	g_return_val_if_fail(password != NULL, NULL);
@@ -477,46 +452,34 @@ gchar *password_decrypt_gnutls(const gchar *password,
 	memcpy(key.data, &hashbuf, keylen);
 	key.size = keylen;
 
+#ifdef G_OS_UNIX
 	/* Prepare our source of random data. */
-#if defined G_OS_UNIX
 	rnd = open("/dev/urandom", O_RDONLY);
 	if (rnd == -1) {
 		perror("fopen on /dev/urandom");
-#elif defined G_OS_WIN32
-	if (!CryptAcquireContext(&rnd, NULL, NULL, PROV_RSA_FULL, 0) &&
-			!CryptAcquireContext(&rnd, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
-		debug_print("Could not acquire a CSP handle.\n");
-#endif
 		g_free(key.data);
 		g_free(iv.data);
 		g_strfreev(tokens);
 		return NULL;
 	}
+#endif
 
 	/* Prepare random IV for cipher */
 	iv.data = malloc(ivlen);
 	iv.size = ivlen;
-#if defined G_OS_UNIX
+#ifdef G_OS_UNIX
 	ret = read(rnd, iv.data, ivlen);
 	if (ret != ivlen) {
 		perror("read into iv");
-		close(rnd);
-#elif defined G_OS_WIN32
-	if (!CryptGenRandom(rnd, ivlen, iv.data)) {
-		debug_print("Could not read random data for IV\n");
-		CryptReleaseContext(rnd, 0);
-#endif
 		g_free(key.data);
 		g_free(iv.data);
 		g_strfreev(tokens);
+		close(rnd);
 		return NULL;
 	}
 
 	/* We don't need any more random data. */
-#if defined G_OS_UNIX
 	close(rnd);
-#elif defined G_OS_WIN32
-	CryptReleaseContext(rnd, 0);
 #endif
 
 	/* Prepare encrypted password string for decryption. */
diff --git a/src/password_gtk.c b/src/password_gtk.c
index 41bb7f5..683acbe 100644
--- a/src/password_gtk.c
+++ b/src/password_gtk.c
@@ -218,6 +218,8 @@ void master_password_change_dialog()
 	while (!ctx->done)
 		gtk_main_iteration();
 
+	manage_window_focus_out(dialog, NULL, NULL);
+
 	if (ctx->dialog != NULL)
 		gtk_widget_destroy(ctx->dialog);
 

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list