[Commits] [SCM] claws branch, master, updated. 3.14.0-18-g7635e2f

ticho at claws-mail.org ticho at claws-mail.org
Fri Aug 19 18:51:15 CEST 2016


The branch, master has been updated
       via  7635e2f51c93610b93b3150be91957ad1a2f73d5 (commit)
       via  3813793f54f8b77bee519f827b8493776c0ef50b (commit)
      from  dc7438b9a2eb1e6f55bf1780310ddcc06160baa2 (commit)

Summary of changes:
 po/ca.po    |  116 +-
 po/cs.po    |  116 +-
 po/da.po    |  382 ++-
 po/de.po    |  116 +-
 po/en_GB.po | 3845 ++++++++++++++--------------
 po/es.po    |  201 +-
 po/fi.po    |  171 +-
 po/fr.po    |  289 +--
 po/he.po    | 4194 +++++++++++++++----------------
 po/hu.po    |  116 +-
 po/id_ID.po | 8091 ++++++++++++++++++++++++++++++-----------------------------
 po/it.po    |  116 +-
 po/nb.po    | 4088 ++++++++++++++----------------
 po/nl.po    |  116 +-
 po/pt_BR.po |  116 +-
 po/ru.po    |  116 +-
 po/sk.po    |  116 +-
 po/sv.po    |  171 +-
 po/tr.po    | 1689 ++++++-------
 po/zh_TW.po |  566 +----
 20 files changed, 11917 insertions(+), 12814 deletions(-)


- Log -----------------------------------------------------------------
commit 7635e2f51c93610b93b3150be91957ad1a2f73d5
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Aug 19 18:50:53 2016 +0200

    More fixes for parsing dates in vcalendar on Windows.
    
    ...this time without all the i18n updates.

diff --git a/src/plugins/vcalendar/libical/libical/icalduration.c b/src/plugins/vcalendar/libical/libical/icalduration.c
index 18a7439..356809f 100644
--- a/src/plugins/vcalendar/libical/libical/icalduration.c
+++ b/src/plugins/vcalendar/libical/libical/icalduration.c
@@ -31,6 +31,8 @@
 
 #include "icalduration.h"
 
+#include <glib.h>
+
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
@@ -299,10 +301,42 @@ struct icaltimetype  icaltime_add(struct icaltimetype t,
 {
     int dt = icaldurationtype_as_int(d);
     
+#ifdef G_OS_WIN32
+	GTimeZone *zone;
+	GDateTime *dtm;
+
+	if (t.is_utc == 1)
+		zone = g_time_zone_new_utc();
+	else
+		zone = g_time_zone_new_local();
+
+	dtm = g_date_time_new(
+				zone,
+				t.year,
+				t.month,
+				t.day,
+				t.hour,
+				t.minute,
+				t.second);
+
+	GDateTime *d2 = g_date_time_add_seconds(dtm, dt);
+
+	t.year = g_date_time_get_year(d2);
+	t.month = g_date_time_get_month(d2);
+	t.day = g_date_time_get_day_of_month(d2);
+	t.hour = g_date_time_get_hour(d2);
+	t.minute = g_date_time_get_minute(d2);
+	t.second = g_date_time_get_second(d2);
+
+	g_date_time_unref(dtm);
+	g_date_time_unref(d2);
+	g_time_zone_unref(zone);
+#else
     t.second += dt;
     
     t = icaltime_normalize(t);
-    
+#endif
+
     return t;
 }
 
diff --git a/src/plugins/vcalendar/libical/libical/icaltime.c b/src/plugins/vcalendar/libical/libical/icaltime.c
index 3ca3d9d..7d3ee1c 100644
--- a/src/plugins/vcalendar/libical/libical/icaltime.c
+++ b/src/plugins/vcalendar/libical/libical/icaltime.c
@@ -538,7 +538,7 @@ short icaltime_day_of_year(struct icaltimetype t){
 	if (dt == NULL)
 		return 1;
 
-	gint doy = g_date_time_get_day_of_year(dt);
+	gint doy = g_date_time_get_day_of_year(dt) - 1;
 	g_date_time_unref(dt);
 	g_time_zone_unref(zone);
 
diff --git a/src/plugins/vcalendar/vcal_manager.c b/src/plugins/vcalendar/vcal_manager.c
index 1432e0f..017aa8c 100644
--- a/src/plugins/vcalendar/vcal_manager.c
+++ b/src/plugins/vcalendar/vcal_manager.c
@@ -533,7 +533,8 @@ static void get_rfc822_date_from_time_t(gchar *buf, gint len, time_t t)
 		   day, dd, mon, yyyy, hh, mm, ss, tzoffset(&t));
 #else
 	GDateTime *dt = g_date_time_new_from_unix_local(t);
-	gchar *buf2 = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %Z");
+	gchar *buf2 = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %z");
+	g_date_time_unref(dt);
 	strncpy(buf, buf2, len);
 	g_free(buf2);
 #endif
@@ -546,7 +547,6 @@ static gchar *write_headers_date(const gchar *uid)
 	gchar date[128];
 	time_t t;
 	struct tm lt;
-	struct tm buft;
 
 	memset(subject, 0, sizeof(subject));
 	memset(date, 0, sizeof(date));
@@ -572,6 +572,7 @@ static gchar *write_headers_date(const gchar *uid)
 	} 
 	
 #ifndef G_OS_WIN32
+	struct tm buft;
 	lt = *localtime_r(&t, &buft);
 #else
 	if (t < 0)
@@ -787,16 +788,28 @@ VCalEvent * vcal_manager_new_event	(const gchar 	*uid,
 
 	if (dtend && *(dtend)) {
 		time_t tmp = icaltime_as_timet((icaltime_from_string(dtend)));
+#ifdef G_OS_WIN32
+		GDateTime *dt = g_date_time_new_from_unix_local(tmp);
+		event->end = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %z");
+		g_date_time_unref(dt);
+#else
 		gchar buft[512];
 		tzset();
 		event->end	= g_strdup(ctime_r(&tmp, buft));
+#endif
 	}
 	
 	if (dtstart && *(dtstart)) {
 		time_t tmp = icaltime_as_timet((icaltime_from_string(dtstart)));
+#ifdef G_OS_WIN32
+		GDateTime *dt = g_date_time_new_from_unix_local(tmp);
+		event->start = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %z");
+		g_date_time_unref(dt);
+#else
 		gchar buft[512];
 		tzset();
 		event->start	= g_strdup(ctime_r(&tmp, buft));
+#endif
 	}
 	event->dtstart		= g_strdup(dtstart?dtstart:"");
 	event->dtend		= g_strdup(dtend?dtend:"");
@@ -1482,7 +1495,6 @@ EventTime event_to_today(VCalEvent *event, time_t t)
 	struct tm evtstart, today;
 	time_t evtstart_t, today_t;
 	struct icaltimetype itt;
-	struct tm buft;
 
 	tzset();
 	
@@ -1495,6 +1507,7 @@ EventTime event_to_today(VCalEvent *event, time_t t)
 	}
 	
 #ifndef G_OS_WIN32
+	struct tm buft;
 	today = *localtime_r(&today_t, &buft);
 	localtime_r(&evtstart_t, &evtstart);
 #else

commit 3813793f54f8b77bee519f827b8493776c0ef50b
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Aug 19 18:48:33 2016 +0200

    Revert "More fixes for parsing dates in vcalendar on Windows."
    
    This reverts commit dc7438b9a2eb1e6f55bf1780310ddcc06160baa2.
    
    Oops, I did it again...

diff --git a/po/ca.po b/po/ca.po
index da6c1fa..5a110b2 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-08-18 23:19+0200\n"
+"POT-Creation-Date: 2016-08-03 10:44+0200\n"
 "PO-Revision-Date: 2016-08-03 11:04+0200\n"
 "Last-Translator: David Medina <opensusecatala at gmail.com>\n"
 "Language-Team: Miquel Oliete i Baliarda <ktalanet at yahoo.es>\n"
@@ -3781,12 +3781,12 @@ msgstr ""
 msgid "Mark all as read"
 msgstr "Marca-ho tot com a llegit"
 
-#: src/folderview.c:1019 src/imap.c:4639
+#: src/folderview.c:1019 src/imap.c:4641
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "S'explora la carpeta %s/%s..."
 
-#: src/folderview.c:1022 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Explorant la carpeta %s..."
@@ -5821,8 +5821,8 @@ msgstr "La connexió amb %s fa fallat"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexió IMAP4 amb %s s'ha desconnectat. Reconnectant...\n"
 
-#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 src/imap.c:5431
+#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
+#: src/imap.c:4622 src/imap.c:5433
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "El Claws Mail necessita accés a la xarxa per accedir al servidor IMAP."
 
@@ -5863,85 +5863,85 @@ msgstr "No s'ha pogut connectar amb el servidor IMAP4: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No s'ha pogut connectar amb el servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4110
+#: src/imap.c:1255 src/imap.c:4112
 msgid "Can't start TLS session.\n"
 msgstr "No es pot iniciar la sessió TLS.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1324
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No s'ha pogut fer l'entrada al servidor IMAP %s.\n"
 
-#: src/imap.c:1325
+#: src/imap.c:1327
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No s'ha pogut fer l'entrada al servidor IMAP %s."
 
-#: src/imap.c:1752
+#: src/imap.c:1754
 msgid "Adding messages..."
 msgstr "Afegint missatges..."
 
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1959 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Copiant missatges..."
 
-#: src/imap.c:2550
+#: src/imap.c:2552
 msgid "can't set deleted flags\n"
 msgstr "no s'han pogut establir els indicadors esborrats\n"
 
-#: src/imap.c:2557 src/imap.c:5061
+#: src/imap.c:2559 src/imap.c:5063
 msgid "can't expunge\n"
 msgstr "no es pot suprimir\n"
 
-#: src/imap.c:2908
+#: src/imap.c:2910
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscant carpetes no subscrites a %s..."
 
-#: src/imap.c:2911
+#: src/imap.c:2913
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscant subcarpetes de %s..."
 
-#: src/imap.c:3229
+#: src/imap.c:3231
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no s'ha pogut crear la bústia: LIST ha fallat\n"
 
-#: src/imap.c:3244
+#: src/imap.c:3246
 msgid "can't create mailbox\n"
 msgstr "no es pot crear la bústia\n"
 
-#: src/imap.c:3375
+#: src/imap.c:3377
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no s'ha pogut canviar el nom de la bústia: %s a %s\n"
 
-#: src/imap.c:3488
+#: src/imap.c:3490
 msgid "can't delete mailbox\n"
 msgstr "no es pot esborrar la bústia\n"
 
-#: src/imap.c:3767
+#: src/imap.c:3769
 msgid "LIST failed\n"
 msgstr "LIST ha fallat\n"
 
-#: src/imap.c:3852
+#: src/imap.c:3854
 msgid "Flagging messages..."
 msgstr "Marcant missatges..."
 
-#: src/imap.c:3955
+#: src/imap.c:3957
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "No s'ha pogut seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4107
+#: src/imap.c:4109
 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor requereix TLS per accedir-hi.\n"
 
-#: src/imap.c:4117
+#: src/imap.c:4119
 msgid "Can't refresh capabilities.\n"
 msgstr "No es poden refrescar les capacitats.\n"
 
-#: src/imap.c:4122
+#: src/imap.c:4124
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5950,20 +5950,20 @@ msgstr ""
 "La connexió a %s ha fallat: el servidor requereix TLS, però s'ha compilat el "
 "Claws Mail sense sense suport TLS.\n"
 
-#: src/imap.c:4130
+#: src/imap.c:4132
 msgid "Server logins are disabled.\n"
 msgstr "Les entrades al servidor estan inhabilitades.\n"
 
-#: src/imap.c:4353
+#: src/imap.c:4355
 msgid "Fetching message..."
 msgstr "Obtenint el missatge..."
 
-#: src/imap.c:5054
+#: src/imap.c:5056
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no s'han pogut establir els indicadors esborrats: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6091
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -7906,7 +7906,7 @@ msgstr "Sobreescriu el fitxer mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Aquest fitxer ja existeix. Voleu sobreescriure'l?"
 
-#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Sobreescriu"
@@ -7956,7 +7956,7 @@ msgstr "Cerca finalitzada"
 msgid "Compose _new message"
 msgstr "Escriu un missatge _nou"
 
-#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
+#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista de missatge"
 
@@ -7995,46 +7995,46 @@ msgstr ""
 "oficialment adreçat a vós. \n"
 "Es recomana no enviar el justificant de recepció."
 
-#: src/messageview.c:1376
+#: src/messageview.c:1373
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Obtenint missatge (%s)..."
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1409 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No es pot desencriptar: %s"
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: src/messageview.c:1490 src/messageview.c:1498
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "El missatge no compleix l'estàndard MIME. Pot ser mostrat erròniament."
 
-#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
+#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Desa com a"
 
-#: src/messageview.c:1856
+#: src/messageview.c:1853
 msgid "Overwrite existing file?"
 msgstr "Se sobreescriu el fitxer existent?"
 
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No s'ha pogut desar el fitxer \"%s\"."
 
-#: src/messageview.c:1917
+#: src/messageview.c:1914
 #, c-format
 msgid "Show all %s."
 msgstr "Mostra-ho tot: %s."
 
-#: src/messageview.c:1919
+#: src/messageview.c:1916
 msgid "Only the first megabyte of text is shown."
 msgstr "Només es mostra el primer megabyte de text."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1947
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8042,19 +8042,19 @@ msgstr ""
 "Heu demanat un justificant de recepció per a aquest missatge: ha estat "
 "mostrat pel destinatari."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1950
 msgid "You asked for a return receipt in this message."
 msgstr "Heu demanat justificant de recepció en aquest missatge."
 
-#: src/messageview.c:1959
+#: src/messageview.c:1956
 msgid "This message asks for a return receipt."
 msgstr "Aquest missatge sol·licita un justificant de recepció."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1957
 msgid "Send receipt"
 msgstr "Envia un justificant de recepció"
 
-#: src/messageview.c:2003
+#: src/messageview.c:2000
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8062,7 +8062,7 @@ msgstr ""
 "Aquest missatge s'ha descarregat parcialment,\n"
 "i s'ha esborrat del servidor."
 
-#: src/messageview.c:2009
+#: src/messageview.c:2006
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8071,15 +8071,15 @@ msgstr ""
 "Aquest missatge s'ha obtingut parcialment;\n"
 "és de %s."
 
-#: src/messageview.c:2013 src/messageview.c:2035
+#: src/messageview.c:2010 src/messageview.c:2032
 msgid "Mark for download"
 msgstr "Marca per descarregar"
 
-#: src/messageview.c:2014 src/messageview.c:2026
+#: src/messageview.c:2011 src/messageview.c:2023
 msgid "Mark for deletion"
 msgstr "Marca per esborrar"
 
-#: src/messageview.c:2019
+#: src/messageview.c:2016
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8089,12 +8089,12 @@ msgstr ""
 "és de %s i es descarregarà."
 
 # RML To be consistent with previous one.
-#: src/messageview.c:2024 src/messageview.c:2037
+#: src/messageview.c:2021 src/messageview.c:2034
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Desmarca"
 
-#: src/messageview.c:2030
+#: src/messageview.c:2027
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8103,11 +8103,11 @@ msgstr ""
 "Aquest missatge s'ha obtingut parcialment;\n"
 "és de %s i s'esborrarà."
 
-#: src/messageview.c:2103
+#: src/messageview.c:2100
 msgid "Return Receipt Notification"
 msgstr "Notificació de justificant de recepció"
 
-#: src/messageview.c:2104
+#: src/messageview.c:2101
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8119,19 +8119,19 @@ msgstr ""
 "Si us plau, escolliu el compte que voleu utilitzar per fer l'enviament de la "
 "notificació de recepció:"
 
-#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/messageview.c:2108
+#: src/messageview.c:2105
 msgid "_Send Notification"
 msgstr "_Envia la notificació"
 
-#: src/messageview.c:2197
+#: src/messageview.c:2194
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No es pot imprimit: el missatge no conté text."
 
-#: src/messageview.c:2959
+#: src/messageview.c:2956
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8139,7 +8139,7 @@ msgstr ""
 "\n"
 "  No hi ha missatges en aquesta carpeta"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2964
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8147,7 +8147,7 @@ msgstr ""
 "\n"
 "  El missatge s'ha esborrat"
 
-#: src/messageview.c:2968
+#: src/messageview.c:2965
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8155,7 +8155,7 @@ msgstr ""
 "\n"
 "  El missatge ha estat esborrat o mogut a una altra carpeta."
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
+#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "S'ha produït un error mentre s'aprenia.\n"
diff --git a/po/cs.po b/po/cs.po
index 0dc3773..ababd9e 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-08-18 23:19+0200\n"
+"POT-Creation-Date: 2016-08-01 21:41+0100\n"
 "PO-Revision-Date: 2016-08-03 17:49+0200\n"
 "Last-Translator: David Vachulka <david at konstrukce-cad.com>\n"
 "Language-Team: Czech <cs at li.org>\n"
@@ -3749,12 +3749,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:1019 src/imap.c:4639
+#: src/folderview.c:1019 src/imap.c:4641
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prohledávám složku %s/%s..."
 
-#: src/folderview.c:1022 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prohledávám složku %s..."
@@ -5776,8 +5776,8 @@ msgstr "Připojení k %s selhalo"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojení s %s bylo rozpojeno. Obnovuji spojení...\n"
 
-#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 src/imap.c:5431
+#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
+#: src/imap.c:4622 src/imap.c:5433
 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."
@@ -5818,85 +5818,85 @@ msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4110
+#: src/imap.c:1255 src/imap.c:4112
 msgid "Can't start TLS session.\n"
 msgstr "Nelze spustit TLS relaci.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1324
 #, 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:1325
+#: src/imap.c:1327
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s."
 
-#: src/imap.c:1752
+#: src/imap.c:1754
 msgid "Adding messages..."
 msgstr "Přidávám zprávy..."
 
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1959 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopíruji zprávy..."
 
-#: src/imap.c:2550
+#: src/imap.c:2552
 msgid "can't set deleted flags\n"
 msgstr "nelze nastavit příznak odstranění\n"
 
-#: src/imap.c:2557 src/imap.c:5061
+#: src/imap.c:2559 src/imap.c:5063
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: src/imap.c:2908
+#: src/imap.c:2910
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Vyhledávám odhlášené složky v %s..."
 
-#: src/imap.c:2911
+#: src/imap.c:2913
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hledám podsložky %s..."
 
-#: src/imap.c:3229
+#: src/imap.c:3231
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit mailbox: selhal příkaz LIST\n"
 
-#: src/imap.c:3244
+#: src/imap.c:3246
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit mailbox\n"
 
-#: src/imap.c:3375
+#: src/imap.c:3377
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat mailbox: %s na %s\n"
 
-#: src/imap.c:3488
+#: src/imap.c:3490
 msgid "can't delete mailbox\n"
 msgstr "nelze odstranit mailbox\n"
 
-#: src/imap.c:3767
+#: src/imap.c:3769
 msgid "LIST failed\n"
 msgstr "LIST selhal\n"
 
-#: src/imap.c:3852
+#: src/imap.c:3854
 msgid "Flagging messages..."
 msgstr "Označuji zprávy..."
 
-#: src/imap.c:3955
+#: src/imap.c:3957
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: src/imap.c:4107
+#: src/imap.c:4109
 msgid "Server requires TLS to log in.\n"
 msgstr "Server vyžeduje TLS pro přihlášení.\n"
 
-#: src/imap.c:4117
+#: src/imap.c:4119
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodařilo se načíst údaje o schopnostech serveru IMAP.\n"
 
-#: src/imap.c:4122
+#: src/imap.c:4124
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5905,20 +5905,20 @@ msgstr ""
 "Připojení k %s selhalo: server požaduje TLS, ale Claws Mail je zkompilován "
 "bez podpory TLS.\n"
 
-#: src/imap.c:4130
+#: src/imap.c:4132
 msgid "Server logins are disabled.\n"
 msgstr "Přihlašování k serveru je mimo provoz.\n"
 
-#: src/imap.c:4353
+#: src/imap.c:4355
 msgid "Fetching message..."
 msgstr "Stahuji zprávu..."
 
-#: src/imap.c:5054
+#: src/imap.c:5056
 #, 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:6091
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -7855,7 +7855,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:1855 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Přepsat"
@@ -7905,7 +7905,7 @@ msgstr "Hledání ukončeno"
 msgid "Compose _new message"
 msgstr "_Napsat novou zprávu"
 
-#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
+#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Náhled zprávy"
 
@@ -7943,64 +7943,64 @@ msgstr ""
 "'Komu:' a 'Kopie:' nejste oficiálním adresátem.\n"
 "Doporučuje se neodesílat potvrzení o doručení."
 
-#: src/messageview.c:1376
+#: src/messageview.c:1373
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Přijímaní zprávy (%s)..."
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1409 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nepodařilo se rozšifrovat: %s"
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: src/messageview.c:1490 src/messageview.c:1498
 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:1847 src/messageview.c:1850 src/mimeview.c:1995
+#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: src/messageview.c:1856
+#: src/messageview.c:1853
 msgid "Overwrite existing file?"
 msgstr "Přepsat existující soubor?"
 
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:1917
+#: src/messageview.c:1914
 #, c-format
 msgid "Show all %s."
 msgstr "Zobrazit všechny %s."
 
-#: src/messageview.c:1919
+#: src/messageview.c:1916
 msgid "Only the first megabyte of text is shown."
 msgstr "Je zobrazen jen první megabyte textu."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1947
 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:1953
+#: src/messageview.c:1950
 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:1959
+#: src/messageview.c:1956
 msgid "This message asks for a return receipt."
 msgstr "Tato zpráva vyžaduje potvrzení o duručení."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1957
 msgid "Send receipt"
 msgstr "Odeslat potvrzení"
 
-#: src/messageview.c:2003
+#: src/messageview.c:2000
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8008,7 +8008,7 @@ msgstr ""
 "Tato zpráva byla částečně stažena\n"
 "a byla odstraněna ze serveru."
 
-#: src/messageview.c:2009
+#: src/messageview.c:2006
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8017,15 +8017,15 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s."
 
-#: src/messageview.c:2013 src/messageview.c:2035
+#: src/messageview.c:2010 src/messageview.c:2032
 msgid "Mark for download"
 msgstr "Označit ke stažení"
 
-#: src/messageview.c:2014 src/messageview.c:2026
+#: src/messageview.c:2011 src/messageview.c:2023
 msgid "Mark for deletion"
 msgstr "Označit k odstranění"
 
-#: src/messageview.c:2019
+#: src/messageview.c:2016
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8034,12 +8034,12 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude stažena úplně."
 
-#: src/messageview.c:2024 src/messageview.c:2037
+#: src/messageview.c:2021 src/messageview.c:2034
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Odoznačit"
 
-#: src/messageview.c:2030
+#: src/messageview.c:2027
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8048,11 +8048,11 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude odstraněna."
 
-#: src/messageview.c:2103
+#: src/messageview.c:2100
 msgid "Return Receipt Notification"
 msgstr "Oznámení o doručení"
 
-#: src/messageview.c:2104
+#: src/messageview.c:2101
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8062,19 +8062,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:2108 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/messageview.c:2108
+#: src/messageview.c:2105
 msgid "_Send Notification"
 msgstr "_Odeslat oznámení"
 
-#: src/messageview.c:2197
+#: src/messageview.c:2194
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nemohu tisknout: zpráva neobsahuje text."
 
-#: src/messageview.c:2959
+#: src/messageview.c:2956
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8082,7 +8082,7 @@ msgstr ""
 "\n"
 "  Ve složce nejsou žádné zprávy"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2964
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8090,7 +8090,7 @@ msgstr ""
 "\n"
 "  Zpráva smazána"
 
-#: src/messageview.c:2968
+#: src/messageview.c:2965
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8098,7 +8098,7 @@ msgstr ""
 "\n"
 "  Zpráva byla smazána nebo přesunuta do jiné složky"
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
+#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Během učení došlo k chybě.\n"
diff --git a/po/da.po b/po/da.po
index 7012846..5207e7f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.14.0git152\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-18 23:19+0200\n"
+"POT-Creation-Date: 2016-08-02 15:02+0200\n"
 "PO-Revision-Date: 2016-08-01 08:27+0200\n"
 "Last-Translator: Erik P. Olsen <erik at epo.dk>\n"
 "Language-Team: dansk <>\n"
@@ -1089,24 +1089,24 @@ msgstr "Der er ingen SMTP AUTH metode tilgængelig\n"
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Den valgte SMTP AUTH metode var ikke tilgængelig\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:505 src/common/smtp.c:559
 msgid "bad SMTP response\n"
 msgstr "ugyldig SMTP svar\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:530 src/common/smtp.c:548 src/common/smtp.c:662
 msgid "error occurred on SMTP session\n"
 msgstr "der opstod fejl under SMTP sessionen\n"
 
-#: src/common/smtp.c:535 src/pop.c:905
+#: src/common/smtp.c:539 src/pop.c:905
 msgid "error occurred on authentication\n"
 msgstr "der opstod fejl under godkendelse\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:589
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Meddelelsen er for stor (maksimum er %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:898
+#: src/common/smtp.c:621 src/pop.c:898
 msgid "couldn't start TLS session\n"
 msgstr "kunne ikke starte TLS session\n"
 
@@ -3733,12 +3733,12 @@ msgstr "Skal al post i denne mappe virkelig markeres som læst?"
 msgid "Mark all as read"
 msgstr "Markér alt som læst"
 
-#: src/folderview.c:1019 src/imap.c:4639
+#: src/folderview.c:1019 src/imap.c:4641
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Skanner mappe %s/%s..."
 
-#: src/folderview.c:1022 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Skanner mappen %s..."
@@ -3816,7 +3816,7 @@ msgstr "Send alle meddelelser i køen"
 msgid "Some errors occurred while sending queued messages."
 msgstr "Der opstod nogle fejl under afsendelse af meddelelser fra køen."
 
-#: src/folderview.c:2456 src/main.c:2743 src/toolbar.c:2650
+#: src/folderview.c:2456 src/main.c:2742 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4143,44 +4143,44 @@ msgstr ""
 "En kopi af \"GNU General Public License\" burde være modtaget sammen med "
 "dette program. Hvis ikke, se "
 
-#: src/gtk/about.c:698 src/main.c:2567
+#: src/gtk/about.c:698 src/main.c:2566
 msgid "Session statistics\n"
 msgstr "Session-statistikker\n"
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2577 src/main.c:2580
+#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2576 src/main.c:2579
 #, c-format
 msgid "Started: %s\n"
 msgstr "Startet: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2586
+#: src/gtk/about.c:718 src/main.c:2585
 msgid "Incoming traffic\n"
 msgstr "Indkommende trafik\n"
 
-#: src/gtk/about.c:721 src/main.c:2589
+#: src/gtk/about.c:721 src/main.c:2588
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Modtaget meddelelser: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2595
+#: src/gtk/about.c:728 src/main.c:2594
 msgid "Outgoing traffic\n"
 msgstr "Udgående trafik\n"
 
-#: src/gtk/about.c:731 src/main.c:2598
+#: src/gtk/about.c:731 src/main.c:2597
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nye/omdirigerede meddelelser: %d\n"
 
-#: src/gtk/about.c:736 src/main.c:2602
+#: src/gtk/about.c:736 src/main.c:2601
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Besvarede meddelelser: %d\n"
 
-#: src/gtk/about.c:741 src/main.c:2606
+#: src/gtk/about.c:741 src/main.c:2605
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Videresendte meddelelser: %d\n"
 
-#: src/gtk/about.c:746 src/main.c:2610
+#: src/gtk/about.c:746 src/main.c:2609
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "I alt udgående meddelelser: %d\n"
@@ -5763,8 +5763,8 @@ msgstr "Fejl ved forbindelsen til %s"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 forbindelsen til %s er blevet afbrudt. Forbinder igen...\n"
 
-#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 src/imap.c:5431
+#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
+#: src/imap.c:4622 src/imap.c:5433
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail behøver netadgang for at kunne få adgang til IMAP-serveren."
 
@@ -5805,85 +5805,85 @@ msgstr "Kan ikke forbinde til IMAP4 server: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan ikke forbinde til IMAP4 server: %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4110
+#: src/imap.c:1255 src/imap.c:4112
 msgid "Can't start TLS session.\n"
 msgstr "Kan ikke starte TLS session.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1324
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kunne ikke logge ind til IMAP server %s.\n"
 
-#: src/imap.c:1325
+#: src/imap.c:1327
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kunne ikke logge ind til IMAP server %s."
 
-#: src/imap.c:1752
+#: src/imap.c:1754
 msgid "Adding messages..."
 msgstr "Tilføjer meddelelse..."
 
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1959 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopieret meddelelser..."
 
-#: src/imap.c:2550
+#: src/imap.c:2552
 msgid "can't set deleted flags\n"
 msgstr "kan ikke sætte sletteflag\n"
 
-#: src/imap.c:2557 src/imap.c:5061
+#: src/imap.c:2559 src/imap.c:5063
 msgid "can't expunge\n"
 msgstr "kan ikke tømme\n"
 
-#: src/imap.c:2908
+#: src/imap.c:2910
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Søger efter opsagte mapper i %s..."
 
-#: src/imap.c:2911
+#: src/imap.c:2913
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Søger efter undermapper til %s..."
 
-#: src/imap.c:3229
+#: src/imap.c:3231
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke oprette postkasse: Fejl i LIST\n"
 
-#: src/imap.c:3244
+#: src/imap.c:3246
 msgid "can't create mailbox\n"
 msgstr "kan ikke oprette postkasse\n"
 
-#: src/imap.c:3375
+#: src/imap.c:3377
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke omdøbe postkasse: %s til %s\n"
 
-#: src/imap.c:3488
+#: src/imap.c:3490
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette postkasse\n"
 
-#: src/imap.c:3767
+#: src/imap.c:3769
 msgid "LIST failed\n"
 msgstr "Der opstod fejl i LIST\n"
 
-#: src/imap.c:3852
+#: src/imap.c:3854
 msgid "Flagging messages..."
 msgstr "Sætter meddelelsesflag..."
 
-#: src/imap.c:3955
+#: src/imap.c:3957
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke vælge mappe: %s\n"
 
-#: src/imap.c:4107
+#: src/imap.c:4109
 msgid "Server requires TLS to log in.\n"
 msgstr "Server kræver TLS for logind.\n"
 
-#: src/imap.c:4117
+#: src/imap.c:4119
 msgid "Can't refresh capabilities.\n"
 msgstr "kan ikke genopfriske mulighederne.\n"
 
-#: src/imap.c:4122
+#: src/imap.c:4124
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5892,20 +5892,20 @@ msgstr ""
 "der opstod fejl i forbindelsen til %s: serveren kræver TLS, men Claws Mail "
 "er oversat uden TLS støtte.\n"
 
-#: src/imap.c:4130
+#: src/imap.c:4132
 msgid "Server logins are disabled.\n"
 msgstr "Server logind er deaktiveret.\n"
 
-#: src/imap.c:4353
+#: src/imap.c:4355
 msgid "Fetching message..."
 msgstr "Henter meddelelse..."
 
-#: src/imap.c:5054
+#: src/imap.c:5056
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan ikke sætte sletteflag: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6091
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6321,7 +6321,7 @@ msgstr "Færdig (Ingen ny meddelelse)"
 msgid "Connection failed"
 msgstr "Der opstod fejl i forbindelsen"
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:886
+#: src/inc.c:649 src/plugins/managesieve/managesieve.c:891
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
@@ -6365,7 +6365,7 @@ msgstr "Kan ikke forbinde til POP3 server: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan ikke forbinde til POP3 server: %s:%d\n"
 
-#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
+#: src/inc.c:927 src/plugins/managesieve/managesieve.c:428
 #: src/send_message.c:496
 msgid "Authenticating..."
 msgstr "Godkender..."
@@ -6604,7 +6604,7 @@ msgstr[1] ""
 "konfigurationer for mere information:\n"
 "%s"
 
-#: src/main.c:1499
+#: src/main.c:1498
 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 "
@@ -6614,7 +6614,7 @@ msgstr ""
 "muligvis pga en fejlende IMAP konto. Brug \"Genopret mappetræ\" fra "
 "kontekstmenuen i postkassens forældermappe for at prøve at rette det."
 
-#: src/main.c:1505
+#: src/main.c:1504
 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 "
@@ -6624,36 +6624,36 @@ msgstr ""
 "Det skyldes sandsynligvis et forældet eksternt udvidelsesmodul. Geninstallér "
 "modulet og prøv igen."
 
-#: src/main.c:1750
+#: src/main.c:1749
 msgid "Missing filename\n"
 msgstr "Manglende filnavn\n"
 
-#: src/main.c:1757
+#: src/main.c:1756
 msgid "Cannot open filename for reading\n"
 msgstr "Kan ikke åbne filnavn for læsning\n"
 
-#: src/main.c:1768
+#: src/main.c:1767
 msgid "Malformed header\n"
 msgstr "Misdannet posthoved\n"
 
-#: src/main.c:1775
+#: src/main.c:1774
 msgid "Duplicated 'To:' header\n"
 msgstr "Dubleret 'Til:' posthoved\n"
 
-#: src/main.c:1786
+#: src/main.c:1785
 msgid "Missing required 'To:' header\n"
 msgstr "'Til:' posthoved mangler\n"
 
-#: src/main.c:1929
+#: src/main.c:1928
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Brug: %s [OPTION]...\n"
 
-#: src/main.c:1931
+#: src/main.c:1930
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    åbn redigeringsvinduet"
 
-#: src/main.c:1932
+#: src/main.c:1931
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6673,11 +6673,11 @@ msgstr ""
 "                         tom linje, derpå meddelelsesteksten indtil "
 "filafslutning."
 
-#: src/main.c:1937
+#: src/main.c:1936
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      abonnér på den givne URI hvis muligt"
 
-#: src/main.c:1938
+#: src/main.c:1937
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6687,23 +6687,23 @@ msgstr ""
 "                          åbn redigeringsvinduet med de angivne filer\n"
 "                          vedhæftet"
 
-#: src/main.c:1941
+#: src/main.c:1940
 msgid "  --receive              receive new messages"
 msgstr "  --receive              hent nye meddelelser"
 
-#: src/main.c:1942
+#: src/main.c:1941
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          hent nye meddelelser for alle konti"
 
-#: src/main.c:1943
+#: src/main.c:1942
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     annullér hentning af meddelelser"
 
-#: src/main.c:1944
+#: src/main.c:1943
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       annullér afsendelse af meddelelser"
 
-#: src/main.c:1945
+#: src/main.c:1944
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6723,15 +6723,15 @@ msgstr ""
 "                         recursivt: falsk, hvis argument begynder med 0, n, "
 "N, f eller F"
 
-#: src/main.c:1952
+#: src/main.c:1951
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 send alle meddelelser i køen"
 
-#: src/main.c:1953
+#: src/main.c:1952
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappe]...   vis det totale antal af meddelelser"
 
-#: src/main.c:1954
+#: src/main.c:1953
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6739,15 +6739,15 @@ msgstr ""
 "  --status-full [mappe]...\n"
 "                         vis status for hver mappe"
 
-#: src/main.c:1956
+#: src/main.c:1955
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           vis sessionsstatistikker"
 
-#: src/main.c:1957
+#: src/main.c:1956
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     nulstil sessionsstatistikker"
 
-#: src/main.c:1958
+#: src/main.c:1957
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6756,35 +6756,35 @@ msgstr ""
 "                          går til den anførte mappe/meddelelse\n"
 "                          mappe er en mappe-ID som f.eks. 'mappe/under_mappe'"
 
-#: src/main.c:1960
+#: src/main.c:1959
 msgid "  --online               switch to online mode"
 msgstr "  --online              skifter til online tilstand"
 
-#: src/main.c:1961
+#: src/main.c:1960
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline             skifter til offline tilstand"
 
-#: src/main.c:1962
+#: src/main.c:1961
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q      afslut Claus Mail"
 
-#: src/main.c:1963
+#: src/main.c:1962
 msgid "  --debug                debug mode"
 msgstr "  --debug               fejlsøgningstilstand"
 
-#: src/main.c:1964
+#: src/main.c:1963
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug        slå fejlsøgningstilstand til/fra"
 
-#: src/main.c:1965
+#: src/main.c:1964
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h             vis hjælp og afslut"
 
-#: src/main.c:1966
+#: src/main.c:1965
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v          vis versionsinformation og afslut"
 
-#: src/main.c:1967
+#: src/main.c:1966
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6792,11 +6792,11 @@ msgstr ""
 "  --version-full -V      vis information om version og indbyggede funktioner "
 "og afslut"
 
-#: src/main.c:1968
+#: src/main.c:1967
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir          vis konfigurationsmappen"
 
-#: src/main.c:1969
+#: src/main.c:1968
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6804,7 +6804,7 @@ msgstr ""
 "  --alternate-config-dir [mappe]\n"
 "                         brug anførte konfigurationsmappe"
 
-#: src/main.c:1971
+#: src/main.c:1970
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6812,32 +6812,32 @@ msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         sæt geometrien for hovedvinduet"
 
-#: src/main.c:2024
+#: src/main.c:2023
 msgid "Unknown option\n"
 msgstr "Ukendt valgmulighed\n"
 
-#: src/main.c:2042
+#: src/main.c:2041
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Behandler (%s)..."
 
-#: src/main.c:2045
+#: src/main.c:2044
 msgid "top level folder"
 msgstr "topniveaumappe"
 
-#: src/main.c:2128
+#: src/main.c:2127
 msgid "Queued messages"
 msgstr "Meddelelser i kø"
 
-#: src/main.c:2129
+#: src/main.c:2128
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nogle usendte meddelelser er sat i kø. Vil du afslutte nu?"
 
-#: src/main.c:2871
+#: src/main.c:2870
 msgid "NetworkManager: network is online.\n"
 msgstr "Netværkshåndtering: netværk online.\n"
 
-#: src/main.c:2877
+#: src/main.c:2876
 msgid "NetworkManager: network is offline.\n"
 msgstr "Netværkshåndtering: netværk offline.\n"
 
@@ -7833,7 +7833,7 @@ msgstr "Overskriv mbox-fil"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Denne fil eksisterer allerede. Skal den overskrives?"
 
-#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Overskriv"
@@ -7883,7 +7883,7 @@ msgstr "Søgning afsluttet"
 msgid "Compose _new message"
 msgstr "Skriv _ny meddelelse"
 
-#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
+#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Meddelelsesoversigt"
 
@@ -7922,67 +7922,67 @@ msgstr ""
 "officielt adresseret til dig.\n"
 "Det anbefales ikke at sende returkvittering."
 
-#: src/messageview.c:1376
+#: src/messageview.c:1373
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Henter meddelelse (%s)..."
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1409 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Kunne ikke dekryptere: %s"
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: src/messageview.c:1490 src/messageview.c:1498
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Meddelelse stemmer ikke overens med MIME standard. Den gengives måske "
 "forkert."
 
-#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
+#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Gem som"
 
-#: src/messageview.c:1856
+#: src/messageview.c:1853
 msgid "Overwrite existing file?"
 msgstr "Skal eksisterende fil overskrives?"
 
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kunne ikke gemme filen '%s'."
 
-#: src/messageview.c:1917
+#: src/messageview.c:1914
 #, c-format
 msgid "Show all %s."
 msgstr "Vis alle %s."
 
-#: src/messageview.c:1919
+#: src/messageview.c:1916
 msgid "Only the first megabyte of text is shown."
 msgstr "Kun den første megabyte tekst vises"
 
-#: src/messageview.c:1950
+#: src/messageview.c:1947
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr ""
 "Der kom en returkvittering for denne meddelelse: Den blev set af modtageren."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1950
 msgid "You asked for a return receipt in this message."
 msgstr "Du anmodede om returkvittering i denne meddelelse."
 
-#: src/messageview.c:1959
+#: src/messageview.c:1956
 msgid "This message asks for a return receipt."
 msgstr "Denne meddelelse anmoder om returnkvittering."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1957
 msgid "Send receipt"
 msgstr "Send kvittering"
 
-#: src/messageview.c:2003
+#: src/messageview.c:2000
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7990,7 +7990,7 @@ msgstr ""
 "Denne meddelelse blev kun delvist hentet,\n"
 "og blev slettet på serveren."
 
-#: src/messageview.c:2009
+#: src/messageview.c:2006
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7999,15 +7999,15 @@ msgstr ""
 "Denne meddelelse blev kun delvist hentet;\n"
 "det drejer sig om %s."
 
-#: src/messageview.c:2013 src/messageview.c:2035
+#: src/messageview.c:2010 src/messageview.c:2032
 msgid "Mark for download"
 msgstr "Markér for hentning"
 
-#: src/messageview.c:2014 src/messageview.c:2026
+#: src/messageview.c:2011 src/messageview.c:2023
 msgid "Mark for deletion"
 msgstr "Markér for sletning"
 
-#: src/messageview.c:2019
+#: src/messageview.c:2016
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8016,12 +8016,12 @@ msgstr ""
 "Denne meddelelse blev kun delvist hentet;\n"
 "det drejer sig om %s og vil blive helt hentet."
 
-#: src/messageview.c:2024 src/messageview.c:2037
+#: src/messageview.c:2021 src/messageview.c:2034
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Fjern markering"
 
-#: src/messageview.c:2030
+#: src/messageview.c:2027
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8030,11 +8030,11 @@ msgstr ""
 "Denne meddelelse blev kun delvist hentet;\n"
 "det drejer sig om %s og vil blive slettet."
 
-#: src/messageview.c:2103
+#: src/messageview.c:2100
 msgid "Return Receipt Notification"
 msgstr "Besked om returkvittering"
 
-#: src/messageview.c:2104
+#: src/messageview.c:2101
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8045,19 +8045,19 @@ msgstr ""
 "sendt til.\n"
 "Vælg konto for hvilken der skal sendes besked om modtagelse:"
 
-#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Annullér"
 
-#: src/messageview.c:2108
+#: src/messageview.c:2105
 msgid "_Send Notification"
 msgstr "_Send besked"
 
-#: src/messageview.c:2197
+#: src/messageview.c:2194
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan ikke udskrive: meddelelsen indeholder ikke tekst."
 
-#: src/messageview.c:2959
+#: src/messageview.c:2956
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8065,7 +8065,7 @@ msgstr ""
 "\n"
 "  Der er ingen meddelelser i denne mappe"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2964
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8073,7 +8073,7 @@ msgstr ""
 "\n"
 "  Meddelelse blev slettet"
 
-#: src/messageview.c:2968
+#: src/messageview.c:2965
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8081,7 +8081,7 @@ msgstr ""
 "\n"
 "  Meddelelsen blev slettet eller flyttet til en anden mappe"
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
+#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Der opstod en fejl under læring.\n"
@@ -8372,46 +8372,6 @@ msgstr "Aflys nyhedsgruppe"
 msgid "Rename newsgroup folder"
 msgstr "Omdøb nyhedsgruppemappe"
 
-#: src/password.c:128 src/password.c:129
-msgid "Input master passphrase"
-msgstr "Indtast masterløsen"
-
-#: src/password.c:141
-msgid "Incorrect master passphrase."
-msgstr "Ukorrekt masterløsen."
-
-#: src/password_gtk.c:67
-msgid "New passphrases do not match, try again."
-msgstr "Ingen match for nye løsener, prøv igen."
-
-#: src/password_gtk.c:80
-msgid "Incorrect old master passphrase entered, try again."
-msgstr "Ukorrekt gammelt masterløsen indtastet, prøv igen."
-
-#: src/password_gtk.c:144
-msgid "Changing master passphrase"
-msgstr "Skifter masterløsen"
-
-#: src/password_gtk.c:165
-msgid ""
-"If a master passphrase is currently active, it\n"
-"needs to be entered."
-msgstr ""
-"Hvis et masterløsen i øjeblikket er aktivt,\n"
-"skal det indtastet."
-
-#: src/password_gtk.c:175
-msgid "Old passphrase:"
-msgstr "Gammelt løsen:"
-
-#: src/password_gtk.c:191
-msgid "New passphrase:"
-msgstr "Nyt løsen:"
-
-#: src/password_gtk.c:202
-msgid "Confirm passphrase:"
-msgstr "Bekræft løsenet:"
-
 #: src/plugins/acpi_notifier/acpi_notifier.c:51
 msgid "Acpi Notifier"
 msgstr "Acpi informatør"
@@ -10477,56 +10437,56 @@ msgstr ""
 "Alle mapper og meddelelser under '%s' slettes.\n"
 "Skal de virkelig slettes?"
 
-#: src/plugins/managesieve/managesieve.c:435
+#: src/plugins/managesieve/managesieve.c:440
 msgid "No Sieve auth method available\n"
 msgstr "Sieve metode til godkendelse er ikke tilgængelig\n"
 
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:444
 msgid "Selected Sieve auth method not available\n"
 msgstr "Den valgte Sieve metode til godkendelse er ikke tilgængelig\n"
 
-#: src/plugins/managesieve/managesieve.c:672
+#: src/plugins/managesieve/managesieve.c:677
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:681
 #, c-format
 msgid "Disconnected: %s"
 msgstr "Frakoblet: %s"
 
-#: src/plugins/managesieve/managesieve.c:724
-#: src/plugins/managesieve/managesieve.c:869
+#: src/plugins/managesieve/managesieve.c:729
+#: src/plugins/managesieve/managesieve.c:874
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "Uhåndteret meddelelse i Sieve session: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:731
+#: src/plugins/managesieve/managesieve.c:736
 msgid "TLS failed"
 msgstr "TLS mislykkedes"
 
-#: src/plugins/managesieve/managesieve.c:796
-#: src/plugins/managesieve/managesieve.c:812
-#: src/plugins/managesieve/managesieve.c:839
-#: src/plugins/managesieve/managesieve.c:921
-#: src/plugins/managesieve/managesieve.c:939
+#: src/plugins/managesieve/managesieve.c:801
+#: src/plugins/managesieve/managesieve.c:817
+#: src/plugins/managesieve/managesieve.c:844
+#: src/plugins/managesieve/managesieve.c:926
+#: src/plugins/managesieve/managesieve.c:944
 msgid "error occurred on SIEVE session\n"
 msgstr "Der opstod en fejl i SIEVE sessionen\n"
 
-#: src/plugins/managesieve/managesieve.c:865
+#: src/plugins/managesieve/managesieve.c:870
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "Der opstod en fejl i SIEVE sessionen. data: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:874
+#: src/plugins/managesieve/managesieve.c:879
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "Uhåndteret meddelelse i Sieve session: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1131
+#: src/plugins/managesieve/managesieve.c:1136
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: prøver godkendelse igen\n"
 
-#: src/plugins/managesieve/managesieve.c:1133
+#: src/plugins/managesieve/managesieve.c:1138
 msgid "Auth method not available"
 msgstr "Godkendelsesmetode er ikke tilgængelig"
 
@@ -16243,31 +16203,6 @@ msgstr "Opfat disse tegn som anførselstegn:"
 msgid "Text Options"
 msgstr "Tekstvalg"
 
-#: src/prefs_migration.c:95
-#, c-format
-msgid ""
-"Your Claws Mail configuration is from a newer version than the version which "
-"you are currently using.\n"
-"\n"
-"This is not recommended.\n"
-"\n"
-"For further information see the %sClaws Mail website%s.\n"
-"\n"
-"Do you want to exit now?"
-msgstr ""
-"Din Claws Mail konfiguration er fra en nyere version end den version, som du "
-"bruger i øjeblikket.\n"
-"\n"
-"Dette kan ikke anbefales.\n"
-"\n"
-"For yderligere oplysninger se %snetsiderne for Claws Mail%s.\n"
-"\n"
-"Vil du afslutte nu?"
-
-#: src/prefs_migration.c:104
-msgid "Configuration warning"
-msgstr "Konfigurationsadvarsel"
-
 #: src/prefs_msg_colors.c:147
 msgid "Message view"
 msgstr "Meddelelsesvisning"
@@ -19166,6 +19101,59 @@ msgstr ""
 "Claws Mail er nu klart til brug.\n"
 "Klik Gem for at begynde."
 
+#~ msgid "Input master passphrase"
+#~ msgstr "Indtast masterløsen"
+
+#~ msgid "Incorrect master passphrase."
+#~ msgstr "Ukorrekt masterløsen."
+
+#~ msgid "New passphrases do not match, try again."
+#~ msgstr "Ingen match for nye løsener, prøv igen."
+
+#~ msgid "Incorrect old master passphrase entered, try again."
+#~ msgstr "Ukorrekt gammelt masterløsen indtastet, prøv igen."
+
+#~ msgid "Changing master passphrase"
+#~ msgstr "Skifter masterløsen"
+
+#~ msgid ""
+#~ "If a master passphrase is currently active, it\n"
+#~ "needs to be entered."
+#~ msgstr ""
+#~ "Hvis et masterløsen i øjeblikket er aktivt,\n"
+#~ "skal det indtastet."
+
+#~ msgid "Old passphrase:"
+#~ msgstr "Gammelt løsen:"
+
+#~ msgid "New passphrase:"
+#~ msgstr "Nyt løsen:"
+
+#~ msgid "Confirm passphrase:"
+#~ msgstr "Bekræft løsenet:"
+
+#~ msgid ""
+#~ "Your Claws Mail configuration is from a newer version than the version "
+#~ "which you are currently using.\n"
+#~ "\n"
+#~ "This is not recommended.\n"
+#~ "\n"
+#~ "For further information see the %sClaws Mail website%s.\n"
+#~ "\n"
+#~ "Do you want to exit now?"
+#~ msgstr ""
+#~ "Din Claws Mail konfiguration er fra en nyere version end den version, som "
+#~ "du bruger i øjeblikket.\n"
+#~ "\n"
+#~ "Dette kan ikke anbefales.\n"
+#~ "\n"
+#~ "For yderligere oplysninger se %snetsiderne for Claws Mail%s.\n"
+#~ "\n"
+#~ "Vil du afslutte nu?"
+
+#~ msgid "Configuration warning"
+#~ msgstr "Konfigurationsadvarsel"
+
 #~ msgid "_Other folder..."
 #~ msgstr "_Anden mappe..."
 
diff --git a/po/de.po b/po/de.po
index 2377e92..8e1dfd2 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-08-18 23:19+0200\n"
+"POT-Creation-Date: 2016-08-07 08:48+0100\n"
 "PO-Revision-Date: 2016-07-13 06:45+0200\n"
 "Last-Translator: Thomas Bellmann <ThomasBellmann at gmx.net>\n"
 "Language-Team: Deutsch <>\n"
@@ -3783,12 +3783,12 @@ msgstr ""
 msgid "Mark all as read"
 msgstr "Alle als gelesen markieren"
 
-#: src/folderview.c:1019 src/imap.c:4639
+#: src/folderview.c:1019 src/imap.c:4641
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Ordner %s%s wird durchsucht..."
 
-#: src/folderview.c:1022 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Ordner %s wird durchsucht..."
@@ -5830,8 +5830,8 @@ msgstr "Verbindung zu %s schlug fehl"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 
-#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 src/imap.c:5431
+#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
+#: src/imap.c:4622 src/imap.c:5433
 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 "
@@ -5874,85 +5874,85 @@ msgstr "Keine Verbindung zum IMAP4-Server: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung zum IMAP4-Server: %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4110
+#: src/imap.c:1255 src/imap.c:4112
 msgid "Can't start TLS session.\n"
 msgstr "TLS-Sitzung konnte nicht gestartet werden.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1324
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Einloggen am IMAP-Server %s schlug fehl.\n"
 
-#: src/imap.c:1325
+#: src/imap.c:1327
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Einloggen am IMAP-Server %s schlug fehl."
 
-#: src/imap.c:1752
+#: src/imap.c:1754
 msgid "Adding messages..."
 msgstr "Nachrichten werden hinzugefügt..."
 
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1959 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert..."
 
-#: src/imap.c:2550
+#: src/imap.c:2552
 msgid "can't set deleted flags\n"
 msgstr "Gelöscht-Merker nicht setzbar\n"
 
-#: src/imap.c:2557 src/imap.c:5061
+#: src/imap.c:2559 src/imap.c:5063
 msgid "can't expunge\n"
 msgstr "Löschen schlug fehl\n"
 
-#: src/imap.c:2908
+#: src/imap.c:2910
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Suche nach nicht abonnierten Ordnern in %s..."
 
-#: src/imap.c:2911
+#: src/imap.c:2913
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Suche nach Unterordnern von %s..."
 
-#: src/imap.c:3229
+#: src/imap.c:3231
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Mailbox kann nicht erstellt werden: LIST schlug fehl\n"
 
-#: src/imap.c:3244
+#: src/imap.c:3246
 msgid "can't create mailbox\n"
 msgstr "Mailbox kann nicht erstellt werden\n"
 
-#: src/imap.c:3375
+#: src/imap.c:3377
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s kann nicht in %s umbenannt werden\n"
 
-#: src/imap.c:3488
+#: src/imap.c:3490
 msgid "can't delete mailbox\n"
 msgstr "Mailbox kann nicht gelöscht werden\n"
 
-#: src/imap.c:3767
+#: src/imap.c:3769
 msgid "LIST failed\n"
 msgstr "LIST schlug fehl\n"
 
-#: src/imap.c:3852
+#: src/imap.c:3854
 msgid "Flagging messages..."
 msgstr "Nachrichten-Merker setzen..."
 
-#: src/imap.c:3955
+#: src/imap.c:3957
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Ordner %s kann nicht ausgewählt werden\n"
 
-#: src/imap.c:4107
+#: src/imap.c:4109
 msgid "Server requires TLS to log in.\n"
 msgstr "Server erfordert TLS zum Einloggen.\n"
 
-#: src/imap.c:4117
+#: src/imap.c:4119
 msgid "Can't refresh capabilities.\n"
 msgstr "Ressourcen können nicht aktualisiert werden.\n"
 
-#: src/imap.c:4122
+#: src/imap.c:4124
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5961,20 +5961,20 @@ msgstr ""
 "Verbindung zu %s schlug fehl: Server erfordert TLS, aber Claws Mail wurde "
 "ohne TLS-Unterstützung kompiliert.\n"
 
-#: src/imap.c:4130
+#: src/imap.c:4132
 msgid "Server logins are disabled.\n"
 msgstr "Serverlogins sind deaktiviert.\n"
 
-#: src/imap.c:4353
+#: src/imap.c:4355
 msgid "Fetching message..."
 msgstr "Nachricht wird abgeholt..."
 
-#: src/imap.c:5054
+#: src/imap.c:5056
 #, 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:6091
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -7916,7 +7916,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:1855 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Überschreiben"
@@ -7966,7 +7966,7 @@ msgstr "Suche beendet"
 msgid "Compose _new message"
 msgstr "_Neue Nachricht verfassen"
 
-#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
+#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Nachrichtenansicht"
 
@@ -8005,48 +8005,48 @@ msgstr ""
 "offiziell an Sie adressiert.\n"
 "Es wird empfohlen, keine  Empfangsbestätigung zu senden."
 
-#: src/messageview.c:1376
+#: src/messageview.c:1373
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Nachricht (%s) wird abgeholt..."
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1409 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Entschlüsseln schlug fehl: %s"
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: src/messageview.c:1490 src/messageview.c:1498
 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:1847 src/messageview.c:1850 src/mimeview.c:1995
+#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Speichern als"
 
-#: src/messageview.c:1856
+#: src/messageview.c:1853
 msgid "Overwrite existing file?"
 msgstr "Existierende Datei überschreiben?"
 
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Datei '%s' konnte nicht gespeichert werden."
 
-#: src/messageview.c:1917
+#: src/messageview.c:1914
 #, c-format
 msgid "Show all %s."
 msgstr "Alle %s anzeigen."
 
-#: src/messageview.c:1919
+#: src/messageview.c:1916
 msgid "Only the first megabyte of text is shown."
 msgstr "Nur das erste Megabyte an Text wird angezeigt."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1947
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8054,19 +8054,19 @@ msgstr ""
 "Sie haben eine Empfangsbestätigung für diese Nachricht: Der Empfänger hat "
 "sie geöffnet."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1950
 msgid "You asked for a return receipt in this message."
 msgstr "Sie haben eine Empfangsbestätigung für diese Nachricht erbeten."
 
-#: src/messageview.c:1959
+#: src/messageview.c:1956
 msgid "This message asks for a return receipt."
 msgstr "Diese Nachricht erwartet eine Empfangsbestätigung."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1957
 msgid "Send receipt"
 msgstr "Bestätigung senden"
 
-#: src/messageview.c:2003
+#: src/messageview.c:2000
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8074,7 +8074,7 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen\n"
 "und auf dem Server gelöscht."
 
-#: src/messageview.c:2009
+#: src/messageview.c:2006
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8083,15 +8083,15 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß."
 
-#: src/messageview.c:2013 src/messageview.c:2035
+#: src/messageview.c:2010 src/messageview.c:2032
 msgid "Mark for download"
 msgstr "Zum Herunterladen markieren"
 
-#: src/messageview.c:2014 src/messageview.c:2026
+#: src/messageview.c:2011 src/messageview.c:2023
 msgid "Mark for deletion"
 msgstr "Zum Löschen markieren"
 
-#: src/messageview.c:2019
+#: src/messageview.c:2016
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8100,12 +8100,12 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß und wird heruntergeladen."
 
-#: src/messageview.c:2024 src/messageview.c:2037
+#: src/messageview.c:2021 src/messageview.c:2034
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Demarkieren"
 
-#: src/messageview.c:2030
+#: src/messageview.c:2027
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8114,11 +8114,11 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s und wird gelöscht werden."
 
-#: src/messageview.c:2103
+#: src/messageview.c:2100
 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 
-#: src/messageview.c:2104
+#: src/messageview.c:2101
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8130,19 +8130,19 @@ msgstr ""
 "Bitte wählen Sie, welches Konto Sie zum Senden der Empfangsbestätigung "
 "verwenden möchten:"
 
-#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/messageview.c:2108
+#: src/messageview.c:2105
 msgid "_Send Notification"
 msgstr "Benachrichtigung _senden"
 
-#: src/messageview.c:2197
+#: src/messageview.c:2194
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Drucken schlug fehl: Die Nachricht enthält keinen Text."
 
-#: src/messageview.c:2959
+#: src/messageview.c:2956
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8150,7 +8150,7 @@ msgstr ""
 "\n"
 "  Keine Nachrichten in diesem Ordner"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2964
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8158,7 +8158,7 @@ msgstr ""
 "\n"
 "  Nachricht wurde gelöscht"
 
-#: src/messageview.c:2968
+#: src/messageview.c:2965
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8166,7 +8166,7 @@ msgstr ""
 "\n"
 "  Nachricht wurde in den Papierkorb oder einen anderen Ordner verschoben"
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
+#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Beim Lernen ist ein Fehler aufgetreten.\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 181ddf4..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-08-18 23:19+0200\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,117 +19,117 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:396 src/account.c:463
+#: src/account.c: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:441
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr ""
 
-#: src/account.c:728
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr ""
 
-#: src/account.c:745
+#: 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:816
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr ""
 
-#: src/account.c:908
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 
-#: src/account.c:915
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr ""
 
-#: src/account.c:1075
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr ""
 
-#: src/account.c:1077
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr ""
 
-#: src/account.c:1078
+#: src/account.c:1074
 msgid "Delete account"
 msgstr ""
 
-#: src/account.c:1562
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr ""
 
-#: src/account.c:1568
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 
-#: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1264
-#: src/editaddress.c:1321 src/editaddress.c:1341
+#: 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
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
+#: 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:1803
-#: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
+#: src/plugins/pdf_viewer/poppler_viewer.c:1807
+#: 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 ""
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4128
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr ""
 
-#: src/account.c:1591 src/ssl_manager.c:100
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr ""
 
-#: src/action.c:382
+#: src/action.c:383
 #, c-format
 msgid "Could not get message file %d"
 msgstr ""
 
-#: src/action.c:419
+#: src/action.c:420
 msgid "Could not get message part."
 msgstr ""
 
-#: src/action.c:436
+#: src/action.c:437
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr ""
 
-#: src/action.c:608
+#: src/action.c:609
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
 "because it contains %%f, %%F, %%as or %%p."
 msgstr ""
 
-#: src/action.c:720
+#: src/action.c:721
 msgid "There is no filtering action set"
 msgstr ""
 
-#: src/action.c:722
+#: src/action.c:723
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
 "%s"
 msgstr ""
 
-#: src/action.c:987
+#: src/action.c:988
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -137,34 +137,34 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/action.c:989 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:884
+#: 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 ""
 
-#: src/action.c:1207 src/action.c:1372
+#: src/action.c:1208 src/action.c:1373
 msgid "Completed"
 msgstr ""
 
-#: src/action.c:1243
+#: src/action.c:1244
 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 
-#: src/action.c:1247
+#: src/action.c:1248
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 
-#: src/action.c:1280
+#: src/action.c:1281
 msgid "Action's input/output"
 msgstr ""
 
-#: src/action.c:1608
+#: src/action.c:1609
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -172,11 +172,11 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1613
+#: src/action.c:1614
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1617
+#: src/action.c:1618
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -184,7 +184,7 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1622
+#: src/action.c:1623
 msgid "Action's user argument"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr ""
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 
-#: src/addr_compl.c:689 src/addressbook.c:4946
+#: src/addr_compl.c:689 src/addressbook.c:4947
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr ""
@@ -332,7 +332,7 @@ msgid "Duplicate email addresses"
 msgstr ""
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:434
+#: src/plugins/pgpcore/select-keys.c:397 src/toolbar.c:434
 msgid "Address"
 msgstr ""
 
@@ -364,8 +364,8 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1056
-#: src/editaddress.c:1131 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1057
+#: src/editaddress.c:1132 src/editgroup.c:290
 msgid "Remarks"
 msgstr ""
 
@@ -373,16 +373,16 @@ msgstr ""
 msgid "Select Address Book Folder"
 msgstr ""
 
-#: src/addressadd.c:534 src/addressbook.c:3216 src/addressbook.c:3267
+#: src/addressadd.c:535 src/addressbook.c:3217 src/addressbook.c:3268
 msgid "Add address(es)"
 msgstr ""
 
-#: src/addressadd.c:535
+#: src/addressadd.c:536
 msgid "Can't add the specified address"
 msgstr ""
 
-#: src/addressbook.c:126 src/addressbook.c:4934 src/editaddress.c:1053
-#: src/editaddress.c:1114 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/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
 msgid "Email Address"
 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:586 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:591 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:592 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 ""
 
@@ -435,20 +435,20 @@ msgstr ""
 msgid "_Delete book"
 msgstr ""
 
-#: src/addressbook.c:427 src/compose.c:603
+#: 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
 msgid "_Save"
 msgstr ""
 
-#: src/addressbook.c:428 src/compose.c:607 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,13 +457,13 @@ msgid "C_ut"
 msgstr ""
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:615 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 ""
 
 #: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:616 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:617 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr ""
 
@@ -507,8 +507,8 @@ msgstr ""
 msgid "Edit custom attributes..."
 msgstr ""
 
-#: src/addressbook.c:458 src/compose.c:695 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 ""
 
@@ -517,10 +517,10 @@ msgid "_Browse Entry"
 msgstr ""
 
 #: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:143
-#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:682
-#: src/prefs_themes.c:714 src/prefs_themes.c:715
+#: 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/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:683
+#: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr ""
 
@@ -624,12 +624,12 @@ 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 ""
 
-#: src/addressbook.c:1112 src/editldap.c:780
+#: src/addressbook.c:1112 src/editldap.c:779
 msgid "Search"
 msgstr ""
 
@@ -651,152 +651,148 @@ msgstr ""
 msgid "Cannot paste into an address group."
 msgstr ""
 
-#: src/addressbook.c:2913
+#: src/addressbook.c:2914
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr ""
 
-#: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
+#: src/addressbook.c:2917 src/addressbook.c:2943 src/addressbook.c:2950
 #: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
 #: src/toolbar.c:415
 msgid "Delete"
 msgstr ""
 
-#: src/addressbook.c:2925
+#: src/addressbook.c:2926
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
 "contains will be moved into the parent folder."
 msgstr ""
 
-#: src/addressbook.c:2928 src/imap_gtk.c:360 src/mh_gtk.c:206
+#: 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 ""
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2930
 msgid "Delete _folder only"
 msgstr ""
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2930
 msgid "Delete folder and _addresses"
 msgstr ""
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2941
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2947
+#: src/addressbook.c:2948
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
 
-#: src/addressbook.c:3061
+#: src/addressbook.c:3062
 #, c-format
 msgid "Search '%s'"
 msgstr ""
 
-#: src/addressbook.c:3199 src/addressbook.c:3248
+#: src/addressbook.c:3200 src/addressbook.c:3249
 msgid "New Contacts"
 msgstr ""
 
-#: src/addressbook.c:4087
+#: src/addressbook.c:4088
 msgid "New user, could not save index file."
 msgstr ""
 
-#: src/addressbook.c:4091
+#: src/addressbook.c:4092
 msgid "New user, could not save address book files."
 msgstr ""
 
-#: src/addressbook.c:4101
+#: src/addressbook.c:4102
 msgid "Old address book converted successfully."
 msgstr ""
 
-#: src/addressbook.c:4106
+#: src/addressbook.c:4107
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4119
+#: src/addressbook.c:4120
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:4125
+#: src/addressbook.c:4126
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4130
+#: src/addressbook.c:4131
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:4137 src/addressbook.c:4143
+#: src/addressbook.c:4138 src/addressbook.c:4144
 msgid "Addressbook conversion error"
 msgstr ""
 
-#: src/addressbook.c:4257
+#: src/addressbook.c:4258
 msgid "Addressbook Error"
 msgstr ""
 
-#: src/addressbook.c:4258
+#: src/addressbook.c:4259
 msgid "Could not read address index"
 msgstr ""
 
-#: src/addressbook.c:4589
+#: src/addressbook.c:4590
 msgid "Busy searching..."
 msgstr ""
 
-#: src/addressbook.c:4898 src/prefs_send.c:188
+#: src/addressbook.c:4899
 msgid "Interface"
 msgstr ""
 
-#: src/addressbook.c:4910
-msgid "Address Books"
+#: 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
+msgid "Address Book"
 msgstr ""
 
-#: src/addressbook.c:4922
+#: src/addressbook.c:4923
 msgid "Person"
 msgstr ""
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:343
-#: src/folderview.c:431 src/prefs_account.c:2786 src/prefs_folder_column.c:78
+#: src/addressbook.c:4959 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 ""
 
-#: src/addressbook.c:4970
+#: src/addressbook.c:4971
 msgid "vCard"
 msgstr ""
 
-#: src/addressbook.c:4982 src/addressbook.c:4994
+#: src/addressbook.c:4983 src/addressbook.c:4995
 msgid "JPilot"
 msgstr ""
 
-#: src/addressbook.c:5006
+#: src/addressbook.c:5007
 msgid "LDAP servers"
 msgstr ""
 
-#: src/addressbook.c:5018
+#: src/addressbook.c:5019
 msgid "LDAP Query"
 msgstr ""
 
-#: src/addressbook_foldersel.c:182 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:984 src/importldif.c:657
-msgid "Address Book"
-msgstr ""
-
-#: src/addressbook_foldersel.c:387 src/plugins/bogofilter/bogofilter.c:107
+#: src/addressbook_foldersel.c:388 src/plugins/bogofilter/bogofilter.c:107
 #: src/plugins/bogofilter/bogofilter_gtk.c:274
 #: src/plugins/bogofilter/bogofilter_gtk.c:347
 #: src/plugins/bogofilter/bogofilter_gtk.c:424
@@ -887,27 +883,27 @@ msgstr ""
 msgid "Collect email addresses from folder"
 msgstr ""
 
-#: src/addrindex.c:124
+#: src/addrindex.c:123
 msgid "Common addresses"
 msgstr ""
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Personal addresses"
 msgstr ""
 
-#: src/addrindex.c:131
+#: src/addrindex.c:130
 msgid "Common address"
 msgstr ""
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Personal address"
 msgstr ""
 
-#: src/addrindex.c:1830
+#: src/addrindex.c:1827
 msgid "Address(es) update"
 msgstr ""
 
-#: src/addrindex.c:1831
+#: src/addrindex.c:1828
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 
@@ -915,15 +911,15 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
+#: 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:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
+#: 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:5632 src/inc.c:663
-#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
+#: 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 ""
 
@@ -940,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
@@ -997,45 +993,45 @@ msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr ""
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr ""
 
-#: src/common/plugin.c:480
+#: src/common/plugin.c:479
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr ""
 
-#: src/common/plugin.c:771
+#: 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:774
+#: 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:783
+#: 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:785
+#: 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:1213
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr ""
 
@@ -1047,24 +1043,24 @@ msgstr ""
 msgid "Selected SMTP AUTH method not available\n"
 msgstr ""
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:505 src/common/smtp.c:559
 msgid "bad SMTP response\n"
 msgstr ""
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:530 src/common/smtp.c:548 src/common/smtp.c:662
 msgid "error occurred on SMTP session\n"
 msgstr ""
 
-#: src/common/smtp.c:535 src/pop.c:905
+#: src/common/smtp.c:539 src/pop.c:905
 msgid "error occurred on authentication\n"
 msgstr ""
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:589
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr ""
 
-#: src/common/smtp.c:617 src/pop.c:898
+#: src/common/smtp.c:621 src/pop.c:898
 msgid "couldn't start TLS session\n"
 msgstr ""
 
@@ -1096,81 +1092,81 @@ msgstr ""
 msgid "write on fd%d: %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:326
+#: src/common/ssl_certificate.c:328
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:334
+#: src/common/ssl_certificate.c:336
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:343
+#: src/common/ssl_certificate.c:345
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:628
+#: src/common/ssl_certificate.c:630
 msgid "Internal error"
 msgstr ""
 
-#: src/common/ssl_certificate.c:633
+#: src/common/ssl_certificate.c:635
 msgid "Uncheckable"
 msgstr ""
 
-#: src/common/ssl_certificate.c:637
+#: src/common/ssl_certificate.c:639
 msgid "Self-signed certificate"
 msgstr ""
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:642
 msgid "Revoked certificate"
 msgstr ""
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:644
 msgid "No certificate issuer found"
 msgstr ""
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:646
 msgid "Certificate issuer is not a CA"
 msgstr ""
 
-#: src/common/ssl_certificate.c:869
+#: src/common/ssl_certificate.c:871
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:873
+#: src/common/ssl_certificate.c:875
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:892
+#: src/common/ssl_certificate.c:894
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:896
+#: src/common/ssl_certificate.c:898
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1044
+#: src/common/ssl_certificate.c:1046
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1047
+#: src/common/ssl_certificate.c:1049
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1051
+#: src/common/ssl_certificate.c:1053
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1076 src/gtk/sslcertwindow.c:85
+#: src/common/ssl_certificate.c:1078 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
 #: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
@@ -1181,646 +1177,646 @@ msgstr ""
 msgid "(Subject cleared by RegExp)"
 msgstr ""
 
-#: src/common/utils.c:259
+#: src/common/utils.c:257
 #, c-format
 msgid "%dB"
 msgstr ""
 
-#: src/common/utils.c:260
+#: src/common/utils.c:258
 #, c-format
 msgid "%d.%02dKB"
 msgstr ""
 
-#: src/common/utils.c:261
+#: src/common/utils.c:259
 #, c-format
 msgid "%d.%02dMB"
 msgstr ""
 
-#: src/common/utils.c:262
+#: src/common/utils.c:260
 #, c-format
 msgid "%.2fGB"
 msgstr ""
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4806
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr ""
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4807
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr ""
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4808
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr ""
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4809
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr ""
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4810
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr ""
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4811
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr ""
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4812
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr ""
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4814
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr ""
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4815
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr ""
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4816
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr ""
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4817
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr ""
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4818
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4819
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr ""
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4820
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr ""
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4821
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr ""
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4822
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr ""
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4823
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr ""
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4824
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr ""
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4825
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr ""
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4827
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr ""
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4828
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr ""
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4829
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr ""
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4830
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr ""
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4831
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr ""
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4832
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr ""
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4833
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr ""
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4835
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr ""
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4836
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr ""
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4837
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr ""
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4838
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr ""
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4839
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4840
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr ""
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4841
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr ""
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4842
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr ""
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4843
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr ""
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4844
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr ""
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4845
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr ""
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4846
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr ""
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4857
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr ""
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4858
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr ""
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4859
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr ""
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4860
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr ""
 
-#: src/compose.c:575
+#: src/compose.c:576
 msgid "_Add..."
 msgstr ""
 
-#: src/compose.c:576 src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:316
+#: src/compose.c:577 src/mh_gtk.c:368 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:318
 msgid "_Remove"
 msgstr ""
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:579 src/folderview.c:241
 msgid "_Properties..."
 msgstr ""
 
-#: src/compose.c:585 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr ""
 
-#: src/compose.c:588
+#: src/compose.c:589
 msgid "_Spelling"
 msgstr ""
 
-#: src/compose.c:590 src/compose.c:657
+#: src/compose.c:591 src/compose.c:658
 msgid "_Options"
 msgstr ""
 
-#: src/compose.c:594
+#: src/compose.c:595
 msgid "S_end"
 msgstr ""
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "Send _later"
 msgstr ""
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "_Attach file"
 msgstr ""
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "_Insert file"
 msgstr ""
 
-#: src/compose.c:600
+#: src/compose.c:601
 msgid "Insert si_gnature"
 msgstr ""
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "_Replace signature"
 msgstr ""
 
-#: src/compose.c:605
+#: src/compose.c:606
 msgid "_Print"
 msgstr ""
 
-#: src/compose.c:610 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr ""
 
-#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:612 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr ""
 
-#: src/compose.c:614 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:615 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr ""
 
-#: src/compose.c:618
+#: src/compose.c:619
 msgid "_Special paste"
 msgstr ""
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "As _quotation"
 msgstr ""
 
-#: src/compose.c:620
+#: src/compose.c:621
 msgid "_Wrapped"
 msgstr ""
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "_Unwrapped"
 msgstr ""
 
-#: src/compose.c:623 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr ""
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "A_dvanced"
 msgstr ""
 
-#: src/compose.c:626
+#: src/compose.c:627
 msgid "Move a character backward"
 msgstr ""
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "Move a character forward"
 msgstr ""
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "Move a word backward"
 msgstr ""
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "Move a word forward"
 msgstr ""
 
-#: src/compose.c:630
+#: src/compose.c:631
 msgid "Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:631
+#: src/compose.c:632
 msgid "Move to end of line"
 msgstr ""
 
-#: src/compose.c:632
+#: src/compose.c:633
 msgid "Move to previous line"
 msgstr ""
 
-#: src/compose.c:633
+#: src/compose.c:634
 msgid "Move to next line"
 msgstr ""
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "Delete a character backward"
 msgstr ""
 
-#: src/compose.c:635
+#: src/compose.c:636
 msgid "Delete a character forward"
 msgstr ""
 
-#: src/compose.c:636
+#: src/compose.c:637
 msgid "Delete a word backward"
 msgstr ""
 
-#: src/compose.c:637
+#: src/compose.c:638
 msgid "Delete a word forward"
 msgstr ""
 
-#: src/compose.c:638
+#: src/compose.c:639
 msgid "Delete line"
 msgstr ""
 
-#: src/compose.c:639
+#: src/compose.c:640
 msgid "Delete to end of line"
 msgstr ""
 
-#: src/compose.c:642 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr ""
 
-#: src/compose.c:645
+#: src/compose.c:646
 msgid "_Wrap current paragraph"
 msgstr ""
 
-#: src/compose.c:646
+#: src/compose.c:647
 msgid "Wrap all long _lines"
 msgstr ""
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "Edit with e_xternal editor"
 msgstr ""
 
-#: src/compose.c:651
+#: src/compose.c:652
 msgid "_Check all or check selection"
 msgstr ""
 
-#: src/compose.c:652
+#: src/compose.c:653
 msgid "_Highlight all misspelled words"
 msgstr ""
 
-#: src/compose.c:653
+#: src/compose.c:654
 msgid "Check _backwards misspelled word"
 msgstr ""
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "_Forward to next misspelled word"
 msgstr ""
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Reply _mode"
 msgstr ""
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Privacy _System"
 msgstr ""
 
-#: src/compose.c:669
+#: src/compose.c:670
 msgid "_Priority"
 msgstr ""
 
-#: src/compose.c:671 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:676 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:677 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:678 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:679 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:680 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:681 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:682 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:683 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:684 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:687 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr ""
 
-#: src/compose.c:689
+#: src/compose.c:690
 msgid "_Template"
 msgstr ""
 
-#: src/compose.c:691 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr ""
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "Aut_o wrapping"
 msgstr ""
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "Auto _indent"
 msgstr ""
 
-#: src/compose.c:702
+#: src/compose.c:703
 msgid "Si_gn"
 msgstr ""
 
-#: src/compose.c:703
+#: src/compose.c:704
 msgid "_Encrypt"
 msgstr ""
 
-#: src/compose.c:704
+#: src/compose.c:705
 msgid "_Request Return Receipt"
 msgstr ""
 
-#: src/compose.c:705
+#: src/compose.c:706
 msgid "Remo_ve references"
 msgstr ""
 
-#: src/compose.c:706
+#: src/compose.c:707
 msgid "Show _ruler"
 msgstr ""
 
-#: src/compose.c:711 src/compose.c:721
+#: src/compose.c:712 src/compose.c:722
 msgid "_Normal"
 msgstr ""
 
-#: src/compose.c:712 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:713 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr ""
 
-#: src/compose.c:714
+#: src/compose.c:715
 msgid "_Mailing-list"
 msgstr ""
 
-#: src/compose.c:719
+#: src/compose.c:720
 msgid "_Highest"
 msgstr ""
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "Hi_gh"
 msgstr ""
 
-#: src/compose.c:722
+#: src/compose.c:723
 msgid "Lo_w"
 msgstr ""
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "_Lowest"
 msgstr ""
 
-#: src/compose.c:728 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:729 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:730 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:734 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:737 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:742 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 ""
 
-#: src/compose.c:1071
+#: src/compose.c:1072
 msgid "New message From format error."
 msgstr ""
 
-#: src/compose.c:1163
+#: src/compose.c:1164
 msgid "New message subject format error."
 msgstr ""
 
-#: src/compose.c:1194 src/quote_fmt.c:569
+#: src/compose.c:1195 src/quote_fmt.c:569
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:1455
+#: src/compose.c:1456
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 
-#: src/compose.c:1638 src/quote_fmt.c:586
+#: src/compose.c:1639 src/quote_fmt.c:586
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1686 src/quote_fmt.c:589
+#: src/compose.c:1687 src/quote_fmt.c:589
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:1822 src/compose.c:2014 src/quote_fmt.c:606
+#: src/compose.c:1823 src/compose.c:2015 src/quote_fmt.c:606
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1882 src/quote_fmt.c:609
+#: src/compose.c:1883 src/quote_fmt.c:609
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2056
+#: src/compose.c:2057
 msgid "Fw: multiple emails"
 msgstr ""
 
-#: src/compose.c:2539
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2606 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr ""
 
-#: src/compose.c:2609 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr ""
 
-#: src/compose.c:2612 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr ""
 
-#: src/compose.c:2615 src/compose.c:4946 src/compose.c:4948
+#: src/compose.c:2613 src/compose.c:4935 src/compose.c:4937
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr ""
 
-#: src/compose.c:2618 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr ""
 
-#: src/compose.c:2621 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr ""
 
-#: src/compose.c:2625 src/compose.c:4943 src/compose.c:4951
+#: 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:2834
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 
-#: src/compose.c:2840
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1831,137 +1827,137 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:3113
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr ""
 
-#: src/compose.c:3613
+#: src/compose.c:3602
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr ""
 
-#: src/compose.c:3624
+#: 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:3627
+#: src/compose.c:3616
 msgid "Are you sure?"
 msgstr ""
 
-#: src/compose.c:3628 src/compose.c:10529 src/compose.c:11390
+#: src/compose.c:3617 src/compose.c:10529 src/compose.c:11390
 msgid "_Insert"
 msgstr ""
 
-#: src/compose.c:3752
+#: src/compose.c:3741
 #, c-format
 msgid "File %s is empty."
 msgstr ""
 
-#: src/compose.c:3753
+#: src/compose.c:3742
 msgid "Empty file"
 msgstr ""
 
-#: src/compose.c:3754
+#: src/compose.c:3743
 msgid "_Attach anyway"
 msgstr ""
 
-#: src/compose.c:3763
+#: src/compose.c:3752
 #, c-format
 msgid "Can't read %s."
 msgstr ""
 
-#: src/compose.c:3790
+#: src/compose.c:3779
 #, c-format
 msgid "Message: %s"
 msgstr ""
 
-#: src/compose.c:4783 src/plugins/managesieve/sieve_editor.c:694
-#: src/plugins/python/composewindowtype.c:498
+#: src/compose.c:4772 src/plugins/managesieve/sieve_editor.c:694
+#: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr ""
 
-#: src/compose.c:4790 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4779 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4793 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4782 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4795 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4784 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr ""
 
-#: src/compose.c:4822 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:5042 src/compose.c:5074 src/compose.c:5116
-#: src/prefs_account.c:3310 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:5043
+#: src/compose.c:5032
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5633
-#: src/folderview.c:2445 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:5075
+#: src/compose.c:5064
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 
-#: src/compose.c:5092
+#: src/compose.c:5081
 msgid "Recipient is not specified."
 msgstr ""
 
-#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5100 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr ""
 
-#: src/compose.c:5112
+#: src/compose.c:5101
 #, c-format
 msgid "Subject is empty. %s"
 msgstr ""
 
-#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5102 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5114 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr ""
 
-#: src/compose.c:5116 src/toolbar.c:425
+#: src/compose.c:5105 src/toolbar.c:425
 msgid "Send later"
 msgstr ""
 
-#: src/compose.c:5169 src/compose.c:9993
+#: src/compose.c:5158 src/compose.c:9993
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
 
-#: src/compose.c:5172 src/compose.c:9996
+#: 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:5178 src/compose.c:9990
+#: src/compose.c:5167 src/compose.c:9990
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1969,7 +1965,7 @@ msgid ""
 "Signature failed: %s"
 msgstr ""
 
-#: src/compose.c:5181
+#: src/compose.c:5170
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1977,24 +1973,24 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/compose.c:5183
+#: src/compose.c:5172
 msgid "Could not queue message for sending."
 msgstr ""
 
-#: src/compose.c:5198 src/compose.c:5258
+#: 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:5254
+#: src/compose.c:5243
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
-#: src/compose.c:5629
+#: src/compose.c:5618
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2002,7 +1998,7 @@ msgid ""
 "Send it as %s?"
 msgstr ""
 
-#: src/compose.c:5687
+#: src/compose.c:5676
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2011,54 +2007,54 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5798
+#: src/compose.c:5787
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr ""
 
-#: src/compose.c:5919
+#: src/compose.c:5908
 msgid "Encryption warning"
 msgstr ""
 
-#: src/compose.c:5920
+#: src/compose.c:5909
 msgid "C_ontinue"
 msgstr ""
 
-#: src/compose.c:5969
+#: src/compose.c:5958
 msgid "No account for sending mails available!"
 msgstr ""
 
-#: src/compose.c:5978
+#: src/compose.c:5967
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 
-#: src/compose.c:6213
+#: src/compose.c:6202
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 
-#: src/compose.c:6214 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:6214
+#: src/compose.c:6203
 msgid "Ignore attachment"
 msgstr ""
 
-#: src/compose.c:6254
+#: src/compose.c:6243
 #, c-format
 msgid "Original %s part"
 msgstr ""
 
-#: src/compose.c:6832
+#: src/compose.c:6825
 msgid "Add to address _book"
 msgstr ""
 
-#: src/compose.c:6993
+#: src/compose.c:6986
 msgid "Delete entry contents"
 msgstr ""
 
-#: src/compose.c:6997 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 ""
 
@@ -2066,7 +2062,7 @@ msgstr ""
 msgid "Mime type"
 msgstr ""
 
-#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: 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"
@@ -2076,7 +2072,7 @@ msgstr ""
 msgid "Save Message to "
 msgstr ""
 
-#: src/compose.c:7318 src/editjpilot.c:276 src/editldap.c:518
+#: 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
@@ -2198,7 +2194,7 @@ msgid ""
 "process group id: %d"
 msgstr ""
 
-#: src/compose.c:9959 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 ""
 
@@ -2357,11 +2353,11 @@ msgstr ""
 msgid "Save crash information"
 msgstr ""
 
-#: src/editaddress.c:155 src/editaddress.c:231
+#: src/editaddress.c:156 src/editaddress.c:232
 msgid "Add New Person"
 msgstr ""
 
-#: src/editaddress.c:157
+#: src/editaddress.c:158
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2376,7 +2372,7 @@ msgid ""
 "Click Cancel to close without saving."
 msgstr ""
 
-#: src/editaddress.c:168
+#: src/editaddress.c:169
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2389,93 +2385,93 @@ msgid ""
 "Click Cancel to close without saving."
 msgstr ""
 
-#: src/editaddress.c:232
+#: src/editaddress.c:233
 msgid "Edit Person Details"
 msgstr ""
 
-#: src/editaddress.c:410
+#: src/editaddress.c:411
 msgid "An Email address must be supplied."
 msgstr ""
 
-#: src/editaddress.c:586 src/editaddress_other_attributes_ldap.c:198
+#: src/editaddress.c:587 src/editaddress_other_attributes_ldap.c:198
 msgid "A Name and Value must be supplied."
 msgstr ""
 
-#: src/editaddress.c:675 src/prefs_folder_item.c:1675
+#: src/editaddress.c:676 src/prefs_folder_item.c:1675
 msgid "Discard"
 msgstr ""
 
-#: src/editaddress.c:676
+#: src/editaddress.c:677
 msgid "Apply"
 msgstr ""
 
-#: src/editaddress.c:706 src/editaddress.c:755
+#: src/editaddress.c:707 src/editaddress.c:756
 msgid "Edit Person Data"
 msgstr ""
 
-#: src/editaddress.c:784
+#: src/editaddress.c:785
 msgid "Choose a picture"
 msgstr ""
 
-#: src/editaddress.c:803
+#: src/editaddress.c:804
 #, c-format
 msgid ""
 "Failed to import image: \n"
 "%s"
 msgstr ""
 
-#: src/editaddress.c:845
+#: src/editaddress.c:846
 msgid "_Set picture"
 msgstr ""
 
-#: src/editaddress.c:846
+#: src/editaddress.c:847
 msgid "_Unset picture"
 msgstr ""
 
-#: src/editaddress.c:904
+#: src/editaddress.c:905
 msgid "Photo"
 msgstr ""
 
-#: src/editaddress.c:951 src/editaddress.c:953 src/expldifdlg.c:516
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
 #: src/exporthtml.c:761 src/ldif.c:746
 msgid "Display Name"
 msgstr ""
 
-#: src/editaddress.c:962 src/editaddress.c:966 src/ldif.c:754
+#: src/editaddress.c:963 src/editaddress.c:967 src/ldif.c:754
 msgid "Last Name"
 msgstr ""
 
-#: src/editaddress.c:963 src/editaddress.c:965 src/ldif.c:750
+#: src/editaddress.c:964 src/editaddress.c:966 src/ldif.c:750
 msgid "First Name"
 msgstr ""
 
-#: src/editaddress.c:969 src/editaddress.c:971
+#: src/editaddress.c:970 src/editaddress.c:972
 msgid "Nickname"
 msgstr ""
 
-#: src/editaddress.c:1055 src/editaddress.c:1123
+#: src/editaddress.c:1056 src/editaddress.c:1124
 msgid "Alias"
 msgstr ""
 
-#: src/editaddress.c:1265 src/editaddress.c:1334 src/editaddress.c:1354
+#: src/editaddress.c:1266 src/editaddress.c:1335 src/editaddress.c:1355
 #: src/editaddress_other_attributes_ldap.c:303
 #: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:222
 msgid "Value"
 msgstr ""
 
-#: src/editaddress.c:1425
+#: src/editaddress.c:1426
 msgid "_User Data"
 msgstr ""
 
-#: src/editaddress.c:1426
+#: src/editaddress.c:1427
 msgid "_Email Addresses"
 msgstr ""
 
-#: src/editaddress.c:1429 src/editaddress.c:1432
+#: src/editaddress.c:1430 src/editaddress.c:1433
 msgid "O_ther Attributes"
 msgstr ""
 
-#: src/editaddress.c:1583
+#: src/editaddress.c:1584
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2503,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:1970
-#: src/wizard.c:1197 src/wizard.c:1617
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr ""
 
@@ -2552,12 +2548,12 @@ msgstr ""
 msgid "Input the new name of folder:"
 msgstr ""
 
-#: src/editgroup.c:556 src/foldersel.c:582 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: 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
 msgid "New folder"
 msgstr ""
 
-#: src/editgroup.c:557 src/foldersel.c:583 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
 msgstr ""
@@ -2586,16 +2582,16 @@ msgstr ""
 msgid "Edit LDAP - Select Search Base"
 msgstr ""
 
-#: src/editldap_basedn.c:156 src/editldap.c:441
+#: src/editldap_basedn.c:156 src/editldap.c:440
 msgid "Hostname"
 msgstr ""
 
-#: src/editldap_basedn.c:166 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:108
+#: src/editldap_basedn.c:166 src/editldap.c:457
+#: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:110
 msgid "Port"
 msgstr ""
 
-#: src/editldap_basedn.c:176 src/editldap.c:502
+#: src/editldap_basedn.c:176 src/editldap.c:501
 msgid "Search Base"
 msgstr ""
 
@@ -2607,35 +2603,35 @@ msgstr ""
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 
-#: src/editldap_basedn.c:291 src/editldap.c:281
+#: src/editldap_basedn.c:291 src/editldap.c:280
 msgid "Could not connect to server"
 msgstr ""
 
-#: src/editldap.c:152
+#: src/editldap.c:151
 msgid "A Name must be supplied."
 msgstr ""
 
-#: src/editldap.c:164
+#: src/editldap.c:163
 msgid "A Hostname must be supplied for the server."
 msgstr ""
 
-#: src/editldap.c:177
+#: src/editldap.c:176
 msgid "At least one LDAP search attribute should be supplied."
 msgstr ""
 
-#: src/editldap.c:278
+#: src/editldap.c:277
 msgid "Connected successfully to server"
 msgstr ""
 
-#: src/editldap.c:336 src/editldap.c:970
+#: src/editldap.c:335 src/editldap.c:973
 msgid "Edit LDAP Server"
 msgstr ""
 
-#: src/editldap.c:437
+#: src/editldap.c:436
 msgid "A name that you wish to call the server."
 msgstr ""
 
-#: src/editldap.c:450
+#: src/editldap.c:449
 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 "
@@ -2647,41 +2643,41 @@ msgstr ""
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 
-#: src/editldap.c:470
+#: src/editldap.c:469
 msgid "TLS"
 msgstr ""
 
-#: src/editldap.c:471 src/prefs_account.c:3383
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr ""
 
-#: src/editldap.c:475
+#: src/editldap.c:474
 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 "
 "TLS_REQCERT fields)."
 msgstr ""
 
-#: src/editldap.c:479
+#: src/editldap.c:478
 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 "
 "TLS_REQCERT fields)."
 msgstr ""
 
-#: src/editldap.c:491
+#: src/editldap.c:490
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr ""
 
-#: src/editldap.c:494
+#: src/editldap.c:493
 msgid " Check Server "
 msgstr ""
 
-#: src/editldap.c:498
+#: src/editldap.c:497
 msgid "Press this button to test the connection to the server."
 msgstr ""
 
-#: src/editldap.c:511
+#: src/editldap.c:510
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2695,37 +2691,37 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organisation Name,c=Country\n"
 
-#: src/editldap.c:522
+#: src/editldap.c:521
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr ""
 
-#: src/editldap.c:578
+#: src/editldap.c:577
 msgid "Search Attributes"
 msgstr ""
 
-#: src/editldap.c:587
+#: src/editldap.c:586
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
 msgstr ""
 
-#: src/editldap.c:590
+#: src/editldap.c:589
 msgid " Defaults "
 msgstr ""
 
-#: src/editldap.c:594
+#: src/editldap.c:593
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
 msgstr ""
 
-#: src/editldap.c:600
+#: src/editldap.c:599
 msgid "Max Query Age (secs)"
 msgstr ""
 
-#: src/editldap.c:615
+#: src/editldap.c:614
 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 "
@@ -2739,21 +2735,21 @@ msgid ""
 "more memory to cache results."
 msgstr ""
 
-#: src/editldap.c:632
+#: src/editldap.c:631
 msgid "Include server in dynamic search"
 msgstr ""
 
-#: src/editldap.c:637
+#: src/editldap.c:636
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
 msgstr ""
 
-#: src/editldap.c:643
+#: src/editldap.c:642
 msgid "Match names 'containing' search term"
 msgstr ""
 
-#: src/editldap.c:648
+#: 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\" "
@@ -2762,11 +2758,11 @@ msgid ""
 "searches against other address interfaces."
 msgstr ""
 
-#: src/editldap.c:701
+#: src/editldap.c:700
 msgid "Bind DN"
 msgstr ""
 
-#: src/editldap.c:710
+#: src/editldap.c:709
 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 "
@@ -2774,40 +2770,40 @@ msgid ""
 "performing a search."
 msgstr ""
 
-#: src/editldap.c:717
+#: src/editldap.c:716
 msgid "Bind Password"
 msgstr ""
 
-#: src/editldap.c:727
+#: src/editldap.c:726
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 
-#: src/editldap.c:732
+#: src/editldap.c:731
 msgid "Timeout (secs)"
 msgstr ""
 
-#: src/editldap.c:746
+#: src/editldap.c:745
 msgid "The timeout period in seconds."
 msgstr ""
 
-#: src/editldap.c:750
+#: src/editldap.c:749
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:764
+#: src/editldap.c:763
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr ""
 
-#: src/editldap.c:781 src/gtk/quicksearch.c:680
+#: src/editldap.c:780 src/gtk/quicksearch.c:680
 msgid "Extended"
 msgstr ""
 
-#: src/editldap.c:975
+#: src/editldap.c:978
 msgid "Add New LDAP Server"
 msgstr ""
 
@@ -2929,20 +2925,20 @@ 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:941
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5992
+#: 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 ""
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:243
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
+#: src/plugins/pgpcore/sgpgme.c:147 src/plugins/pgpcore/sgpgme.c:163
 msgid "Full"
 msgstr ""
 
@@ -2987,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
@@ -3150,7 +3146,7 @@ msgstr ""
 msgid "Distinguished Name"
 msgstr ""
 
-#: src/export.c:113 src/summaryview.c:8139
+#: src/export.c:113 src/summaryview.c:8190
 msgid "Export to mbox file"
 msgstr ""
 
@@ -3377,311 +3373,307 @@ msgid ""
 "%smessage file: %s\n"
 msgstr ""
 
-#: src/folder.c:1565 src/foldersel.c:400 src/prefs_folder_item.c:300
+#: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:300
 msgid "Inbox"
 msgstr ""
 
-#: src/folder.c:1569 src/foldersel.c:404
+#: src/folder.c:1569 src/foldersel.c:407
 msgid "Sent"
 msgstr ""
 
-#: src/folder.c:1573 src/foldersel.c:408 src/prefs_folder_item.c:303
+#: src/folder.c:1573 src/foldersel.c:411 src/prefs_folder_item.c:303
 msgid "Queue"
 msgstr ""
 
-#: src/folder.c:1577 src/foldersel.c:412 src/prefs_folder_item.c:304
+#: src/folder.c:1577 src/foldersel.c:415 src/prefs_folder_item.c:304
 msgid "Trash"
 msgstr "Wastebin"
 
-#: src/folder.c:1581 src/foldersel.c:416 src/prefs_folder_item.c:302
+#: src/folder.c:1581 src/foldersel.c:419 src/prefs_folder_item.c:302
 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:3563
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 
-#: src/folder.c:4424
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr ""
 
-#: src/folder.c:4559
+#: src/folder.c:4563
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr ""
 
-#: src/folder.c:4816
-msgid "A folder name cannot begin or end with a dot."
-msgstr ""
-
 #: src/folder.c:4820
-msgid "A folder name can not end with a space."
+msgid "A folder name cannot begin or end with a dot."
 msgstr ""
 
 #: src/foldersel.c:247
 msgid "Select folder"
 msgstr ""
 
-#: src/foldersel.c:584 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: 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
 msgid "NewFolder"
 msgstr ""
 
-#: src/foldersel.c:592 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
-#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2056
+#: 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 ""
 
-#: src/foldersel.c:607 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
-#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:434 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2063
+#: 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:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr ""
 
-#: src/foldersel.c:614 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: 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
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr ""
 
-#: src/folderview.c:237
+#: src/folderview.c:236
 msgid "Mark all re_ad"
 msgstr ""
 
-#: src/folderview.c:238
+#: src/folderview.c:237
 msgid "Mark all read recursi_vely"
 msgstr ""
 
-#: src/folderview.c:240
+#: src/folderview.c:239
 msgid "R_un processing rules"
 msgstr ""
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr ""
 
-#: src/folderview.c:243
+#: src/folderview.c:242
 msgid "Process_ing..."
 msgstr ""
 
-#: src/folderview.c:244
+#: src/folderview.c:243
 msgid "Empty _trash..."
 msgstr "Empty was_tebin..."
 
-#: src/folderview.c:245
+#: src/folderview.c:244
 msgid "Send _queue..."
 msgstr ""
 
-#: src/folderview.c:385 src/folderview.c:432
+#: 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:6266
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6316
 msgid "New"
 msgstr ""
 
-#: src/folderview.c:386 src/folderview.c:433
+#: 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:6268
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6318
 msgid "Unread"
 msgstr ""
 
-#: src/folderview.c:387 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:389 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr ""
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:435 src/summaryview.c:445
+#: src/folderview.c:437 src/summaryview.c:445
 msgid "#"
 msgstr "No."
 
-#: src/folderview.c:765
+#: src/folderview.c:767
 msgid "Setting folder info..."
 msgstr ""
 
-#: src/folderview.c:837
+#: src/folderview.c:839
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
 msgstr ""
 
-#: src/folderview.c:839 src/summaryview.c:4115
+#: src/folderview.c:841 src/summaryview.c:4134
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:845 src/summaryview.c:4133
 msgid "Mark all as read"
 msgstr ""
 
-#: src/folderview.c:1019 src/imap.c:4639
+#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
 #, c-format
-msgid "Scanning folder %s/%s..."
+msgid "Scanning folder %s%c%s..."
 msgstr ""
 
-#: src/folderview.c:1022 src/imap.c:4643 src/mainwindow.c:5193 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 ""
 
-#: src/folderview.c:1053
+#: src/folderview.c:1050
 msgid "Rebuild folder tree"
 msgstr ""
 
-#: src/folderview.c:1054
+#: src/folderview.c:1051
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 
-#: src/folderview.c:1064
+#: src/folderview.c:1061
 msgid "Rebuilding folder tree..."
 msgstr ""
 
-#: src/folderview.c:1066
+#: src/folderview.c:1063
 msgid "Scanning folder tree..."
 msgstr ""
 
-#: src/folderview.c:1157
+#: src/folderview.c:1154
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr ""
 
-#: src/folderview.c:1211
+#: src/folderview.c:1208
 msgid "Checking for new messages in all folders..."
 msgstr ""
 
-#: src/folderview.c:2131
+#: src/folderview.c:2124
 #, c-format
 msgid "Closing folder %s..."
 msgstr ""
 
-#: src/folderview.c:2226
+#: src/folderview.c:2219
 #, c-format
 msgid "Opening folder %s..."
 msgstr ""
 
-#: src/folderview.c:2244
+#: src/folderview.c:2237
 msgid "Folder could not be opened."
 msgstr ""
 
-#: src/folderview.c:2386 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"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2380
 msgid "Delete all messages in trash?"
 msgstr "Delete all messages in wastebin?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2381
 msgid "_Empty trash"
 msgstr "_Empty wastebin"
 
-#: src/folderview.c:2431 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2424 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr ""
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2425 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr ""
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2436 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr ""
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2437 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr ""
 
-#: src/folderview.c:2453 src/toolbar.c:2647
+#: src/folderview.c:2446 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 
-#: src/folderview.c:2456 src/main.c:2743 src/toolbar.c:2650
+#: src/folderview.c:2449 src/main.c:2717 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
 
-#: src/folderview.c:2531
+#: src/folderview.c:2524
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr ""
 
-#: src/folderview.c:2532
+#: src/folderview.c:2525
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr ""
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Copy folder"
 msgstr ""
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Move folder"
 msgstr ""
 
-#: src/folderview.c:2545
+#: src/folderview.c:2538
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2545
+#: src/folderview.c:2538
 #, c-format
 msgid "Moving %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2579
+#: src/folderview.c:2572
 msgid "Source and destination are the same."
 msgstr ""
 
-#: src/folderview.c:2582
+#: src/folderview.c:2575
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2583
+#: src/folderview.c:2576
 msgid "Can't move a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2586
+#: src/folderview.c:2579
 msgid "A folder cannot be moved between different mailboxes."
 msgstr ""
 
-#: src/folderview.c:2589
+#: src/folderview.c:2582
 msgid "Copy failed!"
 msgstr ""
 
-#: src/folderview.c:2589
+#: src/folderview.c:2582
 msgid "Move failed!"
 msgstr ""
 
-#: src/folderview.c:2639
+#: src/folderview.c:2632
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr ""
 
-#: src/folderview.c:3068 src/summaryview.c:4553 src/summaryview.c:4658
+#: src/folderview.c:3060 src/summaryview.c:4579 src/summaryview.c:4684
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 
@@ -3705,7 +3697,7 @@ msgstr ""
 msgid "Newsgroup name"
 msgstr ""
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:171
+#: src/grouplistdialog.c:205
 msgid "Messages"
 msgstr ""
 
@@ -3731,7 +3723,7 @@ msgstr ""
 msgid "Can't retrieve newsgroup list."
 msgstr ""
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1565
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1584
 msgid "Done."
 msgstr ""
 
@@ -3766,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 ""
@@ -3799,7 +3791,7 @@ msgid ""
 "Operating System: unknown"
 msgstr ""
 
-#: src/gtk/about.c:242 src/prefs_themes.c:705 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
 msgid "The Claws Mail Team"
 msgstr ""
 
@@ -3905,44 +3897,44 @@ msgid ""
 "this program. If not, see "
 msgstr ""
 
-#: src/gtk/about.c:698 src/main.c:2567
+#: src/gtk/about.c:698 src/main.c:2541
 msgid "Session statistics\n"
 msgstr ""
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2577 src/main.c:2580
+#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2551 src/main.c:2554
 #, c-format
 msgid "Started: %s\n"
 msgstr ""
 
-#: src/gtk/about.c:718 src/main.c:2586
+#: src/gtk/about.c:718 src/main.c:2560
 msgid "Incoming traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:721 src/main.c:2589
+#: src/gtk/about.c:721 src/main.c:2563
 #, c-format
 msgid "Received messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:728 src/main.c:2595
+#: src/gtk/about.c:728 src/main.c:2569
 msgid "Outgoing traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:731 src/main.c:2598
+#: src/gtk/about.c:731 src/main.c:2572
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:736 src/main.c:2602
+#: src/gtk/about.c:736 src/main.c:2576
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:741 src/main.c:2606
+#: src/gtk/about.c:741 src/main.c:2580
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:746 src/main.c:2610
+#: src/gtk/about.c:746 src/main.c:2584
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr ""
@@ -3953,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 ""
@@ -3982,63 +3974,63 @@ msgstr ""
 msgid "_Statistics"
 msgstr ""
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
 msgid "Orange"
 msgstr ""
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
 msgid "Red"
 msgstr ""
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
 msgid "Pink"
 msgstr ""
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
 msgid "Sky blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
 msgid "Blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
 msgid "Green"
 msgstr ""
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
 msgid "Brown"
 msgstr ""
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
 msgid "Grey"
 msgstr ""
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
 msgid "Light brown"
 msgstr ""
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
 msgid "Dark red"
 msgstr ""
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:402
 msgid "Dark pink"
 msgstr ""
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
 msgid "Steel blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:410
 msgid "Gold"
 msgstr ""
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
 msgid "Bright green"
 msgstr ""
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
 msgid "Magenta"
 msgstr ""
 
@@ -4256,7 +4248,7 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:433
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:432
 msgid "Comments"
 msgstr ""
 
@@ -4371,11 +4363,11 @@ msgstr ""
 
 #: 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:2786
+#: src/prefs_summary_column.c:79 src/summaryview.c:2805
 msgid "Status"
 msgstr ""
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:880
+#: src/gtk/headers.h:37 src/prefs_themes.c:881
 msgid "Status:"
 msgstr ""
 
@@ -4443,7 +4435,7 @@ msgstr ""
 msgid "Precedence:"
 msgstr ""
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1066
+#: src/gtk/headers.h:46 src/prefs_account.c:1071
 msgid "Organization"
 msgstr "Organisation"
 
@@ -4729,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 ""
@@ -4743,9 +4735,9 @@ msgstr ""
 #: src/plugins/clamd/clamav_plugin_gtk.c:552
 #: src/plugins/fancy/fancy_prefs.c:114
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:137
+#: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:424
+#: src/plugins/managesieve/sieve_prefs.c:412
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -4754,10 +4746,10 @@ 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:617 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:82
+#: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:734 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr ""
 
@@ -4794,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:3273 src/prefs_account.c:3291 src/prefs_account.c:3309
-#: src/prefs_account.c:3327 src/prefs_account.c:3345 src/prefs_account.c:3363
-#: src/prefs_account.c:3382 src/prefs_account.c:3475
+#: 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"
@@ -5074,7 +5066,7 @@ msgid "Signer"
 msgstr ""
 
 #: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:836
+#: src/prefs_themes.c:837
 msgid "Name: "
 msgstr ""
 
@@ -5191,21 +5183,21 @@ msgstr ""
 msgid "SSL certificate changed"
 msgstr ""
 
-#: src/headerview.c:94
+#: src/headerview.c:95
 msgid "Tags:"
 msgstr ""
 
-#: src/headerview.c:192 src/plugins/notification/notification_popup.c:316
+#: src/headerview.c:193 src/plugins/notification/notification_popup.c:316
 #: src/plugins/notification/notification_popup.c:623
-#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3344
-#: src/summaryview.c:3362 src/summaryview.c:3383
+#: src/plugins/notification/notification_trayicon.c:845 src/summaryview.c:3363
+#: src/summaryview.c:3381 src/summaryview.c:3402
 msgid "(No From)"
 msgstr ""
 
-#: src/headerview.c:207 src/plugins/notification/notification_popup.c:318
+#: src/headerview.c:208 src/plugins/notification/notification_popup.c:318
 #: src/plugins/notification/notification_popup.c:627
-#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3395
-#: src/summaryview.c:3398
+#: src/plugins/notification/notification_trayicon.c:848 src/summaryview.c:3414
+#: src/summaryview.c:3417
 msgid "(No Subject)"
 msgstr ""
 
@@ -5245,175 +5237,175 @@ msgid "IMAP error on %s:"
 msgstr ""
 
 #: src/imap.c:621
-msgid "authenticated"
+msgid " authenticated\n"
 msgstr ""
 
 #: src/imap.c:624
-msgid "not authenticated"
+msgid " not authenticated\n"
 msgstr ""
 
 #: src/imap.c:627
-msgid "bad state"
+msgid " bad state\n"
 msgstr ""
 
 #: src/imap.c:630
-msgid "stream error"
+msgid " stream error\n"
 msgstr ""
 
 #: src/imap.c:633
-msgid "parse error (very probably non-RFC compliance from the server)"
+msgid " parse error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 
 #: src/imap.c:637
-msgid "connection refused"
+msgid " connection refused\n"
 msgstr ""
 
 #: src/imap.c:640
-msgid "memory error"
+msgid " memory error\n"
 msgstr ""
 
 #: src/imap.c:643
-msgid "fatal error"
+msgid " fatal error\n"
 msgstr ""
 
 #: src/imap.c:646
-msgid "protocol error (very probably non-RFC compliance from the server)"
+msgid " protocol error (very probably non-RFC compliance from the server)\n"
 msgstr ""
 
 #: src/imap.c:650
-msgid "connection not accepted"
+msgid " connection not accepted\n"
 msgstr ""
 
 #: src/imap.c:653
-msgid "APPEND error"
+msgid " APPEND error\n"
 msgstr ""
 
 #: src/imap.c:656
-msgid "NOOP error"
+msgid " NOOP error\n"
 msgstr ""
 
 #: src/imap.c:659
-msgid "LOGOUT error"
+msgid " LOGOUT error\n"
 msgstr ""
 
 #: src/imap.c:662
-msgid "CAPABILITY error"
+msgid " CAPABILITY error\n"
 msgstr ""
 
 #: src/imap.c:665
-msgid "CHECK error"
+msgid " CHECK error\n"
 msgstr ""
 
 #: src/imap.c:668
-msgid "CLOSE error"
+msgid " CLOSE error\n"
 msgstr ""
 
 #: src/imap.c:671
-msgid "EXPUNGE error"
+msgid " EXPUNGE error\n"
 msgstr ""
 
 #: src/imap.c:674
-msgid "COPY error"
+msgid " COPY error\n"
 msgstr ""
 
 #: src/imap.c:677
-msgid "UID COPY error"
+msgid " UID COPY error\n"
 msgstr ""
 
 #: src/imap.c:680
-msgid "CREATE error"
+msgid " CREATE error\n"
 msgstr ""
 
 #: src/imap.c:683
-msgid "DELETE error"
+msgid " DELETE error\n"
 msgstr ""
 
 #: src/imap.c:686
-msgid "EXAMINE error"
+msgid " EXAMINE error\n"
 msgstr ""
 
 #: src/imap.c:689
-msgid "FETCH error"
+msgid " FETCH error\n"
 msgstr ""
 
 #: src/imap.c:692
-msgid "UID FETCH error"
+msgid " UID FETCH error\n"
 msgstr ""
 
 #: src/imap.c:695
-msgid "LIST error"
+msgid " LIST error\n"
 msgstr ""
 
 #: src/imap.c:698
-msgid "LOGIN error"
+msgid " LOGIN error\n"
 msgstr ""
 
 #: src/imap.c:701
-msgid "LSUB error"
+msgid " LSUB error\n"
 msgstr ""
 
 #: src/imap.c:704
-msgid "RENAME error"
+msgid " RENAME error\n"
 msgstr ""
 
 #: src/imap.c:707
-msgid "SEARCH error"
+msgid " SEARCH error\n"
 msgstr ""
 
 #: src/imap.c:710
-msgid "UID SEARCH error"
+msgid " UID SEARCH error\n"
 msgstr ""
 
 #: src/imap.c:713
-msgid "SELECT error"
+msgid " SELECT error\n"
 msgstr ""
 
 #: src/imap.c:716
-msgid "STATUS error"
+msgid " STATUS error\n"
 msgstr ""
 
 #: src/imap.c:719
-msgid "STORE error"
+msgid " STORE error\n"
 msgstr ""
 
 #: src/imap.c:722
-msgid "UID STORE error"
+msgid " UID STORE error\n"
 msgstr ""
 
 #: src/imap.c:725
-msgid "SUBSCRIBE error"
+msgid " SUBSCRIBE error\n"
 msgstr ""
 
 #: src/imap.c:728
-msgid "UNSUBSCRIBE error"
+msgid " UNSUBSCRIBE error\n"
 msgstr ""
 
 #: src/imap.c:731
-msgid "STARTTLS error"
+msgid " STARTTLS error\n"
 msgstr ""
 
 #: src/imap.c:734
-msgid "INVAL error"
+msgid " INVAL error\n"
 msgstr ""
 
 #: src/imap.c:737
-msgid "EXTENSION error"
+msgid " EXTENSION error\n"
 msgstr ""
 
 #: src/imap.c:740
-msgid "SASL error"
+msgid " SASL error\n"
 msgstr ""
 
 #: src/imap.c:744
-msgid "SSL error"
+msgid " SSL error\n"
 msgstr ""
 
 #: src/imap.c:748
 #, c-format
-msgid "Unknown error [%d]"
+msgid " Unknown error [%d]\n"
 msgstr ""
 
-#: src/imap.c:952
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5421,7 +5413,7 @@ msgid ""
 "and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:958
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5429,7 +5421,7 @@ msgid ""
 "and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:964
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5437,52 +5429,36 @@ msgid ""
 "and the SCRAM SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:970
-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:976
-msgid ""
-"\n"
-"\n"
-"LOGIN logins only work if libetpan has been compiled with SASL support and "
-"the LOGIN SASL plugin is installed."
-msgstr ""
-
-#: src/imap.c:983
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 
-#: src/imap.c:987
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 
-#: src/imap.c:1005
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr ""
 
-#: src/imap.c:1012 src/imap.c:1015
+#: src/imap.c:988 src/imap.c:991
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 
-#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 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:1154 src/inc.c:811 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:1155 src/inc.c:812 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"
@@ -5491,127 +5467,128 @@ msgid ""
 "not be secure."
 msgstr ""
 
-#: src/imap.c:1161 src/inc.c:818 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:1171
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr ""
 
-#: src/imap.c:1219
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr ""
 
-#: src/imap.c:1222
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr ""
 
-#: src/imap.c:1255 src/imap.c:4110
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: src/imap.c:1322
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr ""
 
-#: src/imap.c:1325
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr ""
 
-#: src/imap.c:1752
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr ""
 
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr ""
 
-#: src/imap.c:2550
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr ""
 
-#: src/imap.c:2557 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr ""
 
-#: src/imap.c:2908
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr ""
 
-#: src/imap.c:2911
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr ""
 
-#: src/imap.c:3229
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3244
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr ""
 
-#: src/imap.c:3375
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 
-#: src/imap.c:3488
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr ""
 
-#: src/imap.c:3767
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3852
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr ""
 
-#: src/imap.c:3955
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 
-#: src/imap.c:4107
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr ""
 
-#: src/imap.c:4117
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
-#: src/imap.c:4122
+#: 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:4130
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr ""
 
-#: src/imap.c:4353
+#: 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 accounts are disabled.\n"
+"Mail has been built without IMAP support; your IMAP account(s) are "
+"disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
@@ -5654,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 ""
 
@@ -5675,39 +5652,39 @@ msgstr ""
 msgid "Show only subscribed _folders"
 msgstr ""
 
-#: src/imap_gtk.c:194
+#: src/imap_gtk.c:195
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 "only and no mail, append '/' to the folder name)"
 msgstr ""
 
-#: src/imap_gtk.c:198 src/mh_gtk.c:147
+#: src/imap_gtk.c:199 src/mh_gtk.c:147
 msgid "Inherit properties from parent folder"
 msgstr ""
 
-#: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:411 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: 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:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr ""
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:412
-#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: 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:2036
 msgid "Rename folder"
 msgstr ""
 
-#: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2069
+#: 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:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgstr ""
 
-#: src/imap_gtk.c:357 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:359 src/mh_gtk.c:202 src/plugins/rssyl/rssyl_cb_menu.c:152
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -5716,44 +5693,44 @@ msgid ""
 "Do you really want to delete?"
 msgstr ""
 
-#: src/imap_gtk.c:376 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
-#: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: 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:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr ""
 
-#: src/imap_gtk.c:498
+#: src/imap_gtk.c:506
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr ""
 
-#: src/imap_gtk.c:501
+#: src/imap_gtk.c:509
 msgid "Search recursively"
 msgstr ""
 
-#: src/imap_gtk.c:506 src/imap_gtk.c:565
+#: src/imap_gtk.c:514 src/imap_gtk.c:573
 msgid "Subscriptions"
 msgstr ""
 
-#: src/imap_gtk.c:507
+#: src/imap_gtk.c:515
 msgid "_Search"
 msgstr ""
 
-#: src/imap_gtk.c:517
+#: src/imap_gtk.c:525
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr ""
 
-#: src/imap_gtk.c:528 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:530 src/imap_gtk.c:532
+#: src/imap_gtk.c:538 src/imap_gtk.c:540
 msgid "All of them"
 msgstr ""
 
-#: src/imap_gtk.c:548
+#: src/imap_gtk.c:556
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -5761,29 +5738,29 @@ msgid ""
 "\"Check for new folders\" at the mailbox's root folder."
 msgstr ""
 
-#: src/imap_gtk.c:557
+#: src/imap_gtk.c:565
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr ""
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:566
 msgid "subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:566
 msgid "unsubscribe"
 msgstr ""
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
+#: 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 ""
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:574
 msgid "_Subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:567 src/news_gtk.c:252
+#: src/imap_gtk.c:575 src/news_gtk.c:267
 msgid "_Unsubscribe"
 msgstr ""
 
@@ -5919,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
@@ -5958,222 +5935,222 @@ msgstr ""
 msgid "Import Pine file into Address Book"
 msgstr ""
 
-#: src/inc.c:186 src/inc.c:294 src/inc.c:321
+#: 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:343
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: src/inc.c:416
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:474
+#: src/inc.c:478
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:615 src/inc.c:669
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr ""
 
-#: src/inc.c:626
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:635
+#: 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:641
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr ""
 
-#: src/inc.c:646
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr ""
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:886
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr ""
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:88 src/summaryview.c:2782 src/summaryview.c:6292
+#: 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:666 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:752
+#: src/inc.c:759
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:756
+#: src/inc.c:763
 msgid "Finished (no new messages)"
 msgstr ""
 
-#: src/inc.c:795
+#: src/inc.c:802
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:825
+#: src/inc.c:832
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr ""
 
-#: src/inc.c:843
+#: src/inc.c:850
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr ""
 
-#: src/inc.c:847
+#: src/inc.c:854
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr ""
 
-#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
-#: src/send_message.c:496
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr ""
 
-#: src/inc.c:929
+#: src/inc.c:936
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr ""
 
-#: src/inc.c:935
+#: src/inc.c:942
 msgid "Getting the number of new messages (STAT)..."
 msgstr ""
 
-#: src/inc.c:939
+#: src/inc.c:946
 msgid "Getting the number of new messages (LAST)..."
 msgstr ""
 
-#: src/inc.c:943
+#: src/inc.c:950
 msgid "Getting the number of new messages (UIDL)..."
 msgstr ""
 
-#: src/inc.c:947
+#: src/inc.c:954
 msgid "Getting the size of messages (LIST)..."
 msgstr ""
 
-#: src/inc.c:954 src/send_message.c:514
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr ""
 
-#: src/inc.c:979
+#: src/inc.c:986
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr ""
 
-#: src/inc.c:992
+#: src/inc.c:999
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1151
+#: src/inc.c:1158
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr ""
 
-#: src/inc.c:1156
+#: src/inc.c:1163
 msgid "Error occurred while processing mail."
 msgstr ""
 
-#: src/inc.c:1162
+#: src/inc.c:1169
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1168
+#: src/inc.c:1175
 msgid "No disk space left."
 msgstr ""
 
-#: src/inc.c:1173
+#: src/inc.c:1180
 msgid "Can't write file."
 msgstr ""
 
-#: src/inc.c:1178
+#: src/inc.c:1185
 msgid "Socket error."
 msgstr ""
 
-#: src/inc.c:1181
+#: src/inc.c:1188
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr ""
 
-#: src/inc.c:1186 src/send_message.c:425 src/send_message.c:688
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1189
+#: src/inc.c:1196
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1194
+#: src/inc.c:1201
 msgid "Mailbox is locked."
 msgstr ""
 
-#: src/inc.c:1198
+#: src/inc.c:1205
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1204 src/send_message.c:673
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr ""
 
-#: src/inc.c:1210 src/send_message.c:676
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1215 src/send_message.c:692
+#: 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."
 msgstr ""
 
-#: src/inc.c:1220
+#: src/inc.c:1227
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr ""
 
-#: src/inc.c:1258
+#: src/inc.c:1265
 msgid "Incorporation cancelled\n"
 msgstr ""
 
-#: src/inc.c:1523
+#: src/inc.c:1530
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr ""
 
-#: src/inc.c:1529
+#: src/inc.c:1536
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
 
-#: src/inc.c:1536
+#: src/inc.c:1543
 msgid "On_ly once"
 msgstr ""
 
@@ -6185,21 +6162,21 @@ msgstr ""
 msgid "Nick Name"
 msgstr ""
 
-#: src/main.c:244
+#: src/main.c:242
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
 msgstr ""
 
-#: src/main.c:365
+#: src/main.c:363
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
 "Do you want to migrate this configuration?"
 msgstr ""
 
-#: src/main.c:367
+#: src/main.c:365
 #, c-format
 msgid ""
 "\n"
@@ -6208,42 +6185,42 @@ msgid ""
 "script available at %s."
 msgstr ""
 
-#: src/main.c:379
+#: src/main.c:377
 msgid "Keep old configuration"
 msgstr ""
 
-#: src/main.c:382
+#: src/main.c:380
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
 "on your disk."
 msgstr ""
 
-#: src/main.c:390
+#: src/main.c:388
 msgid "Migration of configuration"
 msgstr ""
 
-#: src/main.c:401
+#: src/main.c:399
 msgid "Copying configuration... This may take a while..."
 msgstr ""
 
-#: src/main.c:410
+#: src/main.c:408
 msgid "Migration failed!"
 msgstr ""
 
-#: src/main.c:419
+#: src/main.c:417
 msgid "Migrating configuration..."
 msgstr ""
 
-#: src/main.c:1119
+#: src/main.c:1117
 msgid "g_thread is not supported by glib.\n"
 msgstr ""
 
-#: src/main.c:1139 src/main.c:1143 src/main.c:1147
+#: src/main.c:1137 src/main.c:1141 src/main.c:1145
 msgid "(or older)"
 msgstr ""
 
-#: src/main.c:1448
+#: src/main.c:1445
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6256,50 +6233,50 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.c:1499
+#: src/main.c:1473
 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 "
 "mailbox parent folder's context menu to try to fix it."
 msgstr ""
 
-#: src/main.c:1505
+#: src/main.c:1479
 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 "
 "plugin and try again."
 msgstr ""
 
-#: src/main.c:1750
+#: src/main.c:1729
 msgid "Missing filename\n"
 msgstr ""
 
-#: src/main.c:1757
+#: src/main.c:1736
 msgid "Cannot open filename for reading\n"
 msgstr ""
 
-#: src/main.c:1768
+#: src/main.c:1747
 msgid "Malformed header\n"
 msgstr ""
 
-#: src/main.c:1775
+#: src/main.c:1754
 msgid "Duplicated 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1786
+#: src/main.c:1765
 msgid "Missing required 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1929
+#: src/main.c:1908
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:1931
+#: src/main.c:1910
 msgid "  --compose [address]    open composition window"
 msgstr ""
 
-#: src/main.c:1932
+#: src/main.c:1911
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6310,34 +6287,34 @@ msgid ""
 "                         empty line, then mail body until end of file."
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:1916
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 
-#: src/main.c:1938
+#: src/main.c:1917
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:1941
+#: src/main.c:1920
 msgid "  --receive              receive new messages"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:1921
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:1922
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr ""
 
-#: src/main.c:1944
+#: src/main.c:1923
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:1924
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6348,1018 +6325,1003 @@ msgid ""
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:1931
 msgid "  --send                 send all queued messages"
 msgstr ""
 
-#: src/main.c:1953
+#: src/main.c:1932
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:1933
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
 
-#: src/main.c:1956
+#: src/main.c:1935
 msgid "  --statistics           show session statistics"
 msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:1936
 msgid "  --reset-statistics     reset session statistics"
 msgstr ""
 
-#: src/main.c:1958
+#: src/main.c:1937
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgstr ""
 
-#: src/main.c:1960
+#: src/main.c:1939
 msgid "  --online               switch to online mode"
 msgstr ""
 
-#: src/main.c:1961
+#: src/main.c:1940
 msgid "  --offline              switch to offline mode"
 msgstr ""
 
-#: src/main.c:1962
+#: src/main.c:1941
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr ""
 
-#: src/main.c:1963
+#: src/main.c:1942
 msgid "  --debug                debug mode"
 msgstr ""
 
-#: src/main.c:1964
+#: src/main.c:1943
 msgid "  --toggle-debug         toggle debug mode"
 msgstr ""
 
-#: src/main.c:1965
+#: src/main.c:1944
 msgid "  --help -h              display this help and exit"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:1945
 msgid "  --version -v           output version information and exit"
 msgstr ""
 
-#: src/main.c:1967
+#: src/main.c:1946
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
 msgstr ""
 
-#: src/main.c:1968
+#: src/main.c:1947
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:1948
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
 msgstr ""
 
-#: src/main.c:1971
-msgid ""
-"  --geometry -geometry WxH+X+Y\n"
-"                         set geometry for main window"
-msgstr ""
-
-#: src/main.c:2024
+#: src/main.c:1998
 msgid "Unknown option\n"
 msgstr ""
 
-#: src/main.c:2042
+#: src/main.c:2016
 #, c-format
 msgid "Processing (%s)..."
 msgstr ""
 
-#: src/main.c:2045
+#: src/main.c:2019
 msgid "top level folder"
 msgstr ""
 
-#: src/main.c:2128
+#: src/main.c:2102
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:2129
+#: src/main.c:2103
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 
-#: src/main.c:2871
+#: src/main.c:2845
 msgid "NetworkManager: network is online.\n"
 msgstr ""
 
-#: src/main.c:2877
+#: src/main.c:2851
 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
-msgid "F_older..."
+#: 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 passphrase"
-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:6218
+#: 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/plugins/notification/notification_trayicon.c:372
+#: 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:548
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr ""
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:548
+#: 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:4982 src/summaryview.c:5709
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 
-#: src/mainwindow.c:4990
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 
-#: src/mainwindow.c:4998 src/summaryview.c:5720
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr ""
 
-#: src/mainwindow.c:5113
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 
-#: src/mainwindow.c:5172
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr ""
 
-#: src/mainwindow.c:5174
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 
-#: src/mainwindow.c:5188 src/setup.c:91
-#, c-format
-msgid "Scanning folder %s%c%s..."
-msgstr ""
-
-#: src/mainwindow.c:5332
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7437,7 +7399,7 @@ msgstr ""
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: src/mbox.c:555 src/messageview.c:1855 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 ""
@@ -7481,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:1446 src/messageview.c:1597
+#: 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"
@@ -7503,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"
@@ -7515,108 +7477,108 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 
-#: src/messageview.c:1376
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr ""
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr ""
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 
-#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
-#: src/summaryview.c:4814 src/textview.c:3063
+#: 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:1856
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr ""
 
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
-#: src/summaryview.c:4849
+#: 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:1917
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr ""
 
-#: src/messageview.c:1919
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr ""
 
-#: src/messageview.c:1950
+#: 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:1953
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr ""
 
-#: src/messageview.c:1959
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr ""
 
-#: src/messageview.c:1960
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr ""
 
-#: src/messageview.c:2003
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
 
-#: src/messageview.c:2009
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
 msgstr ""
 
-#: src/messageview.c:2013 src/messageview.c:2035
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr ""
 
-#: src/messageview.c:2014 src/messageview.c:2026
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr ""
 
-#: src/messageview.c:2019
+#: 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:2024 src/messageview.c:2037
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr ""
 
-#: src/messageview.c:2030
+#: 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:2103
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr ""
 
-#: src/messageview.c:2104
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -7624,46 +7586,46 @@ msgid ""
 "notification:"
 msgstr ""
 
-#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr ""
 
-#: src/messageview.c:2108
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr ""
 
-#: src/messageview.c:2197
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr ""
 
-#: src/messageview.c:2959
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
 msgstr ""
 
-#: src/messageview.c:2967
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
 msgstr ""
 
-#: src/messageview.c:2968
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
 msgstr ""
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
-#: src/summaryview.c:6987
+#: 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 ""
 
@@ -7671,7 +7633,7 @@ msgstr ""
 msgid "Remove _mailbox..."
 msgstr ""
 
-#: src/mh_gtk.c:222
+#: src/mh_gtk.c:223
 #, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -7679,14 +7641,14 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/mh_gtk.c:364 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:365 src/plugins/mailmbox/plugin_gtk.c:298
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
 
-#: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr ""
 
@@ -7756,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 ""
@@ -7815,7 +7777,7 @@ msgid "Type:"
 msgstr ""
 
 #: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:700 src/summaryview.c:2676
+#: src/plugins/pdf_viewer/poppler_viewer.c:700 src/summaryview.c:2695
 msgid "Size:"
 msgstr ""
 
@@ -7825,80 +7787,81 @@ 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 accounts are disabled.\n"
+"Mail has been built without News support; your News account(s) are "
+"disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
@@ -7911,57 +7874,19 @@ msgstr ""
 msgid "_Unsubscribe newsgroup"
 msgstr ""
 
-#: src/news_gtk.c:250
+#: src/news_gtk.c:265
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr ""
 
-#: src/news_gtk.c:251
+#: src/news_gtk.c:266
 msgid "Unsubscribe newsgroup"
 msgstr ""
 
-#: src/news_gtk.c:291
+#: src/news_gtk.c:306
 msgid "Rename newsgroup folder"
 msgstr ""
 
-#: src/password.c:128 src/password.c:129
-msgid "Input master passphrase"
-msgstr ""
-
-#: src/password.c:141
-msgid "Incorrect master passphrase."
-msgstr ""
-
-#: src/password_gtk.c:67
-msgid "New passphrases do not match, try again."
-msgstr ""
-
-#: src/password_gtk.c:80
-msgid "Incorrect old master passphrase entered, try again."
-msgstr ""
-
-#: src/password_gtk.c:144
-msgid "Changing master passphrase"
-msgstr ""
-
-#: src/password_gtk.c:165
-msgid ""
-"If a master passphrase is currently active, it\n"
-"needs to be entered."
-msgstr ""
-
-#: src/password_gtk.c:175
-msgid "Old passphrase:"
-msgstr ""
-
-#: src/password_gtk.c:191
-msgid "New passphrase:"
-msgstr ""
-
-#: src/password_gtk.c:202
-msgid "Confirm passphrase:"
-msgstr ""
-
 #: src/plugins/acpi_notifier/acpi_notifier.c:51
 msgid "Acpi Notifier"
 msgstr ""
@@ -8336,7 +8261,7 @@ msgstr ""
 
 #: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/archive/archiver_prefs.c:194
-#: src/plugins/pgpcore/select-keys.c:421
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr ""
 
@@ -8517,12 +8442,12 @@ msgid "Remove attachments"
 msgstr ""
 
 #: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:944
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:945
 msgid "Remove"
 msgstr ""
 
 #: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:80 src/summaryview.c:2770
+#: src/prefs_summary_column.c:80 src/summaryview.c:2789
 msgid "Attachment"
 msgstr ""
 
@@ -8678,7 +8603,7 @@ msgid "Bogofilter: learning from message..."
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter.c:779
-#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:513
+#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:511
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr ""
@@ -8710,12 +8635,12 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
+#: 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:677
+#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr ""
@@ -8740,7 +8665,7 @@ msgstr ""
 
 #: 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:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1507
 msgid "KB"
 msgstr ""
 
@@ -8841,15 +8766,15 @@ msgstr ""
 msgid "Bsfilter"
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:300
+#: src/plugins/bsfilter/bsfilter.c:299
 msgid "Bsfilter: fetching body..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:309
+#: src/plugins/bsfilter/bsfilter.c:308
 msgid "Bsfilter: filtering message..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:394
+#: src/plugins/bsfilter/bsfilter.c:393
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -8857,18 +8782,18 @@ msgid ""
 "a few hundred spam and ham messages."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:401
+#: src/plugins/bsfilter/bsfilter.c:400
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:502
+#: src/plugins/bsfilter/bsfilter.c:501
 msgid "Bsfilter: learning from message..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:643
+#: src/plugins/bsfilter/bsfilter.c:641
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -9224,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:1442 src/prefs_account.c:1531 src/prefs_account.c:2002
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr ""
@@ -9233,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"
@@ -9401,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"
@@ -9416,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"
@@ -9446,98 +9371,98 @@ 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:560
+#: src/plugins/gdata/cm_gdata_contacts.c:556
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
+#: src/plugins/gdata/cm_gdata_prefs.c:83
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:95
+#: src/plugins/gdata/cm_gdata_prefs.c:94
 msgid "Polling interval (seconds):"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:102
+#: src/plugins/gdata/cm_gdata_prefs.c:101
 msgid "Maximum number of results:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:138 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
+#: src/plugins/gdata/cm_gdata_prefs.c:137 src/plugins/gdata/gdata_plugin.c:101
+#: src/plugins/gdata/gdata_plugin.c:156
 msgid "GData"
 msgstr ""
 
-#: src/plugins/gdata/gdata_plugin.c:108
+#: src/plugins/gdata/gdata_plugin.c:107
 msgid "Failed to register address completion hook in the GData plugin"
 msgstr ""
 
-#: src/plugins/gdata/gdata_plugin.c:115
+#: src/plugins/gdata/gdata_plugin.c:114
 msgid "Failed to register offline switch hook in the GData plugin"
 msgstr ""
 
-#: src/plugins/gdata/gdata_plugin.c:170
+#: src/plugins/gdata/gdata_plugin.c:161
 msgid ""
 "This plugin provides access to the GData protocol for Claws Mail.\n"
 "\n"
@@ -9548,7 +9473,7 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 
-#: src/plugins/gdata/gdata_plugin.c:196
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr ""
 
@@ -9656,8 +9581,8 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1487
-#: src/prefs_matcher.c:336 src/prefs_receive.c:177
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1486
+#: src/prefs_matcher.c:336
 msgid "hours"
 msgstr ""
 
@@ -9742,6 +9667,11 @@ msgid "Request timeout"
 msgstr ""
 
 #: 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:557
+#: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr ""
 
@@ -9785,64 +9715,64 @@ msgstr ""
 #: src/plugins/mailmbox/plugin_gtk.c:330
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be deleted.\n"
+"All folder(s) and message(s) under '%s' will be deleted.\n"
 "Do you really want to delete?"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:435
+#: src/plugins/managesieve/managesieve.c:439
 msgid "No Sieve auth method available\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:443
 msgid "Selected Sieve auth method not available\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:672
+#: src/plugins/managesieve/managesieve.c:676
 msgid "Disconnected"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:680
 #, c-format
 msgid "Disconnected: %s"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:724
-#: src/plugins/managesieve/managesieve.c:869
+#: src/plugins/managesieve/managesieve.c:728
+#: src/plugins/managesieve/managesieve.c:873
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:731
+#: src/plugins/managesieve/managesieve.c:735
 msgid "TLS failed"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:796
-#: src/plugins/managesieve/managesieve.c:812
-#: src/plugins/managesieve/managesieve.c:839
-#: src/plugins/managesieve/managesieve.c:921
-#: src/plugins/managesieve/managesieve.c:939
+#: 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 ""
 
-#: src/plugins/managesieve/managesieve.c:865
+#: src/plugins/managesieve/managesieve.c:869
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:874
+#: src/plugins/managesieve/managesieve.c:878
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:1131
+#: src/plugins/managesieve/managesieve.c:1135
 msgid "Sieve: retrying auth\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:1133
+#: src/plugins/managesieve/managesieve.c:1137
 msgid "Auth method not available"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5607
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5657
 msgid "_Filter"
 msgstr ""
 
@@ -9899,7 +9829,7 @@ msgid "%s - Sieve Filter%s"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1275
+#: src/plugins/pdf_viewer/poppler_viewer.c:1278
 msgid "Loading..."
 msgstr ""
 
@@ -9966,94 +9896,94 @@ msgstr ""
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:149
+#: src/plugins/managesieve/sieve_prefs.c:146
 msgid "Enable Sieve"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1090
+#: src/plugins/managesieve/sieve_prefs.c:153 src/prefs_account.c:1095
 msgid "Server information"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:165
+#: src/plugins/managesieve/sieve_prefs.c:162
 msgid "Server name"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:174
+#: src/plugins/managesieve/sieve_prefs.c:171
 msgid "Connect to this host instead of the host used for receiving mail"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:178
+#: src/plugins/managesieve/sieve_prefs.c:175
 msgid "Server port"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:185
+#: src/plugins/managesieve/sieve_prefs.c:182
 msgid "Connect to this port instead of the default"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:189
+#: src/plugins/managesieve/sieve_prefs.c:186
 msgid "Encryption"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:194
+#: src/plugins/managesieve/sieve_prefs.c:191
 msgid "No TLS"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:196
+#: src/plugins/managesieve/sieve_prefs.c:193
 msgid "Use TLS when available"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:198
+#: src/plugins/managesieve/sieve_prefs.c:195
 msgid "Require TLS"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:264
+#: src/plugins/managesieve/sieve_prefs.c:203
+#: src/plugins/rssyl/rssyl_feed_props.c:267
 msgid "No authentication"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:208
+#: src/plugins/managesieve/sieve_prefs.c:205
 msgid "Use same authentication as for receiving mail"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:210
+#: src/plugins/managesieve/sieve_prefs.c:207
 msgid "Specify authentication"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:240
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
-#: src/prefs_account.c:1795
+#: src/plugins/managesieve/sieve_prefs.c:237
+#: 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:250
-#: src/plugins/rssyl/rssyl_feed_props.c:395
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
-#: src/prefs_account.c:1815 src/prefs_account.c:2529 src/prefs_account.c:2551
-#: src/wizard.c:1215 src/wizard.c:1635
+#: src/plugins/managesieve/sieve_prefs.c:247
+#: src/plugins/rssyl/rssyl_feed_props.c:394
+#: 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:266 src/prefs_account.c:1570
-#: src/prefs_account.c:1767
+#: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1580
-#: src/prefs_account.c:1776 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:391
+#: src/plugins/managesieve/sieve_prefs.c:379
 msgid "Sieve server must not contain a space."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:397
+#: src/plugins/managesieve/sieve_prefs.c:385
 msgid "Sieve server is not entered."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:425
+#: src/plugins/managesieve/sieve_prefs.c:413
 msgid "Sieve"
 msgstr ""
 
@@ -10181,7 +10111,7 @@ msgid "New Calendar message"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:340
-#: src/plugins/notification/notification_trayicon.c:905
+#: src/plugins/notification/notification_trayicon.c:866
 msgid "A new calendar message arrived"
 msgstr ""
 
@@ -10190,7 +10120,7 @@ msgid "New RSS feed article"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:344
-#: src/plugins/notification/notification_trayicon.c:908
+#: src/plugins/notification/notification_trayicon.c:869
 msgid "A new article in a RSS feed arrived"
 msgstr ""
 
@@ -10203,7 +10133,7 @@ msgid "Unknown message type arrived"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:381
-#: src/plugins/notification/notification_trayicon.c:677
+#: src/plugins/notification/notification_trayicon.c:638
 msgid "Present main window"
 msgstr ""
 
@@ -10228,7 +10158,7 @@ msgid "Calendar message"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:504
-#: src/plugins/notification/notification_trayicon.c:942
+#: src/plugins/notification/notification_trayicon.c:903
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
@@ -10266,7 +10196,7 @@ msgid "Popup"
 msgstr ""
 
 #: src/plugins/notification/notification_prefs.c:471 src/prefs_actions.c:263
-#: src/prefs_receive.c:152
+#: src/prefs_receive.c:133
 msgid "Command"
 msgstr ""
 
@@ -10327,12 +10257,12 @@ msgid "Show banner"
 msgstr ""
 
 #: src/plugins/notification/notification_prefs.c:767
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:231 src/prefs_summaries.c:504
+#: 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 ""
 
-#: src/plugins/notification/notification_prefs.c:769 src/prefs_receive.c:229
+#: 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 ""
@@ -10361,7 +10291,8 @@ msgstr ""
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:850
+#: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
+#: src/prefs_message.c:223
 msgid "pixel(s)"
 msgstr ""
 
@@ -10428,14 +10359,6 @@ msgstr ""
 msgid "Popup timeout"
 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/prefs_receive.c:203 src/prefs_summaries.c:538
-msgid "seconds"
-msgstr ""
-
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
 msgstr ""
@@ -10544,78 +10467,74 @@ msgstr ""
 msgid "Toggle minimize"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:121
+#: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:122
-msgid "_Get Mail from account"
-msgstr ""
-
-#: src/plugins/notification/notification_trayicon.c:124
+#: src/plugins/notification/notification_trayicon.c:116
 msgid "_Email"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:125
+#: src/plugins/notification/notification_trayicon.c:117
 msgid "E_mail from account"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:126
+#: src/plugins/notification/notification_trayicon.c:118
 msgid "Open A_ddressbook"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:127
+#: src/plugins/notification/notification_trayicon.c:119
 msgid "E_xit Claws Mail"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:132
+#: src/plugins/notification/notification_trayicon.c:124
 msgid "_Work Offline"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:134
+#: src/plugins/notification/notification_trayicon.c:126
 msgid "Show Trayicon Notifications"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:277
+#: src/plugins/notification/notification_trayicon.c:269
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:855
+#: src/plugins/notification/notification_trayicon.c:816
 msgid "New mail message"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:857
+#: src/plugins/notification/notification_trayicon.c:818
 msgid "New news post"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:859
+#: src/plugins/notification/notification_trayicon.c:820
 msgid "New calendar message"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:861
+#: src/plugins/notification/notification_trayicon.c:822
 msgid "New article in RSS feed"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:864
+#: src/plugins/notification/notification_trayicon.c:825
 msgid "New messages arrived"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:920
+#: src/plugins/notification/notification_trayicon.c:881
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_trayicon.c:931
+#: src/plugins/notification/notification_trayicon.c:892
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_trayicon.c:953
+#: 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"
@@ -10659,87 +10578,87 @@ msgstr ""
 msgid "PDF properties"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1326
+#: src/plugins/pdf_viewer/poppler_viewer.c:1329
 msgid "Enter password"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1327
+#: src/plugins/pdf_viewer/poppler_viewer.c:1330
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1342
+#: src/plugins/pdf_viewer/poppler_viewer.c:1345
 #, c-format
 msgid "%s Document"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1348
+#: src/plugins/pdf_viewer/poppler_viewer.c:1351
 #, c-format
 msgid "of %d"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1364
+#: src/plugins/pdf_viewer/poppler_viewer.c:1368
 msgid "PDF rendering failed for an unknown reason."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1728
-#: src/plugins/pdf_viewer/poppler_viewer.c:1945
+#: src/plugins/pdf_viewer/poppler_viewer.c:1732
+#: src/plugins/pdf_viewer/poppler_viewer.c:1950
 msgid "Document Index"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1913
+#: src/plugins/pdf_viewer/poppler_viewer.c:1918
 msgid "First Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1921
 msgid "Previous Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1924
 msgid "Next Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1922
+#: src/plugins/pdf_viewer/poppler_viewer.c:1927
 msgid "Last Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1925
+#: src/plugins/pdf_viewer/poppler_viewer.c:1930
 msgid "Zoom In"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1932
 msgid "Zoom Out"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+#: src/plugins/pdf_viewer/poppler_viewer.c:1935
 msgid "Fit Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1933
+#: src/plugins/pdf_viewer/poppler_viewer.c:1938
 msgid "Fit Page Width"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1941
 msgid "Rotate Left"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1939
+#: src/plugins/pdf_viewer/poppler_viewer.c:1944
 msgid "Rotate Right"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1942
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Document Info"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
+#: src/plugins/pdf_viewer/poppler_viewer.c:1952
 msgid "Page Number"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1949
+#: src/plugins/pdf_viewer/poppler_viewer.c:1954
 msgid "Zoom Factor"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2054
+#: src/plugins/pdf_viewer/poppler_viewer.c:2059
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -10748,13 +10667,13 @@ msgid ""
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2060
-#: src/plugins/pdf_viewer/poppler_viewer.c:2068
-#: src/plugins/pdf_viewer/poppler_viewer.c:2088
+#: 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 ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2064
+#: src/plugins/pdf_viewer/poppler_viewer.c:2069
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -10772,97 +10691,101 @@ msgstr ""
 msgid "Failed to register PGP address autocompletion hook"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:127
+#: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:127
 msgid "Passphrase"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:248
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:260
+#: src/plugins/pgpcore/passphrase.c:261
 msgid "Please enter the passphrase for the new key:"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:263
+#: src/plugins/pgpcore/passphrase.c:264
 msgid "Passphrases did not match.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:268
 msgid "Please re-enter the passphrase for the new key:"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:272
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Please enter the passphrase for:"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:275
+#: src/plugins/pgpcore/passphrase.c:276
 msgid "Bad passphrase.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:121
 msgid "Key import"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:174
+#: 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 ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:279
+#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:201
 msgid ""
 "\n"
 "  Key ID "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:132 src/plugins/pgpcore/pgp_viewer.c:194
 msgid "   This key is not in your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:133
 msgid "   It should be possible to import it "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:135
 msgid ""
 "when working online,\n"
 "   or "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:188
+#: src/plugins/pgpcore/pgp_viewer.c:136
 msgid ""
 "with the following command: \n"
 "\n"
 "     "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:143
 msgid ""
 "\n"
 "  Importing key ID "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:268
+#: src/plugins/pgpcore/pgp_viewer.c:186
 msgid "   This key has been imported to your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:270
+#: src/plugins/pgpcore/pgp_viewer.c:188
 msgid "   This key couldn't be imported to your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:271
+#: src/plugins/pgpcore/pgp_viewer.c:189
 msgid "   Key servers are sometimes slow.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid ""
 "   You can try to import it manually with the command:\n"
 "\n"
 "     "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:282
+#: src/plugins/pgpcore/pgp_viewer.c:195
+msgid "   Key import isn't implemented in Windows.\n"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:204
 msgid "   This key is in your keyring.\n"
 msgstr ""
 
@@ -10911,10 +10834,9 @@ msgstr ""
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:476
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
-#: src/prefs_receive.c:187
-msgid "minutes"
+#: 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 ""
 
 #: src/plugins/pgpcore/prefs_gpg.c:173
@@ -10939,96 +10861,96 @@ msgstr ""
 msgid "Select GnuPG executable"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:356
+#: src/plugins/pgpcore/prefs_gpg.c:353
 msgid "Sign key"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:364
+#: src/plugins/pgpcore/prefs_gpg.c:361
 msgid "Use default GnuPG key"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:375
+#: src/plugins/pgpcore/prefs_gpg.c:372
 msgid "Select key by your email address"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:386
+#: src/plugins/pgpcore/prefs_gpg.c:383
 msgid "Specify key manually"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:396
+#: src/plugins/pgpcore/prefs_gpg.c:393
 msgid "User or key ID:"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:437
+#: src/plugins/pgpcore/prefs_gpg.c:434
 msgid "No secret key found."
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:440
+#: src/plugins/pgpcore/prefs_gpg.c:437
 msgid "Generate a new key pair"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:618
+#: src/plugins/pgpcore/prefs_gpg.c:615
 msgid "GPG"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:94
+#: src/plugins/pgpcore/select-keys.c:95
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:97
+#: src/plugins/pgpcore/select-keys.c:98
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:141
 msgid "Undefined"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:149
-#: src/plugins/pgpcore/sgpgme.c:165
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/sgpgme.c:161
 msgid "Marginal"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:246 src/plugins/pgpcore/sgpgme.c:153
-#: src/plugins/pgpcore/sgpgme.c:169
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:149
+#: src/plugins/pgpcore/sgpgme.c:165
 msgid "Ultimate"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:367
+#: src/plugins/pgpcore/select-keys.c:368
 msgid "Select Keys"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:394
+#: src/plugins/pgpcore/select-keys.c:395
 msgid "Key ID"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:398
 msgid "Trust"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:422
+#: src/plugins/pgpcore/select-keys.c:423
 msgid "_Other"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:423
+#: src/plugins/pgpcore/select-keys.c:424
 msgid "Do_n't encrypt"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:582
+#: src/plugins/pgpcore/select-keys.c:583
 msgid "Add key"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:583
+#: src/plugins/pgpcore/select-keys.c:584
 msgid "Enter another user or key ID:"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:605
+#: src/plugins/pgpcore/select-keys.c:606
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:606
+#: src/plugins/pgpcore/select-keys.c:607
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11040,228 +10962,228 @@ msgid ""
 "Do you trust this key enough to use it anyway?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:83 src/privacy.c:249 src/privacy.c:253
+#: 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 ""
 
-#: src/plugins/pgpcore/sgpgme.c:163
+#: src/plugins/pgpcore/sgpgme.c:159
 msgid "Untrusted"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
+#: src/plugins/pgpcore/sgpgme.c:199 src/plugins/pgpcore/sgpgme.c:218
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:241 src/plugins/pgpcore/sgpgme.c:245
+#: src/plugins/pgpcore/sgpgme.c:203 src/plugins/pgpcore/sgpgme.c:207
 msgid "The signature has not been checked."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:251
+#: src/plugins/pgpcore/sgpgme.c:213
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:269
+#: src/plugins/pgpcore/sgpgme.c:231
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:234
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:237
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:282
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:305
+#: 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 ""
 
-#: src/plugins/pgpcore/sgpgme.c:292
+#: src/plugins/pgpcore/sgpgme.c:254
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:295
+#: src/plugins/pgpcore/sgpgme.c:257
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:298
+#: src/plugins/pgpcore/sgpgme.c:260
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:301
+#: src/plugins/pgpcore/sgpgme.c:263
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:310
+#: src/plugins/pgpcore/sgpgme.c:272
 msgid "The signature has not been checked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:329
+#: src/plugins/pgpcore/sgpgme.c:291
 msgid "Error checking signature: no status\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:309
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:365
+#: src/plugins/pgpcore/sgpgme.c:327
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:371
+#: src/plugins/pgpcore/sgpgme.c:333
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:338
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:381
+#: src/plugins/pgpcore/sgpgme.c:343
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:386
+#: src/plugins/pgpcore/sgpgme.c:348
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:391
+#: src/plugins/pgpcore/sgpgme.c:353
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:404
+#: src/plugins/pgpcore/sgpgme.c:366
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:406
+#: src/plugins/pgpcore/sgpgme.c:368
 msgid "Revoked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:411
+#: src/plugins/pgpcore/sgpgme.c:373
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:412
+#: src/plugins/pgpcore/sgpgme.c:374
 msgid "No key!"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:414
+#: src/plugins/pgpcore/sgpgme.c:376
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:432
+#: src/plugins/pgpcore/sgpgme.c:394
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:438
+#: src/plugins/pgpcore/sgpgme.c:400
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:472
+#: src/plugins/pgpcore/sgpgme.c:434
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:488
+#: src/plugins/pgpcore/sgpgme.c:450
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:643
+#: src/plugins/pgpcore/sgpgme.c:605
 msgid "Secret key specification is ambiguous"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:653
+#: src/plugins/pgpcore/sgpgme.c:615
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:666
+#: src/plugins/pgpcore/sgpgme.c:628
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:759
+#: src/plugins/pgpcore/sgpgme.c:717
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:765
+#: 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 ""
 
-#: src/plugins/pgpcore/sgpgme.c:773
+#: src/plugins/pgpcore/sgpgme.c:731
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:789
+#: src/plugins/pgpcore/sgpgme.c:747
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:866
+#: 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"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:871
+#: src/plugins/pgpcore/sgpgme.c:786
 msgid "No PGP key found"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:872
+#: 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?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:961 src/plugins/pgpcore/sgpgme.c:983
+#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:864
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:989
+#: src/plugins/pgpcore/sgpgme.c:879
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:993
+#: src/plugins/pgpcore/sgpgme.c:883
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -11270,18 +11192,22 @@ msgid ""
 "Do you want to export it to a keyserver?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:997
+#: src/plugins/pgpcore/sgpgme.c:887
 msgid "Key generated"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1073
+#: src/plugins/pgpcore/sgpgme.c:926
 msgid "Key exported."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1075
+#: src/plugins/pgpcore/sgpgme.c:928
 msgid "Couldn't export key."
 msgstr ""
 
+#: src/plugins/pgpcore/sgpgme.c:932
+msgid "Key export isn't implemented in Windows."
+msgstr ""
+
 #: src/plugins/pgpinline/pgpinline.c:155
 msgid "Incorrect part"
 msgstr ""
@@ -11302,7 +11228,7 @@ msgstr ""
 #: 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:413
+#: src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr ""
@@ -11423,11 +11349,11 @@ msgstr ""
 msgid "Signature boundary not found."
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:496
 msgid "Couldn't parse decrypted file."
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:501
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:503
 msgid "Couldn't parse decrypted file parts."
 msgstr ""
 
@@ -11478,13 +11404,13 @@ msgid "Show Python console..."
 msgstr ""
 
 #: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_feed_props.c:482
 msgid "Refresh"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2518
-#: src/prefs_account.c:2540 src/prefs_account.c:2809 src/wizard.c:1205
-#: src/wizard.c:1625
+#: 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 ""
 
@@ -11618,26 +11544,26 @@ msgstr ""
 msgid "'%c' can't be used in folder name."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:251
+#: 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] ""
 msgstr[1] ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:314
+#: src/plugins/rssyl/rssyl_cb_menu.c:316
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:315
+#: src/plugins/rssyl/rssyl_cb_menu.c:317
 msgid "Remove feed tree"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:349
+#: src/plugins/rssyl/rssyl_cb_menu.c:351
 msgid "Select an OPML file"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:158
+#: 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 ""
@@ -11682,104 +11608,102 @@ msgstr ""
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:270
+#: src/plugins/rssyl/rssyl_feed_props.c:273
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:290
 msgid "Use default refresh interval"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:302
 msgid "Keep old items"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:308
 msgid "_Trim"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:313
 msgid "Fetch comments if possible"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:339
+#: src/plugins/rssyl/rssyl_feed_props.c:338
 msgid "Always mark it as new"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:345
+#: src/plugins/rssyl/rssyl_feed_props.c:344
 msgid "Only mark it as new if its text has changed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:351
+#: src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "Never mark it as new"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 msgid "Add item title to the top of message"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:363
+#: src/plugins/rssyl/rssyl_feed_props.c:362
 msgid "Ignore title rename"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:368
+#: 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 ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:372
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/rssyl/rssyl_feed_props.c:371
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:391
 msgid "User name"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:404
 msgid "Source URL"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:418
+#: src/plugins/rssyl/rssyl_feed_props.c:417
 msgid "Fetch comments on posts aged less than"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:426
-#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
-msgid "days"
+#: src/plugins/rssyl/rssyl_feed_props.c:425
+msgid "day(s)"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:427
+#: src/plugins/rssyl/rssyl_feed_props.c:426
 msgid "Set to -1 to fetch all comments"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:451
+#: src/plugins/rssyl/rssyl_feed_props.c:450
 msgid "If an item changes"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:455
 msgid "Items"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:469
+#: src/plugins/rssyl/rssyl_feed_props.c:468
 msgid "Refresh interval"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_feed_props.c:476
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:529
+#: src/plugins/rssyl/rssyl_feed_props.c:528
 msgid "_OK"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:537
+#: src/plugins/rssyl/rssyl_feed_props.c:536
 msgid "Set feed properties"
 msgstr ""
 
@@ -11830,7 +11754,7 @@ msgid ""
 "there?"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr ""
 
@@ -11890,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 ""
 
@@ -11935,12 +11859,12 @@ msgstr ""
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:231
+#: src/plugins/rssyl/rssyl_update_feed.c:228
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:258
+#: src/plugins/rssyl/rssyl_update_feed.c:250
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -11949,7 +11873,7 @@ msgid ""
 "Please contact developers, this should not happen."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:342
+#: src/plugins/rssyl/rssyl_update_feed.c:334
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr ""
 
@@ -11960,7 +11884,7 @@ msgid ""
 msgstr ""
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:913
+#: src/plugins/smime/smime.c:915
 msgid "S/MIME"
 msgstr ""
 
@@ -11984,44 +11908,44 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
 
-#: src/plugins/smime/smime.c:421
+#: src/plugins/smime/smime.c:423
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr ""
 
-#: src/plugins/smime/smime.c:449
+#: src/plugins/smime/smime.c:451
 msgid "Couldn't open temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:460 src/plugins/smime/smime.c:475
+#: src/plugins/smime/smime.c:462 src/plugins/smime/smime.c:477
 msgid "Couldn't write to temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:486
+#: src/plugins/smime/smime.c:488
 msgid "Couldn't close temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:708
+#: src/plugins/smime/smime.c:710
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "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:83
+#: 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"
@@ -12031,19 +11955,19 @@ msgid ""
 " * lists.debian.org nomination system"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:413
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:169
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1573
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr ""
 
@@ -12077,7 +12001,7 @@ msgstr ""
 
 #: src/plugins/spamassassin/spamassassin.c:429
 msgid ""
-"Claws Mail needs network access in order to feed the mail to the remote "
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgstr ""
 
@@ -12220,6 +12144,11 @@ msgstr ""
 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
+msgid "days"
+msgstr ""
+
 #: src/plugins/vcalendar/month-view.c:109
 msgid "Monday"
 msgstr ""
@@ -12309,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:735
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr ""
 
@@ -12508,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"
@@ -12590,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"
@@ -12599,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"
@@ -12607,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"
@@ -12615,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 ""
 
@@ -12706,15 +12635,15 @@ msgstr ""
 msgid "Later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1242
 msgid "Accepted: "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1244
 msgid "Declined: "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1246
 msgid "Tentatively Accepted: "
 msgstr ""
 
@@ -12736,7 +12665,7 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:779
 msgid ""
-"The following people are busy at the time of your planned meeting:\n"
+"The following person(s) are busy at the time of your planned meeting:\n"
 "- "
 msgstr ""
 
@@ -12999,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 ""
 
@@ -13135,496 +13064,508 @@ msgstr ""
 msgid "TOP command unsupported\n"
 msgstr ""
 
-#: src/prefs_account.c:334 src/prefs_account.c:1451 src/prefs_account.c:2446
-#: src/wizard.c:1499
+#: 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:335 src/prefs_account.c:1564 src/prefs_account.c:2461
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr ""
 
-#: src/prefs_account.c:336
+#: src/prefs_account.c:338
 msgid "News (NNTP)"
 msgstr ""
 
-#: src/prefs_account.c:337 src/wizard.c:1501
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr ""
 
-#: src/prefs_account.c:338
+#: src/prefs_account.c:340
 msgid "None (SMTP only)"
 msgstr ""
 
-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1033
 msgid "Name of account"
 msgstr ""
 
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1042
 msgid "Set as default"
 msgstr ""
 
-#: src/prefs_account.c:1045
+#: src/prefs_account.c:1050
 msgid "Personal information"
 msgstr ""
 
-#: src/prefs_account.c:1054
+#: src/prefs_account.c:1059
 msgid "Full name"
 msgstr ""
 
-#: src/prefs_account.c:1060
+#: src/prefs_account.c:1065
 msgid "Mail address"
 msgstr ""
 
-#: src/prefs_account.c:1123 src/wizard.c:1524
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr ""
 
-#: src/prefs_account.c:1125 src/wizard.c:1525
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr ""
 
-#: src/prefs_account.c:1142
+#: src/prefs_account.c:1147
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
 msgstr ""
 
-#: src/prefs_account.c:1171
+#: src/prefs_account.c:1176
 msgid "This server requires authentication"
 msgstr ""
 
-#: src/prefs_account.c:1178
+#: src/prefs_account.c:1183
 msgid "Authenticate on connect"
 msgstr ""
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1237
 msgid "News server"
 msgstr ""
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1243
 msgid "Server for receiving"
 msgstr ""
 
-#: src/prefs_account.c:1244
+#: src/prefs_account.c:1249
 msgid "Local mailbox"
 msgstr ""
 
-#: src/prefs_account.c:1251
+#: src/prefs_account.c:1256
 msgid "SMTP server (send)"
 msgstr ""
 
-#: src/prefs_account.c:1259
+#: src/prefs_account.c:1264
 msgid "Use mail command rather than SMTP server"
 msgstr ""
 
-#: src/prefs_account.c:1268
+#: src/prefs_account.c:1273
 msgid "command to send mails"
 msgstr ""
 
-#: src/prefs_account.c:1332
+#: src/prefs_account.c:1338
 #, c-format
 msgid "Account%d"
 msgstr ""
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1424
 msgid "Local"
 msgstr ""
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1430 src/prefs_account.c:1519
 msgid "Default Inbox"
 msgstr ""
 
-#: src/prefs_account.c:1438 src/prefs_account.c:1445 src/prefs_account.c:1527
-#: src/prefs_account.c:1534
+#: 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 ""
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1452
 msgid "Use secure authentication (APOP)"
 msgstr ""
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1455
 msgid "Remove messages on server when received"
 msgstr ""
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1466
 msgid "Remove after"
 msgstr ""
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1484
+#: src/prefs_account.c:1473 src/prefs_account.c:1483
 msgid "0 days and 0 hours : remove immediately"
 msgstr ""
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1496
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1500
+#: 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 ""
 
-#: src/prefs_account.c:1540 src/prefs_account.c:2476
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1546
 msgid "Maximum number of articles to download"
 msgstr ""
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1556
 msgid "unlimited if 0 is specified"
 msgstr ""
 
-#: src/prefs_account.c:1582
-msgid "Plain text"
-msgstr ""
-
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr ""
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr ""
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr ""
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account.c:1722 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:1724
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr ""
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr ""
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr ""
 
-#: src/prefs_account.c:1837
+#: 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:1848
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr ""
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr ""
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1867
+msgid "minutes"
+msgstr ""
+
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr ""
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr ""
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr ""
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr ""
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr ""
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr ""
 
-#: src/prefs_account.c:2076 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:2089 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:2175 src/prefs_account.c:3328
+#: 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:2190 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:2205 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:2252
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr ""
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr ""
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr ""
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr ""
 
-#: src/prefs_account.c:2450 src/prefs_account.c:2465 src/prefs_account.c:2479
+#: 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:2453
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr ""
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2502
+#: 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:2468
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr ""
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr ""
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr ""
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr ""
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr ""
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr ""
 
-#: src/prefs_account.c:2520 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2544
+#: 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:2537
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr ""
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr ""
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr ""
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr ""
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr ""
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr ""
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr ""
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr ""
 
-#: src/prefs_account.c:2743
+#: 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:2757
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr ""
 
-#: src/prefs_account.c:2766
+#: 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:2745
+msgid ""
+"Moves deleted mails to trash instead of using the \\Deleted flag without "
+"expunging."
+msgstr ""
+"Moves deleted mails to wastebin instead of using the \\Deleted flag without "
+"expunging."
+
+#: 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:2822
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr ""
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr ""
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr ""
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr ""
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr ""
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr ""
 
-#: src/prefs_account.c:3346 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:3364
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr ""
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr ""
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr ""
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr ""
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr ""
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr ""
 
-#: src/prefs_account.c:4019 src/prefs_account.c:4036 src/wizard.c:1066
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr ""
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr ""
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr ""
@@ -13849,7 +13790,7 @@ msgstr ""
 msgid "for a literal %"
 msgstr ""
 
-#: src/prefs_actions.c:1004 src/prefs_themes.c:935
+#: src/prefs_actions.c:1004 src/prefs_themes.c:936
 msgid "Actions"
 msgstr ""
 
@@ -13873,21 +13814,21 @@ msgstr ""
 msgid "Action string is not valid."
 msgstr ""
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:220 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr ""
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:298
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr ""
 
-#: src/prefs_common.c:306 src/prefs_quote.c:85
+#: 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 ""
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:448
 msgid "%x(%a) %H:%M"
 msgstr ""
 
@@ -14137,7 +14078,7 @@ msgid "Message flags"
 msgstr ""
 
 #: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:78 src/summaryview.c:2776
+#: src/prefs_summary_column.c:78 src/summaryview.c:2795
 msgid "Mark"
 msgstr ""
 
@@ -14626,7 +14567,7 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs_gtk.c:911 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr ""
 
@@ -14758,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 ""
 
@@ -14834,11 +14775,11 @@ msgstr ""
 msgid "whole message"
 msgstr ""
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6282
+#: src/prefs_matcher.c:394 src/summaryview.c:6332
 msgid "Marked"
 msgstr ""
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6280
+#: src/prefs_matcher.c:395 src/summaryview.c:6330
 msgid "Deleted"
 msgstr ""
 
@@ -14846,11 +14787,11 @@ msgstr ""
 msgid "Replied"
 msgstr ""
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6274
+#: src/prefs_matcher.c:397 src/summaryview.c:6324
 msgid "Forwarded"
 msgstr ""
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6264 src/toolbar.c:416
+#: src/prefs_matcher.c:399 src/summaryview.c:6314 src/toolbar.c:416
 #: src/toolbar.c:934 src/toolbar.c:1978
 msgid "Spam"
 msgstr ""
@@ -14859,7 +14800,7 @@ msgstr ""
 msgid "Has attachment"
 msgstr ""
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6300
+#: src/prefs_matcher.c:401 src/summaryview.c:6350
 msgid "Signed"
 msgstr ""
 
@@ -15153,10 +15094,6 @@ msgstr ""
 msgid "Line space"
 msgstr ""
 
-#: src/prefs_message.c:189 src/prefs_message.c:223
-msgid "pixels"
-msgstr ""
-
 #: src/prefs_message.c:195
 msgid "Scroll"
 msgstr ""
@@ -15193,23 +15130,6 @@ msgstr ""
 msgid "Text Options"
 msgstr ""
 
-#: src/prefs_migration.c:95
-#, c-format
-msgid ""
-"Your Claws Mail configuration is from a newer version than the version which "
-"you are currently using.\n"
-"\n"
-"This is not recommended.\n"
-"\n"
-"For further information see the %sClaws Mail website%s.\n"
-"\n"
-"Do you want to exit now?"
-msgstr ""
-
-#: src/prefs_migration.c:104
-msgid "Configuration warning"
-msgstr ""
-
 #: src/prefs_msg_colors.c:147
 msgid "Message view"
 msgstr ""
@@ -15396,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 passphrase"
-msgstr ""
-
-#: src/prefs_other.c:610
-msgid "Use a master passphrase"
-msgstr ""
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"passphrase. If no master passphrase is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-msgid "Change master passphrase"
-msgstr ""
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr ""
 
@@ -15525,247 +15427,251 @@ msgstr ""
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr ""
 
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:123
 msgid "External incorporation program"
 msgstr ""
 
-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
 msgstr ""
 
-#: src/prefs_receive.c:161
+#: src/prefs_receive.c:142
 msgid "Automatic checking"
 msgstr ""
 
-#: src/prefs_receive.c:168
+#: src/prefs_receive.c:149
 msgid "Check for new mail every"
 msgstr ""
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
 msgstr ""
 
-#: src/prefs_receive.c:218
+#: src/prefs_receive.c:170
 msgid "Dialogs"
 msgstr "Dialogues"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:172
 msgid "Show receive dialog"
 msgstr "Show receive dialogue"
 
-#: src/prefs_receive.c:230
+#: src/prefs_receive.c:182
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_receive.c:241
+#: src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
 msgstr "Close receive dialogue when finished"
 
-#: src/prefs_receive.c:244
+#: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
 msgstr "Don't popup error dialogue on receive error"
 
-#: src/prefs_receive.c:247
+#: src/prefs_receive.c:199
 msgid "After receiving new mail"
 msgstr ""
 
-#: src/prefs_receive.c:249
+#: src/prefs_receive.c:201
 msgid "Go to Inbox"
 msgstr ""
 
-#: src/prefs_receive.c:251
+#: src/prefs_receive.c:203
 msgid "Update all local folders"
 msgstr ""
 
-#: src/prefs_receive.c:253
+#: src/prefs_receive.c:205
 msgid "Run command"
 msgstr ""
 
-#: src/prefs_receive.c:258
+#: src/prefs_receive.c:210
 msgid "after automatic check"
 msgstr ""
 
-#: src/prefs_receive.c:260
+#: src/prefs_receive.c:212
 msgid "after manual check"
 msgstr ""
 
-#: src/prefs_receive.c:268
+#: src/prefs_receive.c:220
 #, c-format
 msgid ""
 "Command to execute:\n"
 "(use %d as number of new mails)"
 msgstr ""
 
-#: src/prefs_receive.c:411 src/prefs_send.c:371
+#: src/prefs_receive.c:343 src/prefs_send.c:358
 msgid "Mail Handling"
 msgstr ""
 
-#: src/prefs_receive.c:412
+#: src/prefs_receive.c:344
 msgid "Receiving"
 msgstr ""
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:161
 msgid "Save sent messages"
 msgstr ""
 
-#: src/prefs_send.c:162
-msgid "Never send Return Receipts"
+#: src/prefs_send.c:164
+msgid "Confirm before sending queued messages"
 msgstr ""
 
-#: src/prefs_send.c:180
-msgid "Confirm before sending queued messages"
+#: src/prefs_send.c:167
+msgid "Never send Return Receipts"
 msgstr ""
 
-#: src/prefs_send.c:183
+#: src/prefs_send.c:170
 msgid "Show send dialog"
 msgstr "Show send dialogue"
 
-#: src/prefs_send.c:186
+#: src/prefs_send.c:172
 msgid "Warn when Subject is empty"
 msgstr ""
 
-#: src/prefs_send.c:193
+#: src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr ""
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:205
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr ""
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:220
+msgid "Automatic (Recommended)"
+msgstr ""
+
+#: src/prefs_send.c:222
 msgid "7bit ASCII (US-ASCII)"
 msgstr ""
 
-#: src/prefs_send.c:236
+#: src/prefs_send.c:223
 msgid "Unicode (UTF-8)"
 msgstr ""
 
-#: src/prefs_send.c:238
+#: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
 msgstr ""
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
 msgstr ""
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
 msgstr ""
 
-#: src/prefs_send.c:243
+#: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:231
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:233
 msgid "Greek (ISO-8859-7)"
 msgstr ""
 
-#: src/prefs_send.c:248
+#: src/prefs_send.c:235
 msgid "Hebrew (ISO-8859-8)"
 msgstr ""
 
-#: src/prefs_send.c:249
+#: src/prefs_send.c:236
 msgid "Hebrew (Windows-1255)"
 msgstr ""
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:238
 msgid "Arabic (ISO-8859-6)"
 msgstr ""
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:239
 msgid "Arabic (Windows-1256)"
 msgstr ""
 
-#: src/prefs_send.c:254
+#: src/prefs_send.c:241
 msgid "Turkish (ISO-8859-9)"
 msgstr ""
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:243
 msgid "Cyrillic (ISO-8859-5)"
 msgstr ""
 
-#: src/prefs_send.c:257
+#: src/prefs_send.c:244
 msgid "Cyrillic (KOI8-R)"
 msgstr ""
 
-#: src/prefs_send.c:258
+#: src/prefs_send.c:245
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr ""
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
 msgstr ""
 
-#: src/prefs_send.c:260
+#: src/prefs_send.c:247
 msgid "Cyrillic (Windows-1251)"
 msgstr ""
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:249
 msgid "Japanese (ISO-2022-JP)"
 msgstr ""
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:251
 msgid "Japanese (EUC-JP)"
 msgstr ""
 
-#: src/prefs_send.c:265
+#: src/prefs_send.c:252
 msgid "Japanese (Shift_JIS)"
 msgstr ""
 
-#: src/prefs_send.c:268
+#: src/prefs_send.c:255
 msgid "Simplified Chinese (GB18030)"
 msgstr ""
 
-#: src/prefs_send.c:269
+#: src/prefs_send.c:256
 msgid "Simplified Chinese (GB2312)"
 msgstr ""
 
-#: src/prefs_send.c:270
+#: src/prefs_send.c:257
 msgid "Simplified Chinese (GBK)"
 msgstr ""
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:258
 msgid "Traditional Chinese (Big5)"
 msgstr ""
 
-#: src/prefs_send.c:273
+#: src/prefs_send.c:260
 msgid "Traditional Chinese (EUC-TW)"
 msgstr ""
 
-#: src/prefs_send.c:274
+#: src/prefs_send.c:261
 msgid "Chinese (ISO-2022-CN)"
 msgstr ""
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:264
 msgid "Korean (EUC-KR)"
 msgstr ""
 
-#: src/prefs_send.c:279
+#: src/prefs_send.c:266
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:267
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:271
 msgid "Transfer encoding"
 msgstr ""
 
-#: src/prefs_send.c:295
+#: src/prefs_send.c:282
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr ""
 
-#: src/prefs_send.c:372 src/send_message.c:501 src/send_message.c:505
-#: src/send_message.c:510
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr ""
 
@@ -16183,7 +16089,7 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#: src/prefs_themes.c:344 src/prefs_themes.c:704
+#: src/prefs_themes.c:344 src/prefs_themes.c:705
 msgid "Default internal theme"
 msgstr ""
 
@@ -16280,54 +16186,54 @@ msgid ""
 "while installing theme."
 msgstr ""
 
-#: src/prefs_themes.c:666
+#: src/prefs_themes.c:667
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr ""
 
-#: src/prefs_themes.c:707
+#: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr ""
 
-#: src/prefs_themes.c:713
+#: src/prefs_themes.c:714
 msgid "No info file available for this theme"
 msgstr ""
 
-#: src/prefs_themes.c:731
+#: src/prefs_themes.c:732
 msgid "Error: couldn't get theme status"
 msgstr ""
 
-#: src/prefs_themes.c:755
+#: src/prefs_themes.c:756
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr ""
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:804
 msgid "Selector"
 msgstr ""
 
-#: src/prefs_themes.c:814
+#: src/prefs_themes.c:815
 msgid "Install new..."
 msgstr ""
 
-#: src/prefs_themes.c:819
+#: src/prefs_themes.c:820
 msgid "Get more..."
 msgstr ""
 
-#: src/prefs_themes.c:830
+#: src/prefs_themes.c:831
 msgid "Information"
 msgstr ""
 
-#: src/prefs_themes.c:844
+#: src/prefs_themes.c:845
 msgid "Author: "
 msgstr ""
 
-#: src/prefs_themes.c:852
+#: src/prefs_themes.c:853
 msgid "URL:"
 msgstr ""
 
-#: src/prefs_themes.c:894
+#: src/prefs_themes.c:895
 msgid "Preview"
 msgstr ""
 
@@ -16474,53 +16380,53 @@ msgstr ""
 msgid "No recipient keys defined."
 msgstr ""
 
-#: src/procmime.c:433 src/procmime.c:435 src/procmime.c:436
+#: 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 ""
 
@@ -16789,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:350
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr ""
 
-#: src/send_message.c:355
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr ""
 
-#: src/send_message.c:358
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr ""
 
-#: src/send_message.c:363
+#: src/send_message.c:364
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr ""
 
-#: src/send_message.c:420
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr ""
 
-#: src/send_message.c:486
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr ""
 
-#: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr ""
 
-#: src/send_message.c:488 src/send_message.c:493
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr ""
 
-#: src/send_message.c:491
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr ""
 
-#: src/send_message.c:500
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr ""
 
-#: src/send_message.c:504
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr ""
 
-#: src/send_message.c:509
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr ""
 
-#: src/send_message.c:513
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr ""
 
-#: src/send_message.c:542
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr ""
 
-#: src/send_message.c:595
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr ""
 
-#: src/send_message.c:664 src/send_message.c:684
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr ""
 
-#: src/send_message.c:667
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -16898,15 +16804,15 @@ msgstr ""
 msgid "%s - Source"
 msgstr ""
 
-#: src/ssl_manager.c:156
+#: src/ssl_manager.c:157
 msgid "Saved SSL certificates"
 msgstr ""
 
-#: src/ssl_manager.c:436
+#: src/ssl_manager.c:431
 msgid "Delete certificate"
 msgstr ""
 
-#: src/ssl_manager.c:437
+#: src/ssl_manager.c:432
 msgid "Do you really want to delete this certificate?"
 msgstr ""
 
@@ -16934,7 +16840,7 @@ msgstr ""
 msgid "Find _all"
 msgstr ""
 
-#: src/summary_search.c:690 src/summaryview.c:1086 src/summaryview.c:1347
+#: src/summary_search.c:690 src/summaryview.c:1105 src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
 msgstr ""
@@ -16959,328 +16865,325 @@ msgstr ""
 msgid "Toggle multiple selection"
 msgstr ""
 
-#: src/summaryview.c:1275
+#: src/summaryview.c:1294
 msgid "Process mark"
 msgstr ""
 
-#: src/summaryview.c:1276
+#: src/summaryview.c:1295
 msgid "Some marks are left. Process them?"
 msgstr ""
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1345
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr ""
 
-#: src/summaryview.c:1823 src/summaryview.c:1875
+#: src/summaryview.c:1842 src/summaryview.c:1894
 msgid "No more unread messages"
 msgstr ""
 
-#: src/summaryview.c:1824
+#: src/summaryview.c:1843
 msgid "No unread message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:1836 src/summaryview.c:1888 src/summaryview.c:1931
-#: src/summaryview.c:1983 src/summaryview.c:2062
+#: src/summaryview.c:1855 src/summaryview.c:1907 src/summaryview.c:1950
+#: src/summaryview.c:2002 src/summaryview.c:2081
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 
-#: src/summaryview.c:1844
+#: src/summaryview.c:1863
 msgid "No unread messages."
 msgstr ""
 
-#: src/summaryview.c:1876
+#: src/summaryview.c:1895
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:1918 src/summaryview.c:1970
+#: src/summaryview.c:1937 src/summaryview.c:1989
 msgid "No more new messages"
 msgstr ""
 
-#: src/summaryview.c:1919
+#: src/summaryview.c:1938
 msgid "No new message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1958
 msgid "No new messages."
 msgstr ""
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1990
 msgid "No new message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2008 src/summaryview.c:2049
+#: src/summaryview.c:2027 src/summaryview.c:2068
 msgid "No more marked messages"
 msgstr ""
 
-#: src/summaryview.c:2009
+#: src/summaryview.c:2028
 msgid "No marked message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:2018
+#: src/summaryview.c:2037
 msgid "No marked messages."
 msgstr ""
 
-#: src/summaryview.c:2050
+#: src/summaryview.c:2069
 msgid "No marked message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2087 src/summaryview.c:2112
+#: src/summaryview.c:2106 src/summaryview.c:2131
 msgid "No more labeled messages"
 msgstr "No more labelled messages"
 
-#: src/summaryview.c:2088
+#: src/summaryview.c:2107
 msgid "No labeled message found. Search from the end?"
 msgstr "No labelled message found. Search from the end?"
 
-#: src/summaryview.c:2097 src/summaryview.c:2122
+#: src/summaryview.c:2116 src/summaryview.c:2141
 msgid "No labeled messages."
 msgstr "No labelled messages."
 
-#: src/summaryview.c:2113
+#: src/summaryview.c:2132
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No labelled message found. Search from the beginning?"
 
-#: src/summaryview.c:2427
+#: src/summaryview.c:2446
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:2612
+#: src/summaryview.c:2631
 #, c-format
 msgid "%d deleted"
 msgstr ""
 
-#: src/summaryview.c:2616
+#: src/summaryview.c:2635
 #, c-format
 msgid "%s%d moved"
 msgstr ""
 
-#: src/summaryview.c:2617 src/summaryview.c:2624
+#: src/summaryview.c:2636 src/summaryview.c:2643
 msgid ", "
 msgstr ""
 
-#: src/summaryview.c:2622
+#: src/summaryview.c:2641
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:2636
+#: src/summaryview.c:2655
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:2654 src/summaryview.c:2697
+#: src/summaryview.c:2673 src/summaryview.c:2716
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr ""
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2691
 msgid "Message summary"
 msgstr ""
 
-#: src/summaryview.c:2673
+#: src/summaryview.c:2692
 msgid "New:"
 msgstr ""
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2693
 msgid "Unread:"
 msgstr ""
 
-#: src/summaryview.c:2675
+#: src/summaryview.c:2694
 msgid "Total:"
 msgstr ""
 
-#: src/summaryview.c:2677
+#: src/summaryview.c:2696
 msgid "Marked:"
 msgstr ""
 
-#: src/summaryview.c:2678
+#: src/summaryview.c:2697
 msgid "Replied:"
 msgstr ""
 
-#: src/summaryview.c:2679
+#: src/summaryview.c:2698
 msgid "Forwarded:"
 msgstr ""
 
-#: src/summaryview.c:2680
+#: src/summaryview.c:2699
 msgid "Locked:"
 msgstr ""
 
-#: src/summaryview.c:2681
+#: src/summaryview.c:2700
 msgid "Ignored:"
 msgstr ""
 
-#: src/summaryview.c:2682
+#: src/summaryview.c:2701
 msgid "Watched:"
 msgstr ""
 
-#: src/summaryview.c:2692
+#: src/summaryview.c:2711
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr ""
 
-#: src/summaryview.c:2972
+#: src/summaryview.c:2991
 msgid "Sorting summary..."
 msgstr ""
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3130
 msgid "Setting summary from message data..."
 msgstr ""
 
-#: src/summaryview.c:3316
+#: src/summaryview.c:3335
 msgid "(No Date)"
 msgstr ""
 
-#: src/summaryview.c:3368
+#: src/summaryview.c:3387
 msgid "(No Recipient)"
 msgstr ""
 
-#: src/summaryview.c:3403
+#: src/summaryview.c:3422
 #, c-format
 msgid "From: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:3412
+#: src/summaryview.c:3431
 #, c-format
 msgid "To: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:4291
+#: src/summaryview.c:4310
 msgid "You're not the author of the article.\n"
 msgstr ""
 
-#: src/summaryview.c:4381
+#: 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] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4384
-#, fuzzy
-msgid "Delete message"
-msgid_plural "Delete messages"
-msgstr[0] "Next la_belled message"
-msgstr[1] "Next la_belled message"
+#: src/summaryview.c:4406
+msgid "Delete message(s)"
+msgstr ""
 
-#: src/summaryview.c:4548
+#: src/summaryview.c:4574
 msgid "Destination is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4653
+#: src/summaryview.c:4679
 msgid "Destination to copy is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4818
+#: src/summaryview.c:4844
 msgid "Append or Overwrite"
 msgstr ""
 
-#: src/summaryview.c:4819
+#: src/summaryview.c:4845
 msgid "Append or overwrite existing file?"
 msgstr ""
 
-#: src/summaryview.c:4820
+#: src/summaryview.c:4846
 msgid "_Append"
 msgstr ""
 
-#: src/summaryview.c:4820
+#: src/summaryview.c:4846
 msgid "_Overwrite"
 msgstr ""
 
-#: src/summaryview.c:4861
+#: src/summaryview.c:4887
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 
-#: src/summaryview.c:5321
+#: src/summaryview.c:5371
 msgid "Building threads..."
 msgstr ""
 
-#: src/summaryview.c:5569
+#: src/summaryview.c:5619
 msgid "Skip these rules"
 msgstr ""
 
-#: src/summaryview.c:5572
+#: src/summaryview.c:5622
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 
-#: src/summaryview.c:5575
+#: src/summaryview.c:5625
 msgid "Apply these rules if they apply to the current account"
 msgstr ""
 
-#: src/summaryview.c:5604
+#: src/summaryview.c:5654
 msgid "Filtering"
 msgstr ""
 
-#: src/summaryview.c:5605
+#: 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 ""
 
-#: src/summaryview.c:5635
+#: src/summaryview.c:5685
 msgid "Filtering..."
 msgstr ""
 
-#: src/summaryview.c:5714
+#: src/summaryview.c:5764
 msgid "Processing configuration"
 msgstr ""
 
-#: src/summaryview.c:6260
+#: src/summaryview.c:6310
 msgid "Ignored thread"
 msgstr ""
 
-#: src/summaryview.c:6262
+#: src/summaryview.c:6312
 msgid "Watched thread"
 msgstr ""
 
-#: src/summaryview.c:6270
+#: src/summaryview.c:6320
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6272
+#: src/summaryview.c:6322
 msgid "Replied - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6284
+#: src/summaryview.c:6334
 msgid "To be moved"
 msgstr ""
 
-#: src/summaryview.c:6286
+#: src/summaryview.c:6336
 msgid "To be copied"
 msgstr ""
 
-#: src/summaryview.c:6298
+#: src/summaryview.c:6348
 msgid "Signed, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6302
+#: src/summaryview.c:6352
 msgid "Encrypted, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6304
+#: src/summaryview.c:6354
 msgid "Encrypted"
 msgstr ""
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6356
 msgid "Has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:7953
+#: src/summaryview.c:8004
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
 msgstr ""
 
-#: src/summaryview.c:8056
+#: src/summaryview.c:8107
 msgid "Go back to the folder list (You have unread messages)"
 msgstr ""
 
-#: src/summaryview.c:8061
+#: src/summaryview.c:8112
 msgid "Go back to the folder list"
 msgstr ""
 
@@ -17732,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"
@@ -17786,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:975
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr ""
 
-#: src/wizard.c:986
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr ""
 
-#: src/wizard.c:997
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "Your organisation:"
 
-#: src/wizard.c:1031
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr ""
 
-#: src/wizard.c:1039
+#: src/wizard.c:1032
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 
-#: src/wizard.c:1110
+#: 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:1113
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr ""
 
-#: src/wizard.c:1119
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr ""
 
-#: src/wizard.c:1128
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr ""
 
-#: src/wizard.c:1142
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr ""
 
-#: src/wizard.c:1153
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr ""
 
-#: src/wizard.c:1166
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr ""
 
-#: src/wizard.c:1177 src/wizard.c:1597
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr ""
 
-#: src/wizard.c:1189 src/wizard.c:1609
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr ""
 
-#: src/wizard.c:1257 src/wizard.c:1289 src/wizard.c:1544
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr ""
 
-#: src/wizard.c:1321
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr ""
 
-#: src/wizard.c:1490
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr ""
 
-#: src/wizard.c:1500
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr ""
 
-#: src/wizard.c:1555
+#: 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:1586
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr ""
 
-#: src/wizard.c:1651
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr ""
 
-#: src/wizard.c:1662
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: src/wizard.c:1670
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
 msgstr ""
 
-#: src/wizard.c:1788
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr ""
 
-#: src/wizard.c:1822
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr ""
 
-#: src/wizard.c:1829
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -17927,42 +17830,32 @@ msgid ""
 "five minutes."
 msgstr ""
 
-#: src/wizard.c:1842
+#: src/wizard.c:1836
 msgid "About You"
 msgstr ""
 
-#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
+#: 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:1857
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr ""
 
-#: src/wizard.c:1872
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr ""
 
-#: src/wizard.c:1888
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr ""
 
-#: src/wizard.c:1904
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr ""
 
-#: src/wizard.c:1911
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr "Move deleted mails to wastebin and expunge immediately"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "Moves deleted mails to wastebin instead of using the \\Deleted flag "
-#~ "without expunging."
diff --git a/po/es.po b/po/es.po
index 647ba53..425cc98 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-08-18 23:19+0200\n"
+"POT-Creation-Date: 2016-08-07 00:33+0200\n"
 "PO-Revision-Date: 2016-08-07 01:04+0200\n"
 "Last-Translator: Ricardo Mones <ricardo at mones.org>\n"
 "Language-Team: Spanish\n"
@@ -958,8 +958,9 @@ msgstr "Notificación"
 
 #: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
 #: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
+#: src/messageview.c:854 src/messageview.c:867
+#: src/plugins/pgpcore/sgpgme.c:788 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4866
 msgid "Warning"
 msgstr "Aviso"
 
@@ -2122,7 +2123,8 @@ msgstr "La cuenta seleccionada no es NNTP: es imposible enviar el post."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "El adjunto %s ya no existe. ¿Ignorar?"
 
-#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Cancelar envío"
 
@@ -2388,9 +2390,9 @@ msgstr "¿Quiere aplicar la plantilla «%s»?"
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: 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
+#: 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"
 
@@ -3664,10 +3666,10 @@ msgstr "Seleccionar carpeta"
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:592 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
-#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
+#: src/foldersel.c:592 src/imap_gtk.c:208 src/imap_gtk.c:214
+#: src/imap_gtk.c:270 src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262
+#: src/news_gtk.c:299 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:422 src/plugins/rssyl/rssyl_cb_menu.c:204
 #: src/plugins/vcalendar/vcal_folder.c:2056
 #, c-format
 msgid "'%c' can't be included in folder name."
@@ -3758,12 +3760,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:1019 src/imap.c:4639
+#: src/folderview.c:1019 src/imap.c:4641
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Revisando carpeta %s/%s..."
 
-#: src/folderview.c:1022 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Revisando carpeta %s..."
@@ -5758,8 +5760,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Las autenticaciones PLAIN sólo funcionarán si libetpan ha sido compilada con "
-"soporte SASL y el módulo PLAIN de SASL está instalado."
+"Las autenticaciones PLAIN sólo funcionarán si libetpan ha sido "
+"compilada con soporte SASL y el módulo PLAIN de SASL está instalado."
 
 #: src/imap.c:976
 msgid ""
@@ -5770,8 +5772,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Las autenticaciones con LOGIN sólo funcionarán si libetpan ha sido compilada "
-"con soporte SASL y el módulo LOGIN de SASL está instalado."
+"Las autenticaciones con LOGIN sólo funcionarán si libetpan ha sido "
+"compilada con soporte SASL y el módulo LOGIN de SASL está instalado."
 
 #: src/imap.c:983
 #, c-format
@@ -5793,8 +5795,8 @@ msgstr "Falló la conexión con %s"
 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:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 src/imap.c:5431
+#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
+#: src/imap.c:4622 src/imap.c:5433
 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."
@@ -5835,85 +5837,85 @@ msgstr "No se puede conectar al servidor IMAP4: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4110
+#: src/imap.c:1255 src/imap.c:4112
 msgid "Can't start TLS session.\n"
 msgstr "No se puede iniciar la sesión TLS.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1324
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No se puede entrar al servidor IMAP %s.\n"
 
-#: src/imap.c:1325
+#: src/imap.c:1327
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No se puede entrar al servidor IMAP %s."
 
-#: src/imap.c:1752
+#: src/imap.c:1754
 msgid "Adding messages..."
 msgstr "Añadiendo mensajes..."
 
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1959 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
-#: src/imap.c:2550
+#: src/imap.c:2552
 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags «borrado»\n"
 
-#: src/imap.c:2557 src/imap.c:5061
+#: src/imap.c:2559 src/imap.c:5063
 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 
-#: src/imap.c:2908
+#: src/imap.c:2910
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 
-#: src/imap.c:2911
+#: src/imap.c:2913
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 
-#: src/imap.c:3229
+#: src/imap.c:3231
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: src/imap.c:3244
+#: src/imap.c:3246
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: src/imap.c:3375
+#: src/imap.c:3377
 #, 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:3488
+#: src/imap.c:3490
 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buzón\n"
 
-#: src/imap.c:3767
+#: src/imap.c:3769
 msgid "LIST failed\n"
 msgstr "LIST falló\n"
 
-#: src/imap.c:3852
+#: src/imap.c:3854
 msgid "Flagging messages..."
 msgstr "Etiquetando mensajes..."
 
-#: src/imap.c:3955
+#: src/imap.c:3957
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4107
+#: src/imap.c:4109
 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor necesita TLS para acceder a él.\n"
 
-#: src/imap.c:4117
+#: src/imap.c:4119
 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
-#: src/imap.c:4122
+#: src/imap.c:4124
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5922,29 +5924,29 @@ msgstr ""
 "La conexión con %s falló: el servidor necesita TLS, pero Claws Mail ha sido "
 "compilado sin soporte TLS.\n"
 
-#: src/imap.c:4130
+#: src/imap.c:4132
 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor están deshabilitados.\n"
 
-#: src/imap.c:4353
+#: src/imap.c:4355
 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 
-#: src/imap.c:5054
+#: src/imap.c:5056
 #, 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:6091
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Tiene definidas una o más cuentas IMAP. Sin embargo esta versión de Claws "
-"Mail ha sido compilada sin soporte para IMAP: sus cuentas IMAP están "
-"deshabilitadas.\n"
+"Tiene definidas una o más cuentas IMAP. Sin embargo esta versión de "
+"Claws Mail ha sido compilada sin soporte para IMAP: sus cuentas IMAP "
+"están deshabilitadas.\n"
 "\n"
 "Probablemente deberá instalar libetpan y recompilar Claws Mail."
 
@@ -6119,8 +6121,8 @@ msgstr "suscribir"
 msgid "unsubscribe"
 msgstr "desuscribir"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:560 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"
 
@@ -7865,7 +7867,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:1855 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Sobreescribir"
@@ -7915,7 +7917,7 @@ msgstr "Búsqueda concluida"
 msgid "Compose _new message"
 msgstr "Componer un mensaje _nuevo"
 
-#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
+#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista de mensaje"
 
@@ -7954,47 +7956,47 @@ msgstr ""
 "oficialmente dirigido a usted.\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:1376
+#: src/messageview.c:1373
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Recuperando mensaje (%s)..."
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1409 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No se puede descifrar: %s"
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: src/messageview.c:1490 src/messageview.c:1498
 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:1847 src/messageview.c:1850 src/mimeview.c:1995
+#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Guardar como"
 
-#: src/messageview.c:1856
+#: src/messageview.c:1853
 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir el fichero existente?"
 
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No se pudo guardar el fichero «%s»."
 
-#: src/messageview.c:1917
+#: src/messageview.c:1914
 #, c-format
 msgid "Show all %s."
 msgstr "Mostrar todo %s."
 
-#: src/messageview.c:1919
+#: src/messageview.c:1916
 msgid "Only the first megabyte of text is shown."
 msgstr "Mostrar sólo el primer megabyte de texto."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1947
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8002,19 +8004,19 @@ msgstr ""
 "Recibió un acuse de recibo en este mensaje: éste ha sido visualizado por el "
 "destinatario."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1950
 msgid "You asked for a return receipt in this message."
 msgstr "Usted solicitó acuse de recibo en este mensaje."
 
-#: src/messageview.c:1959
+#: src/messageview.c:1956
 msgid "This message asks for a return receipt."
 msgstr "Este mensaje solicita acuse de recibo."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1957
 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 
-#: src/messageview.c:2003
+#: src/messageview.c:2000
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8022,7 +8024,7 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente,\n"
 "y ha sido eliminado del servidor."
 
-#: src/messageview.c:2009
+#: src/messageview.c:2006
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8031,15 +8033,15 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s."
 
-#: src/messageview.c:2013 src/messageview.c:2035
+#: src/messageview.c:2010 src/messageview.c:2032
 msgid "Mark for download"
 msgstr "Marcar para descargar"
 
-#: src/messageview.c:2014 src/messageview.c:2026
+#: src/messageview.c:2011 src/messageview.c:2023
 msgid "Mark for deletion"
 msgstr "Marcar para eliminar"
 
-#: src/messageview.c:2019
+#: src/messageview.c:2016
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8048,12 +8050,12 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será descargado."
 
-#: src/messageview.c:2024 src/messageview.c:2037
+#: src/messageview.c:2021 src/messageview.c:2034
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Desmarca"
 
-#: src/messageview.c:2030
+#: src/messageview.c:2027
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8062,11 +8064,11 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será eliminado."
 
-#: src/messageview.c:2103
+#: src/messageview.c:2100
 msgid "Return Receipt Notification"
 msgstr "Notificación de acuse de recibo"
 
-#: src/messageview.c:2104
+#: src/messageview.c:2101
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8078,19 +8080,19 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 
-#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/messageview.c:2108
+#: src/messageview.c:2105
 msgid "_Send Notification"
 msgstr "_Enviar notificación"
 
-#: src/messageview.c:2197
+#: src/messageview.c:2194
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No se puede imprimir: el mensaje no contiene texto."
 
-#: src/messageview.c:2959
+#: src/messageview.c:2956
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8098,7 +8100,7 @@ msgstr ""
 "\n"
 "  No hay mensajes en esta carpeta"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2964
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8106,7 +8108,7 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado"
 
-#: src/messageview.c:2968
+#: src/messageview.c:2965
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8114,7 +8116,7 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado o movido a otra carpeta"
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
+#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Ocurrió un error mientras se aprendía.\n"
@@ -8224,7 +8226,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:416
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No se pudo guardar la parte del mensaje multipartes: %s"
@@ -8382,9 +8385,9 @@ msgid ""
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Tiene definidas una o más cuentas de noticias. Sin embargo esta versión de "
-"Claws Mail ha sido compilada sin soporte de noticias: sus cuentas de "
-"noticias están deshabilitadas.\n"
+"Tiene definidas una o más cuentas de noticias. Sin embargo esta versión "
+"de Claws Mail ha sido compilada sin soporte de noticias: sus cuentas "
+"de noticias están deshabilitadas.\n"
 "\n"
 "Probablemente deberá instalar libetpan y recompilar Claws Mail."
 
@@ -8423,8 +8426,7 @@ msgstr "Las nuevas contraseñas no coinciden, inténtelo de nuevo."
 
 #: src/password_gtk.c:80
 msgid "Incorrect old master passphrase entered, try again."
-msgstr ""
-"Se introdujo una contraseña maestra antigua incorrecta, inténtelo de nuevo."
+msgstr "Se introdujo una contraseña maestra antigua incorrecta, inténtelo de nuevo."
 
 #: src/password_gtk.c:144
 msgid "Changing master passphrase"
@@ -9193,7 +9195,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"
 
@@ -9304,12 +9307,14 @@ msgstr ""
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/"
 "Bogofilter»"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:676
 #: 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:677
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:677
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Aprendizaje de correo basura"
@@ -11736,7 +11741,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:476
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:476
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
 #: src/prefs_receive.c:187
 msgid "minutes"
@@ -12689,7 +12695,8 @@ msgstr "Recuperar los comentarios de elementos con una antiguedad inferior a"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1477 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "días"
 
@@ -13783,7 +13790,8 @@ msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
 msgstr ""
-"Las siguientes personas están ocupadas a la hora planeada para su reunión:\n"
+"Las siguientes personas están ocupadas a la hora planeada para su "
+"reunión:\n"
 "- "
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:780
@@ -14830,20 +14838,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"
 
@@ -16343,8 +16352,8 @@ msgid ""
 "\n"
 "Do you want to exit now?"
 msgstr ""
-"Su configuración de Claws Mail corresponde a una versión más moderna que la "
-"versión que está usando actualmente.\n"
+"Su configuración de Claws Mail corresponde a una versión más moderna que "
+"la versión que está usando actualmente.\n"
 "\n"
 "Esto no está recomendado.\n"
 "\n"
diff --git a/po/fi.po b/po/fi.po
index 2c50b96..9b53dc2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -35,7 +35,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-08-18 23:19+0200\n"
+"POT-Creation-Date: 2016-08-01 21:41+0100\n"
 "PO-Revision-Date: 2016-08-03 00:47+0200\n"
 "Last-Translator: Flammie Pirinen <flammie at iki.fi>\n"
 "Language-Team: Finnish <laatu at lokalisointi.org>\n"
@@ -977,8 +977,9 @@ msgstr "Huomautus"
 
 #: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
 #: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
+#: src/messageview.c:854 src/messageview.c:867
+#: src/plugins/pgpcore/sgpgme.c:788 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4866
 msgid "Warning"
 msgstr "Varoitus"
 
@@ -2129,7 +2130,8 @@ msgstr "Tili ei ole NNTP:lle joten lähetys ei onnistu."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Liitetiedostoa %s ei enää ole, ohitetaanko?"
 
-#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Peruuta lähetys"
 
@@ -2395,9 +2397,9 @@ msgstr "Haluatko käyttää mallinetta ”%s”?"
 msgid "Apply template"
 msgstr "Käytä mallinetta"
 
-#: 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
+#: 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 "_Korvaa"
 
@@ -3646,10 +3648,10 @@ msgstr "Valitse hakemisto"
 msgid "NewFolder"
 msgstr "UusiKansio"
 
-#: src/foldersel.c:592 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
-#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
+#: src/foldersel.c:592 src/imap_gtk.c:208 src/imap_gtk.c:214
+#: src/imap_gtk.c:270 src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262
+#: src/news_gtk.c:299 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:422 src/plugins/rssyl/rssyl_cb_menu.c:204
 #: src/plugins/vcalendar/vcal_folder.c:2056
 #, c-format
 msgid "'%c' can't be included in folder name."
@@ -3738,12 +3740,12 @@ msgstr "Merkitäänkö kaikki kansion viestit luetuiksi?"
 msgid "Mark all as read"
 msgstr "Merkitse kaikki luetuksi"
 
-#: src/folderview.c:1019 src/imap.c:4639
+#: src/folderview.c:1019 src/imap.c:4641
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Luetaan hakemistoa %s/%s..."
 
-#: src/folderview.c:1022 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Luetaan hakemistoa %s..."
@@ -5767,8 +5769,8 @@ msgstr "Yhteydenotto kohteeseen %s epäonnistui"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-yhteys kohteeseen %s on katkennut, yhdistetään uudelleen…\n"
 
-#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 src/imap.c:5431
+#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
+#: src/imap.c:4622 src/imap.c:5433
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "IMAP-palvelimeen ei saada yhteyttä ilman verkkoyhteyttä."
 
@@ -5808,85 +5810,85 @@ msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä\n"
 
-#: src/imap.c:1255 src/imap.c:4110
+#: src/imap.c:1255 src/imap.c:4112
 msgid "Can't start TLS session.\n"
 msgstr "TLS-session aloitus ei onnistu.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1324
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Yhdistetään IMAP-palvelimeen: %s…\n"
 
-#: src/imap.c:1325
+#: src/imap.c:1327
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Yhdistetään IMAP-palvelimeen: %s…"
 
-#: src/imap.c:1752
+#: src/imap.c:1754
 msgid "Adding messages..."
 msgstr "Lisätään viestejä…"
 
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1959 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopioidaan viestejä…"
 
-#: src/imap.c:2550
+#: src/imap.c:2552
 msgid "can't set deleted flags\n"
 msgstr "poistomerkkejä ei voitu asettaa\n"
 
-#: src/imap.c:2557 src/imap.c:5061
+#: src/imap.c:2559 src/imap.c:5063
 msgid "can't expunge\n"
 msgstr "ei voida hävittää\n"
 
-#: src/imap.c:2908
+#: src/imap.c:2910
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Haetaan tilaamattomia kansioita kohteesta %s…"
 
-#: src/imap.c:2911
+#: src/imap.c:2913
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Haetaan kansion %s alikansioita…"
 
-#: src/imap.c:3229
+#: src/imap.c:3231
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei voitu luoda postilaatikkoa: LIST epäonnistui\n"
 
-#: src/imap.c:3244
+#: src/imap.c:3246
 msgid "can't create mailbox\n"
 msgstr "ei voitu luoda postilaatikkoa\n"
 
-#: src/imap.c:3375
+#: src/imap.c:3377
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ei voida uudelleennimetä postilaatikkoa %s %s:ksi\n"
 
-#: src/imap.c:3488
+#: src/imap.c:3490
 msgid "can't delete mailbox\n"
 msgstr "ei voida poistaa postilaatikkoa\n"
 
-#: src/imap.c:3767
+#: src/imap.c:3769
 msgid "LIST failed\n"
 msgstr "LIST epäonnistui\n"
 
-#: src/imap.c:3852
+#: src/imap.c:3854
 msgid "Flagging messages..."
 msgstr "Merkitään viestejä…"
 
-#: src/imap.c:3955
+#: src/imap.c:3957
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "hakemistoa %s ei voida valita\n"
 
-#: src/imap.c:4107
+#: src/imap.c:4109
 msgid "Server requires TLS to log in.\n"
 msgstr "Palvelin vaatii TLS:ää kirjautumiseen\n"
 
-#: src/imap.c:4117
+#: src/imap.c:4119
 msgid "Can't refresh capabilities.\n"
 msgstr "Ominaisuuksia ei voida päivittää.\n"
 
-#: src/imap.c:4122
+#: src/imap.c:4124
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5895,20 +5897,20 @@ msgstr ""
 "Yhteydenotto palvelimelle %s epäonnistui: palvelin vaatii TLS:ää, mutta "
 "Claws Mail on käännetty ilman TLS-tukea.\n"
 
-#: src/imap.c:4130
+#: src/imap.c:4132
 msgid "Server logins are disabled.\n"
 msgstr "Palvelimelle kirjautuminen on poissa käytöstä.\n"
 
-#: src/imap.c:4353
+#: src/imap.c:4355
 msgid "Fetching message..."
 msgstr "Haetaan viestiä…"
 
-#: src/imap.c:5054
+#: src/imap.c:5056
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "poistomerkkejä ei voitu asettaa: %d\n"
 
-#: src/imap.c:6089
+#: src/imap.c:6091
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6091,8 +6093,8 @@ msgstr "tilata"
 msgid "unsubscribe"
 msgstr "epätilata"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:560 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"
 
@@ -7829,7 +7831,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:1855 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Korvaa"
@@ -7879,7 +7881,7 @@ msgstr "Haku päättyi"
 msgid "Compose _new message"
 msgstr "Kirjoita _uusi viesti"
 
-#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
+#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail — Viestinäkymä"
 
@@ -7917,65 +7919,65 @@ msgstr ""
 "lähetetty suoraan sinulle.\n"
 "Saapumisilmoitus kannattaa peruuttaa."
 
-#: src/messageview.c:1376
+#: src/messageview.c:1373
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Haetaan viestiä (%s)…"
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1409 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Ei voitu salata: %s"
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: src/messageview.c:1490 src/messageview.c:1498
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Viesti ei noudata MIME-standardia ja saattaa hajota."
 
-#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
+#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Tallenna nimellä"
 
-#: src/messageview.c:1856
+#: src/messageview.c:1853
 msgid "Overwrite existing file?"
 msgstr "Korvataanko olemassaoleva tiedosto?"
 
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Tiedostoa ”%s” ei voida tallentaa."
 
-#: src/messageview.c:1917
+#: src/messageview.c:1914
 #, c-format
 msgid "Show all %s."
 msgstr "Näytä koko %s."
 
-#: src/messageview.c:1919
+#: src/messageview.c:1916
 msgid "Only the first megabyte of text is shown."
 msgstr "Vain ensimmäinen megatavu näytetään."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1947
 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:1953
+#: src/messageview.c:1950
 msgid "You asked for a return receipt in this message."
 msgstr "Pyysit saapumisilmoituspyyntöä tässä viestissä."
 
-#: src/messageview.c:1959
+#: src/messageview.c:1956
 msgid "This message asks for a return receipt."
 msgstr "Viestissä on saapumisilmoituspyyntö."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1957
 msgid "Send receipt"
 msgstr "Lähetä ilmoitus."
 
-#: src/messageview.c:2003
+#: src/messageview.c:2000
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7983,7 +7985,7 @@ msgstr ""
 "Tämä viesti on osittain haettu,\n"
 "ja poistettu jo palvelimelta."
 
-#: src/messageview.c:2009
+#: src/messageview.c:2006
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7992,15 +7994,15 @@ msgstr ""
 "Tämä viesti on osittain haettu;\n"
 "se on %s."
 
-#: src/messageview.c:2013 src/messageview.c:2035
+#: src/messageview.c:2010 src/messageview.c:2032
 msgid "Mark for download"
 msgstr "Merkitse ladattavaksi"
 
-#: src/messageview.c:2014 src/messageview.c:2026
+#: src/messageview.c:2011 src/messageview.c:2023
 msgid "Mark for deletion"
 msgstr "Merkitse poistettavaksi"
 
-#: src/messageview.c:2019
+#: src/messageview.c:2016
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8009,12 +8011,12 @@ msgstr ""
 "Tämä viesti on osittain ladattu;\n"
 "se on %s ja ladataan kokonaan."
 
-#: src/messageview.c:2024 src/messageview.c:2037
+#: src/messageview.c:2021 src/messageview.c:2034
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Poista merkintä"
 
-#: src/messageview.c:2030
+#: src/messageview.c:2027
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8023,11 +8025,11 @@ msgstr ""
 "Tämä viesti on osittain ladattu;\n"
 "se on %s ja poistetaan."
 
-#: src/messageview.c:2103
+#: src/messageview.c:2100
 msgid "Return Receipt Notification"
 msgstr "Saapumisilmoituspyyntö"
 
-#: src/messageview.c:2104
+#: src/messageview.c:2101
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8037,19 +8039,19 @@ msgstr ""
 "Viesti on lähetetty useille tileistäsi.\n"
 "Valitse mitä niistä käytät saapumisilmoituksen lähettämiseen:"
 
-#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: src/messageview.c:2108
+#: src/messageview.c:2105
 msgid "_Send Notification"
 msgstr "_Lähetä ilmoitus"
 
-#: src/messageview.c:2197
+#: src/messageview.c:2194
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Tulostus ei onnistu: viestissä ei ole sisältötekstiä"
 
-#: src/messageview.c:2959
+#: src/messageview.c:2956
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8057,7 +8059,7 @@ msgstr ""
 "\n"
 "  Kansiossa ei ole viestejä"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2964
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8065,7 +8067,7 @@ msgstr ""
 "\n"
 "  Viesti on poistettu"
 
-#: src/messageview.c:2968
+#: src/messageview.c:2965
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8073,7 +8075,7 @@ msgstr ""
 "\n"
 "  Viesti on poistettu tai siirretty toiseen kansioon"
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
+#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Virhe luokiteltaessa roskapostia muistiin.\n"
@@ -8184,7 +8186,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:416
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Ei voida tallentaa osaa moniosaviestistä: %s"
@@ -9135,7 +9138,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"
 
@@ -9245,12 +9249,14 @@ msgstr ""
 "\n"
 "Asetukset ovat valikossa Asetukset→Asetukset→Liitännäiset→BogoFilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:676
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Roskapostin tunnistus"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:677
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:677
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Roskapostin oppiminen"
@@ -11621,7 +11627,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:476
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:476
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
 #: src/prefs_receive.c:187
 msgid "minutes"
@@ -12556,7 +12563,8 @@ msgstr "Hae kommentit jos viesti on uudempi kuin"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1477 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "päivän jälkeen"
 
@@ -14679,20 +14687,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"
 
diff --git a/po/fr.po b/po/fr.po
index b4a458d..5232de2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -643,14 +643,14 @@ 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-08-18 23:19+0200\n"
+"POT-Creation-Date: 2016-08-01 21:41+0100\n"
 "PO-Revision-Date: 2016-08-04 18:33+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"
 
@@ -713,8 +713,7 @@ msgstr "R"
 
 #: src/account.c:1568
 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:1575 src/addrduplicates.c:471 src/addressadd.c:215
 #: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1264
@@ -1611,8 +1610,9 @@ msgstr "Information"
 
 #: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
 #: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
+#: src/messageview.c:854 src/messageview.c:867
+#: src/plugins/pgpcore/sgpgme.c:788 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4866
 msgid "Warning"
 msgstr "Alerte"
 
@@ -2627,8 +2627,8 @@ msgstr "Envoyer"
 #: src/compose.c:5043
 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:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5633
 #: src/folderview.c:2445 src/messageview.c:855 src/messageview.c:872
@@ -2782,7 +2782,8 @@ msgstr ""
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "La pièce jointe %s n'existe plus. Ignorer ?"
 
-#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Interrompre l'envoi"
 
@@ -3055,9 +3056,9 @@ msgstr "Voulez-vous utiliser le modèle « %s » ?"
 msgid "Apply template"
 msgstr "Utiliser le modèle"
 
-#: 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
+#: 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 "_Remplacer"
 
@@ -3441,10 +3442,10 @@ 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:470
 msgid "TLS"
@@ -3584,10 +3585,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:701
 msgid "Bind DN"
@@ -3967,10 +3968,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"
@@ -4086,8 +4087,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 ?"
@@ -4158,8 +4159,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"
@@ -4172,11 +4173,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
@@ -4332,10 +4333,10 @@ msgstr "Sélection d'un dossier"
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:592 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
-#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
+#: src/foldersel.c:592 src/imap_gtk.c:208 src/imap_gtk.c:214
+#: src/imap_gtk.c:270 src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262
+#: src/news_gtk.c:299 src/plugins/mailmbox/plugin_gtk.c:254
+#: src/plugins/mailmbox/plugin_gtk.c:422 src/plugins/rssyl/rssyl_cb_menu.c:204
 #: src/plugins/vcalendar/vcal_folder.c:2056
 #, c-format
 msgid "'%c' can't be included in folder name."
@@ -4427,12 +4428,12 @@ msgstr ""
 msgid "Mark all as read"
 msgstr "Marquer tous les messages comme lus"
 
-#: src/folderview.c:1019 src/imap.c:4639
+#: src/folderview.c:1019 src/imap.c:4641
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Analyse du dossier %s/%s.."
 
-#: src/folderview.c:1022 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Analyse du dossier %s.."
@@ -6490,8 +6491,8 @@ msgstr "La connexion vers %s a échoué."
 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:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 src/imap.c:5431
+#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
+#: src/imap.c:4622 src/imap.c:5433
 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."
 
@@ -6532,85 +6533,85 @@ msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4110
+#: src/imap.c:1255 src/imap.c:4112
 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1324
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Connexion impossible au serveur IMAP %s.\n"
 
-#: src/imap.c:1325
+#: src/imap.c:1327
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Authentification impossible au serveur IMAP %s."
 
-#: src/imap.c:1752
+#: src/imap.c:1754
 msgid "Adding messages..."
 msgstr "Ajout des messages en cours.."
 
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1959 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Copie des messages en cours.."
 
-#: src/imap.c:2550
+#: src/imap.c:2552
 msgid "can't set deleted flags\n"
 msgstr "Impossible de marquer pour la suppression\n"
 
-#: src/imap.c:2557 src/imap.c:5061
+#: src/imap.c:2559 src/imap.c:5063
 msgid "can't expunge\n"
 msgstr "Impossible de purger\n"
 
-#: src/imap.c:2908
+#: src/imap.c:2910
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Recherche des dossiers non inscrits dans %s.."
 
-#: src/imap.c:2911
+#: src/imap.c:2913
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Recherche des sous-dossiers de %s.."
 
-#: src/imap.c:3229
+#: src/imap.c:3231
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: src/imap.c:3244
+#: src/imap.c:3246
 msgid "can't create mailbox\n"
 msgstr "Impossible de créer la boîte aux lettres\n"
 
-#: src/imap.c:3375
+#: src/imap.c:3377
 #, 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:3488
+#: src/imap.c:3490
 msgid "can't delete mailbox\n"
 msgstr "Impossible de supprimer la boîte aux lettres.\n"
 
-#: src/imap.c:3767
+#: src/imap.c:3769
 msgid "LIST failed\n"
 msgstr "commande LIST échouée\n"
 
-#: src/imap.c:3852
+#: src/imap.c:3854
 msgid "Flagging messages..."
 msgstr "Marquage des messages en cours.."
 
-#: src/imap.c:3955
+#: src/imap.c:3957
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s.\n"
 
-#: src/imap.c:4107
+#: src/imap.c:4109
 msgid "Server requires TLS to log in.\n"
 msgstr "Le serveur nécessite TLS pour s'y connecter.\n"
 
-#: src/imap.c:4117
+#: src/imap.c:4119
 msgid "Can't refresh capabilities.\n"
 msgstr "Impossible de rafraîchir la liste des facilités IMAP.\n"
 
-#: src/imap.c:4122
+#: src/imap.c:4124
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6619,20 +6620,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:4130
+#: src/imap.c:4132
 msgid "Server logins are disabled.\n"
 msgstr "Les connections au serveur sont désactivées.\n"
 
-#: src/imap.c:4353
+#: src/imap.c:4355
 msgid "Fetching message..."
 msgstr "Lecture du message en cours.."
 
-#: src/imap.c:5054
+#: src/imap.c:5056
 #, 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:6091
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6804,8 +6805,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:557
 #, c-format
@@ -6820,8 +6821,8 @@ msgstr "inscrire au"
 msgid "unsubscribe"
 msgstr "désinscrire du"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:560 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"
 
@@ -6952,12 +6953,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."
@@ -7467,8 +7468,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"
@@ -8599,7 +8599,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:1855 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Écraser"
@@ -8649,7 +8649,7 @@ msgstr "Recherche terminée"
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
+#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Message"
 
@@ -8688,47 +8688,47 @@ msgstr ""
 "destinataire officiel.\n"
 "Il est conseillé de ne pas envoyer cet accusé de réception."
 
-#: src/messageview.c:1376
+#: src/messageview.c:1373
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Lecture du message (%s) en cours.."
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1409 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Déchiffrement impossible : %s"
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: src/messageview.c:1490 src/messageview.c:1498
 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:1847 src/messageview.c:1850 src/mimeview.c:1995
+#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: src/messageview.c:1856
+#: src/messageview.c:1853
 msgid "Overwrite existing file?"
 msgstr "Écraser le fichier existant ?"
 
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:1917
+#: src/messageview.c:1914
 #, c-format
 msgid "Show all %s."
 msgstr "Afficher l'ensemble des %s."
 
-#: src/messageview.c:1919
+#: src/messageview.c:1916
 msgid "Only the first megabyte of text is shown."
 msgstr "Seul le premier méga-octet de texte est affiché."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1947
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8736,19 +8736,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:1953
+#: src/messageview.c:1950
 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:1959
+#: src/messageview.c:1956
 msgid "This message asks for a return receipt."
 msgstr "Ce message demande l'envoi d'un accusé de réception."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1957
 msgid "Send receipt"
 msgstr "Envoyer"
 
-#: src/messageview.c:2003
+#: src/messageview.c:2000
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8756,7 +8756,7 @@ msgstr ""
 "Ce message a été partiellement récupéré,\n"
 "et a été supprimé du serveur."
 
-#: src/messageview.c:2009
+#: src/messageview.c:2006
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8765,16 +8765,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:2013 src/messageview.c:2035
+#: src/messageview.c:2010 src/messageview.c:2032
 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:2014 src/messageview.c:2026
+#: src/messageview.c:2011 src/messageview.c:2023
 msgid "Mark for deletion"
 msgstr "Supprimer"
 
-#: src/messageview.c:2019
+#: src/messageview.c:2016
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8783,12 +8783,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:2024 src/messageview.c:2037
+#: src/messageview.c:2021 src/messageview.c:2034
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Démarquer"
 
-#: src/messageview.c:2030
+#: src/messageview.c:2027
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8797,11 +8797,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:2103
+#: src/messageview.c:2100
 msgid "Return Receipt Notification"
 msgstr "Accusé de réception."
 
-#: src/messageview.c:2104
+#: src/messageview.c:2101
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8813,19 +8813,19 @@ msgstr ""
 "Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accusé "
 "de réception :"
 
-#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: src/messageview.c:2108
+#: src/messageview.c:2105
 msgid "_Send Notification"
 msgstr "_Envoyer"
 
-#: src/messageview.c:2197
+#: src/messageview.c:2194
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossible d'imprimer : le message ne contient pas de texte."
 
-#: src/messageview.c:2959
+#: src/messageview.c:2956
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8833,7 +8833,7 @@ msgstr ""
 "\n"
 " Il n'y a pas de messages dans ce dossier"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2964
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8841,7 +8841,7 @@ msgstr ""
 "\n"
 " Le message a été supprimé"
 
-#: src/messageview.c:2968
+#: src/messageview.c:2965
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8849,7 +8849,7 @@ msgstr ""
 "\n"
 " Le message a été supprimé ou déplacé vers un autre dossier"
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
+#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Erreur lors de l'opération d'apprentissage du module SpamAssassin.\n"
@@ -8962,7 +8962,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:416
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
@@ -9947,7 +9948,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"
 
@@ -10063,12 +10065,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:676
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:676
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Analyse anti-SPAMs"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:677
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:677
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Apprentissage de SPAMs"
@@ -10235,8 +10239,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:502
 msgid "Bsfilter: learning from message..."
@@ -12518,7 +12522,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:476
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:476
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
 #: src/prefs_receive.c:187
 msgid "minutes"
@@ -13063,8 +13068,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"
@@ -13126,8 +13131,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"
@@ -13230,8 +13235,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 "
@@ -13484,7 +13488,8 @@ msgstr "Récupérer les commentaires des articles de moins de"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1477 src/prefs_folder_item.c:553
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "jour(s)"
 
@@ -13741,8 +13746,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"
@@ -15642,20 +15647,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"
 
@@ -16224,9 +16230,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
@@ -16983,8 +16988,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"
@@ -17085,9 +17090,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 :"
@@ -18060,8 +18065,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"
@@ -20279,11 +20284,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 ""
@@ -20322,8 +20327,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 a03e2ae..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-08-18 23:19+0200\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:396 src/account.c:463
+#: 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:441
+#: src/account.c:437
 msgid "Can't create folder."
 msgstr "אין אפשרות ליצור תיקייה."
 
-#: src/account.c:728
+#: src/account.c:724
 msgid "Edit accounts"
 msgstr "עריכת חשבונות"
 
 # מחווינה
-#: src/account.c:745
+#: 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,79 +46,79 @@ msgstr ""
 "באמצעות 'השג דואר' תאחזרו הודעות מתוך חשבונות בסדר נתון, תיבת הסימון\n"
 "מתווה אילו חשבונות יכללו. טקסט בולט מעיד על החשבון השגרתי."
 
-#: src/account.c:816
+#: src/account.c:812
 msgid " _Set as default account "
 msgstr " קבע בתור חשבון ש_גרתי "
 
-#: src/account.c:908
+#: src/account.c:904
 msgid "Accounts with remote folders cannot be copied."
 msgstr "חשבונות עם תיקיות מרוחקות לא ניתנות להעתקה."
 
-#: src/account.c:915
+#: src/account.c:911
 #, c-format
 msgid "Copy of %s"
 msgstr "עותק של %s"
 
-#: src/account.c:1075
+#: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את החשבון '%s'?"
 
-#: src/account.c:1077
+#: src/account.c:1073
 msgid "(Untitled)"
 msgstr "(ללא כותרת)"
 
-#: src/account.c:1078
+#: src/account.c:1074
 msgid "Delete account"
 msgstr "מחיקת חשבון"
 
-#: src/account.c:1562
+#: src/account.c:1554
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "ק"
 
-#: src/account.c:1568
+#: src/account.c:1560
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'השג דואר' מאחזרת דואר מתוך החשבונות הנבחרים"
 
-#: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1264
-#: src/editaddress.c:1321 src/editaddress.c:1341
+#: 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
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
+#: 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:1803
-#: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
+#: src/plugins/pdf_viewer/poppler_viewer.c:1807
+#: 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 "שם"
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4128
+#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: src/account.c:1591 src/ssl_manager.c:100
+#: src/account.c:1583 src/ssl_manager.c:102
 msgid "Server"
 msgstr "שרת"
 
-#: src/action.c:382
+#: src/action.c:383
 #, c-format
 msgid "Could not get message file %d"
 msgstr "לא היתה אפשרות לקבל קובץ הודעה %d"
 
-#: src/action.c:419
+#: src/action.c:420
 msgid "Could not get message part."
 msgstr "לא היתה אפשרות לקבל אזור הודעה."
 
 # multipartite
-#: src/action.c:436
+#: src/action.c:437
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "אין אפשרות להשיג חלק בתוך הודעה מרובת חלקים: %s"
 
-#: src/action.c:608
+#: src/action.c:609
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -127,12 +127,12 @@ msgstr ""
 "הפעולה הנבחרת לא היתה ניתנת לשימוש בחלון ההלחנה\n"
 "מכיוון שזו מכילה %%f, %%F, %%as או %%p."
 
-#: src/action.c:720
+#: src/action.c:721
 msgid "There is no filtering action set"
 msgstr "אין פעולת סינון מוגדרת"
 
 # singular
-#: src/action.c:722
+#: src/action.c:723
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -141,7 +141,7 @@ msgstr ""
 "פעולת סינון שגויה:\n"
 "%s"
 
-#: src/action.c:987
+#: src/action.c:988
 #, fuzzy, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -152,34 +152,34 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:989 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:884
+#: 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 "שגיאה לא מוכרת"
 
-#: src/action.c:1207 src/action.c:1372
+#: src/action.c:1208 src/action.c:1373
 msgid "Completed"
 msgstr "הושלמה"
 
-#: src/action.c:1243
+#: src/action.c:1244
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- מופעלת: %s\n"
 
-#: src/action.c:1247
+#: src/action.c:1248
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- הסתיימה: %s\n"
 
-#: src/action.c:1280
+#: src/action.c:1281
 msgid "Action's input/output"
 msgstr "קלט/פלט של פעולה"
 
-#: src/action.c:1608
+#: src/action.c:1609
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -190,11 +190,11 @@ msgstr ""
 "‏('‎%%h' יוחלף עם הארגומנט)\n"
 "  %s"
 
-#: src/action.c:1613
+#: src/action.c:1614
 msgid "Action's hidden user argument"
 msgstr "ארגומנט משתמש נסתר של פעולה"
 
-#: src/action.c:1617
+#: src/action.c:1618
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -205,7 +205,7 @@ msgstr ""
 "‏('‎%%u' יוחלף עם הארגומנט)\n"
 "  %s"
 
-#: src/action.c:1622
+#: src/action.c:1623
 msgid "Action's user argument"
 msgstr "ארגומנט משתמש של פעולה"
 
@@ -221,7 +221,7 @@ msgstr "אין אפשרות להעתיק פנקס כתובות אל עצמו."
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "אין אפשרות להעביר תיקייה לתוך עצמה או לתוך אחד מצאצאיה."
 
-#: src/addr_compl.c:689 src/addressbook.c:4946
+#: src/addr_compl.c:689 src/addressbook.c:4947
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "קבוצה"
@@ -359,7 +359,7 @@ msgid "Duplicate email addresses"
 msgstr "כתובות דוא״ל כפולות"
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:434
+#: src/plugins/pgpcore/select-keys.c:397 src/toolbar.c:434
 msgid "Address"
 msgstr "כתובת"
 
@@ -392,8 +392,8 @@ msgid "Contact"
 msgstr "איש קשר"
 
 # להבחין
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1056
-#: src/editaddress.c:1131 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1057
+#: src/editaddress.c:1132 src/editgroup.c:290
 msgid "Remarks"
 msgstr "הערה"
 
@@ -401,16 +401,16 @@ msgstr "הערה"
 msgid "Select Address Book Folder"
 msgstr "בחירת תיקיית פנקס כתובות"
 
-#: src/addressadd.c:534 src/addressbook.c:3216 src/addressbook.c:3267
+#: src/addressadd.c:535 src/addressbook.c:3217 src/addressbook.c:3268
 msgid "Add address(es)"
 msgstr "הוסף כתובות"
 
-#: src/addressadd.c:535
+#: src/addressadd.c:536
 msgid "Can't add the specified address"
 msgstr "אין אפשרות להוסיף את הכתובת שצוינה"
 
-#: src/addressbook.c:126 src/addressbook.c:4934 src/editaddress.c:1053
-#: src/editaddress.c:1114 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/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
 msgid "Email Address"
 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:586 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:591 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:592 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 "_עזרה"
 
@@ -463,20 +463,20 @@ msgstr "_ערוך ספר"
 msgid "_Delete book"
 msgstr "_מחק ספר"
 
-#: src/addressbook.c:427 src/compose.c:603
+#: 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
 msgid "_Save"
 msgstr "ש_מור"
 
-#: src/addressbook.c:428 src/compose.c:607 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,13 +485,13 @@ msgid "C_ut"
 msgstr "_גזור"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:615 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 "ה_עתק"
 
 #: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:616 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:617 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "ה_דבק"
 
@@ -535,8 +535,8 @@ msgstr "מצא כפילויות..."
 msgid "Edit custom attributes..."
 msgstr "ערוך אפיונים מותאמים..."
 
-#: src/addressbook.c:458 src/compose.c:695 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 "_אודות"
 
@@ -547,10 +547,10 @@ msgstr "_עיין רשומה"
 
 # תקפות: לא מוכר
 #: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:143
-#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:682
-#: src/prefs_themes.c:714 src/prefs_themes.c:715
+#: 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/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:683
+#: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "לא ידועה"
 
@@ -655,12 +655,12 @@ 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 "פנקס כתובות"
 
-#: src/addressbook.c:1112 src/editldap.c:780
+#: src/addressbook.c:1112 src/editldap.c:779
 msgid "Search"
 msgstr "חיפוש"
 
@@ -684,18 +684,18 @@ msgstr "אין אפשרות להעתיק. פנקס כתובות יעד מוגד
 msgid "Cannot paste into an address group."
 msgstr "אין אפשרות להדביק לתוך קבוצת כתובת."
 
-#: src/addressbook.c:2913
+#: src/addressbook.c:2914
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "האם ברצונך למחוק את תוצאות השאילתא וגם את הכתובות בתוך '%s'?"
 
-#: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
+#: src/addressbook.c:2917 src/addressbook.c:2943 src/addressbook.c:2950
 #: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
 #: src/toolbar.c:415
 msgid "Delete"
 msgstr "מחק"
 
-#: src/addressbook.c:2925
+#: src/addressbook.c:2926
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -704,21 +704,21 @@ msgstr ""
 "האם ברצונך למחוק את '%s'? אם תמחק את התיקייה בלבד, הכתובות שזו מכילה יועברו "
 "לתוך התיקיית הורה."
 
-#: src/addressbook.c:2928 src/imap_gtk.c:360 src/mh_gtk.c:206
+#: 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 "מחיקת תיקייה"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2930
 msgid "Delete _folder only"
 msgstr "מחק _תיקייה בלבד"
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2930
 msgid "Delete folder and _addresses"
 msgstr "מחיקת תיקיות וגם _כתובות"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2941
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -727,7 +727,7 @@ msgstr ""
 "האם ברצונך למחוק את '%s'?\n"
 "הכתובות המוכלות בתוכו לא יאבדו."
 
-#: src/addressbook.c:2947
+#: src/addressbook.c:2948
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -736,28 +736,28 @@ msgstr ""
 "האם ברצונך למחוק את '%s'?\n"
 "הכתובות המוכלות בתוכו יאבדו."
 
-#: src/addressbook.c:3061
+#: src/addressbook.c:3062
 #, c-format
 msgid "Search '%s'"
 msgstr "חיפוש '%s'"
 
-#: src/addressbook.c:3199 src/addressbook.c:3248
+#: src/addressbook.c:3200 src/addressbook.c:3249
 msgid "New Contacts"
 msgstr "אנשי קשר חדשים"
 
-#: src/addressbook.c:4087
+#: src/addressbook.c:4088
 msgid "New user, could not save index file."
 msgstr "משתמש חדש, לא היתה אפשרות לשמור קובץ מפתח."
 
-#: src/addressbook.c:4091
+#: src/addressbook.c:4092
 msgid "New user, could not save address book files."
 msgstr "משתמש חדש, לא היתה אפשרות לשמור קבצי פנקס כתובות."
 
-#: src/addressbook.c:4101
+#: src/addressbook.c:4102
 msgid "Old address book converted successfully."
 msgstr "פנקס כתובות ישן הומר בהצלחה."
 
-#: src/addressbook.c:4106
+#: src/addressbook.c:4107
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -765,7 +765,7 @@ msgstr ""
 "פנקס כתובות ישן הומר,\n"
 "לא היתה אפשרות לשמור קובץ מפתח כתובות חדש."
 
-#: src/addressbook.c:4119
+#: src/addressbook.c:4120
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -773,7 +773,7 @@ msgstr ""
 "לא היתה אפשרות להמיר פנקס כתובות,\n"
 "אך נוצרו קבצי פנקס כתובות חדשים ריקים."
 
-#: src/addressbook.c:4125
+#: src/addressbook.c:4126
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -781,7 +781,7 @@ msgstr ""
 "לא היתה אפשרות להמיר פנקס כתובות,\n"
 "לא היתה אפשרות לשמור קובץ מפתח כתובות חדש."
 
-#: src/addressbook.c:4130
+#: src/addressbook.c:4131
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -789,65 +789,60 @@ msgstr ""
 "לא היתה אפשרות להמיר פנקס כתובות\n"
 "ולא היתה אפשרות ליצור קבצי פנקס כתובות חדשים."
 
-#: src/addressbook.c:4137 src/addressbook.c:4143
+#: src/addressbook.c:4138 src/addressbook.c:4144
 msgid "Addressbook conversion error"
 msgstr "שגיאת המרת פנקס כתובות"
 
-#: src/addressbook.c:4257
+#: src/addressbook.c:4258
 msgid "Addressbook Error"
 msgstr "שגיאת פנקס כתובות"
 
-#: src/addressbook.c:4258
+#: src/addressbook.c:4259
 msgid "Could not read address index"
 msgstr "לא היתה אפשרות לקרוא מפתח כתובות"
 
-#: src/addressbook.c:4589
+#: src/addressbook.c:4590
 msgid "Busy searching..."
 msgstr "כעת עסוק בחיפוש..."
 
-#: src/addressbook.c:4898 src/prefs_send.c:188
+#: src/addressbook.c:4899
 msgid "Interface"
 msgstr "ממשק"
 
-#: src/addressbook.c:4910
-#, fuzzy
-msgid "Address Books"
+#: 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
+msgid "Address Book"
 msgstr "פנקס כתובות"
 
-#: src/addressbook.c:4922
+#: src/addressbook.c:4923
 msgid "Person"
 msgstr "אישיות"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:343
-#: src/folderview.c:431 src/prefs_account.c:2786 src/prefs_folder_column.c:78
+#: src/addressbook.c:4959 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 "תיקייה"
 
-#: src/addressbook.c:4970
+#: src/addressbook.c:4971
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4982 src/addressbook.c:4994
+#: src/addressbook.c:4983 src/addressbook.c:4995
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5006
+#: src/addressbook.c:5007
 msgid "LDAP servers"
 msgstr "שרתי LDAP"
 
-#: src/addressbook.c:5018
+#: src/addressbook.c:5019
 msgid "LDAP Query"
 msgstr "שאילתת LDAP"
 
-#: src/addressbook_foldersel.c:182 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:984 src/importldif.c:657
-msgid "Address Book"
-msgstr "פנקס כתובות"
-
 # בכלל
 # תקורה = נקבה
 # פנקס כתובות = זכר
-#: src/addressbook_foldersel.c:387 src/plugins/bogofilter/bogofilter.c:107
+#: src/addressbook_foldersel.c:388 src/plugins/bogofilter/bogofilter.c:107
 #: src/plugins/bogofilter/bogofilter_gtk.c:274
 #: src/plugins/bogofilter/bogofilter_gtk.c:347
 #: src/plugins/bogofilter/bogofilter_gtk.c:424
@@ -940,43 +935,43 @@ msgstr "איסוף כתובות דוא״ל בתוך הודעות נבחרות"
 msgid "Collect email addresses from folder"
 msgstr "איסוף כתובות דוא״ל בתוך תיקייה"
 
-#: src/addrindex.c:124
+#: src/addrindex.c:123
 msgid "Common addresses"
 msgstr "כתובות כלליות"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Personal addresses"
 msgstr "כתובות אישיות"
 
-#: src/addrindex.c:131
+#: src/addrindex.c:130
 msgid "Common address"
 msgstr "כתובת כללית"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Personal address"
 msgstr "כתובת אישית"
 
-#: src/addrindex.c:1830
+#: src/addrindex.c:1827
 msgid "Address(es) update"
 msgstr "כתובות עודכנו"
 
-#: src/addrindex.c:1831
+#: src/addrindex.c:1828
 msgid "Update failed. Changes not written to Directory."
 msgstr "עדכון נכשל. שינויים לא נכתבו למדור."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9482
 msgid "Notice"
 msgstr "התראה"
 
-#: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
-#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
+#: 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:5632 src/inc.c:663
-#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
+#: 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 "שגיאה"
 
@@ -1052,45 +1047,45 @@ msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "תוסף זה מספק %s ‏(%s), שכבר מסופק על ידי התוסף %s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:434
 msgid "Plugin already loaded"
 msgstr "תוסף כבר טעון"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:445
 msgid "Failed to allocate memory for Plugin"
 msgstr "כשל בהקצאת זיכרון עבור תוסף"
 
-#: src/common/plugin.c:480
+#: 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:489
+#: src/common/plugin.c:488
 msgid "This module is for Claws Mail GTK1."
 msgstr "מודול זה מיועד עבור Claws Mail GTK1."
 
-#: src/common/plugin.c:771
+#: 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:774
+#: 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:783
+#: 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:785
+#: 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:1213
+#: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
 msgstr "לחיצת יד SSL נכשלה\n"
 
@@ -1102,24 +1097,24 @@ msgstr "אין שיטת SMTP AUTH זמינה\n"
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "שיטת SMTP AUTH נבחרת לא זמינה\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:505 src/common/smtp.c:559
 msgid "bad SMTP response\n"
 msgstr "היענות SMTP רעה\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:530 src/common/smtp.c:548 src/common/smtp.c:662
 msgid "error occurred on SMTP session\n"
 msgstr "אירעה שגיאה בסשן SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:905
+#: src/common/smtp.c:539 src/pop.c:905
 msgid "error occurred on authentication\n"
 msgstr "אירעה שגיאה באימות\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:589
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "ההודעה הינה גדולה מדי (גודל מרבי הינו %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:898
+#: src/common/smtp.c:621 src/pop.c:898
 msgid "couldn't start TLS session\n"
 msgstr "לא היתה אפשרות להתחיל סשן TLS\n"
 
@@ -1151,83 +1146,83 @@ msgstr "‏%s:%s: חיפוש מארח נכשל (%s).\n"
 msgid "write on fd%d: %s\n"
 msgstr "רשום על fd%d:‏ %s\n"
 
-#: src/common/ssl_certificate.c:326
+#: src/common/ssl_certificate.c:328
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "אין אפשרות להתחיל קובץ P12 ‏(%s)\n"
 
-#: src/common/ssl_certificate.c:334
+#: src/common/ssl_certificate.c:336
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "אין אפשרות לקרוא קובץ P12 ‏(%s)\n"
 
-#: src/common/ssl_certificate.c:343
+#: src/common/ssl_certificate.c:345
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "אין אפשרות לייבא קובץ P12 ‏(%s)\n"
 
-#: src/common/ssl_certificate.c:628
+#: src/common/ssl_certificate.c:630
 msgid "Internal error"
 msgstr "שגיאה פנימית"
 
 # לא נתון לבדיקה
-#: src/common/ssl_certificate.c:633
+#: src/common/ssl_certificate.c:635
 msgid "Uncheckable"
 msgstr "לא נתון לסימון"
 
-#: src/common/ssl_certificate.c:637
+#: src/common/ssl_certificate.c:639
 msgid "Self-signed certificate"
 msgstr "תעודה חתומה באופן עצמי"
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:642
 msgid "Revoked certificate"
 msgstr "תעודה פסולה"
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:644
 msgid "No certificate issuer found"
 msgstr "לא נמצא מנפיק תעודה"
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:646
 msgid "Certificate issuer is not a CA"
 msgstr "מנפיק תעודה אינו CA"
 
-#: src/common/ssl_certificate.c:869
+#: src/common/ssl_certificate.c:871
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "אין אפשרות לפתוח קובץ תעודה %s: ‏%s\n"
 
-#: src/common/ssl_certificate.c:873
+#: src/common/ssl_certificate.c:875
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "קובץ תעודה %s חסר (%s)\n"
 
-#: src/common/ssl_certificate.c:892
+#: src/common/ssl_certificate.c:894
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "אין אפשרות לפתוח קובץ מפתח %s ‏(%s)\n"
 
-#: src/common/ssl_certificate.c:896
+#: src/common/ssl_certificate.c:898
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "קובץ מפתח %s חסר (%s)\n"
 
-#: src/common/ssl_certificate.c:1044
+#: src/common/ssl_certificate.c:1046
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "כשל בקריאת קובץ תעודה P12 ‏%s\n"
 
-#: src/common/ssl_certificate.c:1047
+#: src/common/ssl_certificate.c:1049
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "אין אפשרות לפתוח קובץ תעודה P12 ‏%s ‏(%s)\n"
 
 # נעדר
-#: src/common/ssl_certificate.c:1051
+#: src/common/ssl_certificate.c:1053
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "קובץ תעודהP12 %s חסר (%s)\n"
 
-#: src/common/ssl_certificate.c:1076 src/gtk/sslcertwindow.c:85
+#: src/common/ssl_certificate.c:1078 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
 #: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
@@ -1239,649 +1234,648 @@ msgstr "<לא בתעודה>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(נושא טוהר באמצעות RegExp)"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:257
 #, c-format
 msgid "%dB"
 msgstr "%d בתים"
 
-#: src/common/utils.c:260
+#: src/common/utils.c:258
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d ק״ב"
 
-#: src/common/utils.c:261
+#: src/common/utils.c:259
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d מ״ב"
 
-#: src/common/utils.c:262
+#: src/common/utils.c:260
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f ג״ב"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4806
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "ראשון"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4807
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "שני"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4808
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "שלישי"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4809
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "רביעי"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4810
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "חמישי"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4811
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "שישי"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4812
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "שבת"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4814
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "ינואר"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4815
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "פברואר"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4816
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "מרץ"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4817
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "אפריל"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4818
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "מאי"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4819
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "יוני"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4820
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "יולי"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4821
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "אוגוסט"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4822
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "ספטמבר"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4823
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "אוקטובר"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4824
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "נובמבר"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4825
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "דצמבר"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4827
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "א׳"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4828
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "ב׳"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4829
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "ג׳"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4830
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "ד׳"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4831
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "ה׳"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4832
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "ו׳"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4833
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "ש׳"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4835
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "ינו"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4836
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "פבר"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4837
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "מרץ"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4838
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "אפר"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4839
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "מאי"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4840
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "יונ"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4841
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "יול"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4842
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "אוג"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4843
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "ספט"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4844
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "אוק"
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4845
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "נוב"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4846
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "דצמ"
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4857
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "בבוקר"
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4858
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "אחה״צ"
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4859
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "בבוקר"
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4860
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "אחה״צ"
 
-#: src/compose.c:575
+#: src/compose.c:576
 msgid "_Add..."
 msgstr "הו_סף..."
 
-#: src/compose.c:576 src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:316
+#: src/compose.c:577 src/mh_gtk.c:368 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:318
 msgid "_Remove"
 msgstr "הס_ר"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:579 src/folderview.c:241
 msgid "_Properties..."
 msgstr "_מאפיינים..."
 
-#: src/compose.c:585 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
 msgid "_Message"
 msgstr "_הודעה"
 
-#: src/compose.c:588
+#: src/compose.c:589
 msgid "_Spelling"
 msgstr "_איות"
 
-#: src/compose.c:590 src/compose.c:657
+#: src/compose.c:591 src/compose.c:658
 msgid "_Options"
 msgstr "א_פשרויות"
 
-#: src/compose.c:594
+#: src/compose.c:595
 msgid "S_end"
 msgstr "_שלח"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "Send _later"
 msgstr "שלח _אח״כ"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "_Attach file"
 msgstr "ס_פח קובץ"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "_Insert file"
 msgstr "ש_בץ קובץ"
 
-#: src/compose.c:600
+#: src/compose.c:601
 msgid "Insert si_gnature"
 msgstr "שבץ _חתימה"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "_Replace signature"
 msgstr "החלף ח_תימה"
 
-#: src/compose.c:605
+#: src/compose.c:606
 msgid "_Print"
 msgstr "הד_פס"
 
-#: src/compose.c:610 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "בט_ל"
 
-#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:612 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "ב_צע שוב"
 
-#: src/compose.c:614 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:615 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_גזור"
 
-#: src/compose.c:618
+#: src/compose.c:619
 msgid "_Special paste"
 msgstr "הדבקה מיו_חדת"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "As _quotation"
 msgstr "בתור _ציטטה"
 
 # _כרוך
-#: src/compose.c:620
+#: src/compose.c:621
 msgid "_Wrapped"
 msgstr "_כרוכה"
 
 # בטל כריכה
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "_Unwrapped"
 msgstr "_לא כרוכה"
 
-#: src/compose.c:623 src/mainwindow.c:547
+#: src/compose.c:624 src/mainwindow.c:543
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "בחר ה_כל"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "A_dvanced"
 msgstr "מ_תקדם"
 
-#: src/compose.c:626
+#: src/compose.c:627
 msgid "Move a character backward"
 msgstr "הזז תו לאחור"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "Move a character forward"
 msgstr "הזז תו לפנים"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "Move a word backward"
 msgstr "הזז מילה לאחור"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "Move a word forward"
 msgstr "הזז מילה לפנים"
 
-#: src/compose.c:630
+#: src/compose.c:631
 msgid "Move to beginning of line"
 msgstr "הזז לתחילת שורה"
 
-#: src/compose.c:631
+#: src/compose.c:632
 msgid "Move to end of line"
 msgstr "הזז לסוף שורה"
 
-#: src/compose.c:632
+#: src/compose.c:633
 msgid "Move to previous line"
 msgstr "הזז לשורה קודמת"
 
-#: src/compose.c:633
+#: src/compose.c:634
 msgid "Move to next line"
 msgstr "הזז לשורה הבאה"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "Delete a character backward"
 msgstr "מחק תו לאחור"
 
-#: src/compose.c:635
+#: src/compose.c:636
 msgid "Delete a character forward"
 msgstr "מחק תו לפנים"
 
-#: src/compose.c:636
+#: src/compose.c:637
 msgid "Delete a word backward"
 msgstr "מחק מילה לאחור"
 
-#: src/compose.c:637
+#: src/compose.c:638
 msgid "Delete a word forward"
 msgstr "מחק מילה לפנים"
 
-#: src/compose.c:638
+#: src/compose.c:639
 msgid "Delete line"
 msgstr "מחק שורה"
 
-#: src/compose.c:639
+#: src/compose.c:640
 msgid "Delete to end of line"
 msgstr "מחק עד סוף שורה"
 
-#: src/compose.c:642 src/messageview.c:228
+#: src/compose.c:643 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_מצא"
 
-#: src/compose.c:645
+#: src/compose.c:646
 msgid "_Wrap current paragraph"
 msgstr "_כרוך פסקה נוכחית"
 
-#: src/compose.c:646
+#: src/compose.c:647
 msgid "Wrap all long _lines"
 msgstr "כרוך _שורות ארוכות"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "Edit with e_xternal editor"
 msgstr "ערוך בעזרת עורך חי_צוני"
 
-#: src/compose.c:651
+#: src/compose.c:652
 msgid "_Check all or check selection"
 msgstr "_בדוק הכל או בדוק בחירה"
 
-#: src/compose.c:652
+#: src/compose.c:653
 msgid "_Highlight all misspelled words"
 msgstr "_הדגש את כל המילים אשר אויתו באופן שגוי"
 
-#: src/compose.c:653
+#: src/compose.c:654
 msgid "Check _backwards misspelled word"
 msgstr "ב_דוק אחורנית עבור מילים אשר אויתו באופן שגוי"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "_Forward to next misspelled word"
 msgstr "_עבור הלאה למילה הבאה אשר אויתה באופן שגוי"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Reply _mode"
 msgstr "_צורת מענה"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Privacy _System"
 msgstr "מערכת _פרטיות"
 
-#: src/compose.c:669
+#: src/compose.c:670
 msgid "_Priority"
 msgstr "_עדיפות"
 
-#: src/compose.c:671 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:676 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:677 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:678 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:679 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:680 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:681 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:682 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:683 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:684 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:687 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
 msgid "_Address book"
 msgstr "_פנקס כתובות"
 
-#: src/compose.c:689
+#: src/compose.c:690
 msgid "_Template"
 msgstr "_תבנית"
 
-#: src/compose.c:691 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
 msgid "Actio_ns"
 msgstr "פ_עולות"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "Aut_o wrapping"
 msgstr "כרוך _אוטומטית"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "Auto _indent"
 msgstr "ה_זח אוטומטית"
 
-#: src/compose.c:702
+#: src/compose.c:703
 msgid "Si_gn"
 msgstr "_חתימה"
 
-#: src/compose.c:703
+#: src/compose.c:704
 msgid "_Encrypt"
 msgstr "_הצפן"
 
-#: src/compose.c:704
+#: src/compose.c:705
 msgid "_Request Return Receipt"
 msgstr "_בקש קבלת מסירה"
 
-#: src/compose.c:705
+#: src/compose.c:706
 msgid "Remo_ve references"
 msgstr "הסר _מראי מקום"
 
-#: src/compose.c:706
+#: src/compose.c:707
 msgid "Show _ruler"
 msgstr "_הצג סרגל"
 
-#: src/compose.c:711 src/compose.c:721
+#: src/compose.c:712 src/compose.c:722
 msgid "_Normal"
 msgstr "_רגילה"
 
-#: src/compose.c:712 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:713 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
 msgid "_Sender"
 msgstr "_ממען"
 
-#: src/compose.c:714
+#: src/compose.c:715
 msgid "_Mailing-list"
 msgstr "_רשימת-דיוור"
 
-#: src/compose.c:719
+#: src/compose.c:720
 msgid "_Highest"
 msgstr "_גבוהה ביותר"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "Hi_gh"
 msgstr "ג_בוהה"
 
-#: src/compose.c:722
+#: src/compose.c:723
 msgid "Lo_w"
 msgstr "_נמוכה"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "_Lowest"
 msgstr "נ_מוכה ביותר"
 
-#: src/compose.c:728 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:729 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:730 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:734 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:737 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:742 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)"
 
-#: src/compose.c:1071
+#: src/compose.c:1072
 msgid "New message From format error."
 msgstr "שגיאת פורמט From של הודעה חדשה."
 
-#: src/compose.c:1163
+#: src/compose.c:1164
 msgid "New message subject format error."
 msgstr "שגיאת פורמט נושא של הודעה חדשה."
 
-#: src/compose.c:1194 src/quote_fmt.c:569
+#: src/compose.c:1195 src/quote_fmt.c:569
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "לגוף של התבנית \"הודעה חדשה\" יש שגיאה בשורה %d."
 
-#: src/compose.c:1455
+#: src/compose.c:1456
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "אין אפשרות לענות. הדוא״ל המקורי כפי הנראה לא קיים."
 
-#: src/compose.c:1638 src/quote_fmt.c:586
+#: src/compose.c:1639 src/quote_fmt.c:586
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "השדה \"From\" של התבנית \"Reply\" מכיל כתובת דוא״ל שגויה."
 
-#: src/compose.c:1686 src/quote_fmt.c:589
+#: src/compose.c:1687 src/quote_fmt.c:589
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "לגוף של התבנית \"מענה\" יש שגיאה בשורה %d."
 
-#: src/compose.c:1822 src/compose.c:2014 src/quote_fmt.c:606
+#: src/compose.c:1823 src/compose.c:2015 src/quote_fmt.c:606
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "השדה \"From\" של התבנית \"Forward\" מכיל כתובת דוא״ל שגויה."
 
-#: src/compose.c:1882 src/quote_fmt.c:609
+#: src/compose.c:1883 src/quote_fmt.c:609
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "לגוף של התבנית \"קידום\" יש שגיאה בשורה %d."
 
-#: src/compose.c:2056
+#: src/compose.c:2057
 msgid "Fw: multiple emails"
 msgstr "Fw: הודעות דואר מרובות"
 
-#: src/compose.c:2539
+#: src/compose.c:2537
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "לגוף של התבנית \"הכוונה מחדש\" יש שגיאה בשורה %d."
 
-#: src/compose.c:2606 src/gtk/headers.h:14
+#: src/compose.c:2604 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "עותק:"
 
-#: src/compose.c:2609 src/gtk/headers.h:15
+#: src/compose.c:2607 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "עותק סמוי:"
 
-#: src/compose.c:2612 src/gtk/headers.h:12
+#: src/compose.c:2610 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "מענה-אל:"
 
-#: src/compose.c:2615 src/compose.c:4946 src/compose.c:4948
-#: 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:2618 src/gtk/headers.h:34
+#: src/compose.c:2616 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "המשך-אל:"
 
-#: src/compose.c:2621 src/gtk/headers.h:17
+#: src/compose.c:2619 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "ב-מענה-אל:"
 
-#: src/compose.c:2625 src/compose.c:4943 src/compose.c:4951
+#: 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:2834
+#: src/compose.c:2832
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "לא היתה אפשרות לספח קובץ (המרת מערך תווים נכשלה)."
 
-#: src/compose.c:2840
+#: src/compose.c:2838
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1896,16 +1890,16 @@ msgstr[1] ""
 "הקבצים הבאים סופחו: \n"
 "%s"
 
-#: src/compose.c:3113
+#: src/compose.c:3111
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"סימן מרכאות\" של התבנית הינו שגוי."
 
-#: src/compose.c:3613
+#: src/compose.c:3611
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "לא היתה אפשרות להשיג גודל של קובץ '%s'."
 
-#: src/compose.c:3624
+#: src/compose.c:3622
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1913,57 +1907,57 @@ msgid ""
 msgstr ""
 "בחרת לשבץ קובץ של %s בתוך גוף ההודעה. האם אתה בטוח כי ברצונך לעשות זאת?"
 
-#: src/compose.c:3627
+#: src/compose.c:3625
 msgid "Are you sure?"
 msgstr "האם אתה בטוח?"
 
-#: src/compose.c:3628 src/compose.c:10529 src/compose.c:11390
+#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
 msgid "_Insert"
 msgstr "_שבץ"
 
-#: src/compose.c:3752
+#: src/compose.c:3750
 #, c-format
 msgid "File %s is empty."
 msgstr "קובץ %s הינו ריק."
 
-#: src/compose.c:3753
+#: src/compose.c:3751
 msgid "Empty file"
 msgstr "קובץ ריק"
 
-#: src/compose.c:3754
+#: src/compose.c:3752
 msgid "_Attach anyway"
 msgstr "_ספח למרות זאת"
 
-#: src/compose.c:3763
+#: src/compose.c:3761
 #, c-format
 msgid "Can't read %s."
 msgstr "אין אפשרות לקרוא %s."
 
-#: src/compose.c:3790
+#: src/compose.c:3788
 #, c-format
 msgid "Message: %s"
 msgstr "הודעה: %s"
 
-#: src/compose.c:4783 src/plugins/managesieve/sieve_editor.c:694
-#: src/plugins/python/composewindowtype.c:498
+#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
+#: src/plugins/python/composewindowtype.c:421
 msgid " [Edited]"
 msgstr " [ערוכה]"
 
-#: src/compose.c:4790 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "‏%s - הלחנת הודעה%s"
 
-#: src/compose.c:4793 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[אין נושא] - הלחנת הודעה%s"
 
-#: src/compose.c:4795 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
 msgid "Compose message"
 msgstr "הלחנת הודעה"
 
-#: src/compose.c:4822 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."
@@ -1971,52 +1965,52 @@ msgstr ""
 "חשבון לשליחת דואר אינו מצוין.\n"
 "אנא בחר חשבון דואר לפני שליחה."
 
-#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
-#: src/prefs_account.c:3310 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:5043
+#: src/compose.c:5041
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "הנמען היחיד הינו כתובת CC ברירת מחדל. לשלוח למרות זאת?"
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5633
-#: src/folderview.c:2445 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:5075
+#: src/compose.c:5073
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "הנמען היחיד הינו כתובת BCC ברירת מחדל. לשלוח למרות זאת?"
 
-#: src/compose.c:5092
+#: src/compose.c:5090
 msgid "Recipient is not specified."
 msgstr "נמען אינו מצוין."
 
-#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_תור"
 
-#: src/compose.c:5112
+#: src/compose.c:5110
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "הנושא הינו ריק. %s"
 
-#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "לשלוח למרות זאת?"
 
 # להעמיד בתור
-#: src/compose.c:5114 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "להשים בתור למרות זאת?"
 
-#: src/compose.c:5116 src/toolbar.c:425
+#: src/compose.c:5114 src/toolbar.c:425
 msgid "Send later"
 msgstr "שלח אח״כ"
 
-#: src/compose.c:5169 src/compose.c:9993
+#: src/compose.c:5167 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2026,7 +2020,7 @@ msgstr ""
 "\n"
 "המרת מערך תווים נכשלה."
 
-#: src/compose.c:5172 src/compose.c:9996
+#: src/compose.c:5170 src/compose.c:10005
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2036,7 +2030,7 @@ msgstr ""
 "\n"
 "לא היתה אפשרות להשיג מפתח הצפנה של נמען."
 
-#: src/compose.c:5178 src/compose.c:9990
+#: src/compose.c:5176 src/compose.c:9999
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2047,7 +2041,7 @@ msgstr ""
 "\n"
 "חתימה נכשלה: %s"
 
-#: src/compose.c:5181
+#: src/compose.c:5179
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2058,11 +2052,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5183
+#: src/compose.c:5181
 msgid "Could not queue message for sending."
 msgstr "לא היתה אפשרות להשים הודעה בתור לשליחה."
 
-#: src/compose.c:5198 src/compose.c:5258
+#: 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."
@@ -2071,7 +2065,7 @@ msgstr ""
 "נסה את \"שלח הודעות בהמתנה\" מתוך התפריט הראשי ונסה שוב."
 
 # נצל
-#: src/compose.c:5254
+#: src/compose.c:5252
 #, c-format
 msgid ""
 "%s\n"
@@ -2080,7 +2074,7 @@ msgstr ""
 "%s\n"
 "נסה את \"שלח הודעות בהמתנה\" מתוך התפריט הראשי ונסה שוב."
 
-#: src/compose.c:5629
+#: src/compose.c:5627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2091,7 +2085,7 @@ msgstr ""
 "אל מערך התווים %s המצוין.\n"
 "שלח זאת בתור הודעה %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5685
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2104,73 +2098,73 @@ msgstr ""
 "\n"
 "לשלוח למרות זאת?"
 
-#: src/compose.c:5798
+#: src/compose.c:5796
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "לא היתה אפשרות להצפין את הדוא״ל: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5917
 msgid "Encryption warning"
 msgstr "אזהרת הצפנה"
 
-#: src/compose.c:5920
+#: src/compose.c:5918
 msgid "C_ontinue"
 msgstr "ה_משך"
 
-#: src/compose.c:5969
+#: src/compose.c:5967
 msgid "No account for sending mails available!"
 msgstr "אין חשבון זמין לצורך שליחת דואר!"
 
-#: src/compose.c:5978
+#: src/compose.c:5976
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "חשבון נבחר אינו NNTP: פרסום הינו בלתי אפשרי."
 
-#: src/compose.c:6213
+#: src/compose.c:6211
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "תצריף %s לא קיים כבר. להתעלם?"
 
-#: src/compose.c:6214 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:6214
+#: src/compose.c:6212
 msgid "Ignore attachment"
 msgstr "התעלם מן תצריף"
 
-#: src/compose.c:6254
+#: src/compose.c:6252
 #, c-format
 msgid "Original %s part"
 msgstr "אזור %s מקורי"
 
-#: src/compose.c:6832
+#: src/compose.c:6834
 msgid "Add to address _book"
 msgstr "הוסף לפנק_ס כתובות"
 
-#: src/compose.c:6993
+#: src/compose.c:6995
 msgid "Delete entry contents"
 msgstr "מחק תכולות רשומה"
 
-#: src/compose.c:6997 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:7212
+#: src/compose.c:7221
 msgid "Mime type"
 msgstr "טיפוס Mime"
 
-#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: 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:7281
+#: src/compose.c:7290
 msgid "Save Message to "
 msgstr "שמור הודעה אל "
 
-#: src/compose.c:7318 src/editjpilot.c:276 src/editldap.c:518
+#: 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
@@ -2181,23 +2175,23 @@ msgstr "שמור הודעה אל "
 msgid "_Browse"
 msgstr "   _עיון   "
 
-#: src/compose.c:7791
+#: src/compose.c:7800
 msgid "Hea_der"
 msgstr "_תקורה"
 
-#: src/compose.c:7796
+#: src/compose.c:7805
 msgid "_Attachments"
 msgstr "ת_צריפים"
 
-#: src/compose.c:7810
+#: src/compose.c:7819
 msgid "Othe_rs"
 msgstr "א_חרים"
 
-#: src/compose.c:7825
+#: src/compose.c:7834
 msgid "S_ubject:"
 msgstr "_נושא:"
 
-#: src/compose.c:8049
+#: src/compose.c:8058
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2206,19 +2200,19 @@ msgstr ""
 "בודק איות לא יכול היה להתחיל.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8197
 msgid "_From:"
 msgstr "_מאת‎:"
 
-#: src/compose.c:8205
+#: src/compose.c:8214
 msgid "Account to use for this email"
 msgstr "חשבון לשימוש עבור דוא״ל זה"
 
-#: src/compose.c:8207
+#: src/compose.c:8216
 msgid "Sender address to be used"
 msgstr "כתובת ממען לשימוש"
 
-#: src/compose.c:8373
+#: src/compose.c:8382
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2227,68 +2221,68 @@ msgstr ""
 "מערכת הפרטיות '%s' לא היתה ניתנת להיטען. לא תהא נתונה לך אפשרות לחתום או "
 "להצפין את הודעה זו."
 
-#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_ללא"
 
-#: src/compose.c:8575 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:8691
+#: src/compose.c:8700
 msgid "Template From format error."
 msgstr "שגיאת פורמט From של תבנית."
 
-#: src/compose.c:8709
+#: src/compose.c:8718
 msgid "Template To format error."
 msgstr "שגיאת פורמט To של תבנית."
 
-#: src/compose.c:8727
+#: src/compose.c:8736
 msgid "Template Cc format error."
 msgstr "שגיאת פורמט Cc של תבנית."
 
-#: src/compose.c:8745
+#: src/compose.c:8754
 msgid "Template Bcc format error."
 msgstr "שגיאת פורמט Bcc של תבנית."
 
-#: src/compose.c:8763
+#: src/compose.c:8772
 msgid "Template Reply-To format error."
 msgstr "שגיאת פורמט Reply-To של תבנית."
 
-#: src/compose.c:8782
+#: src/compose.c:8791
 msgid "Template subject format error."
 msgstr "שגיאת פורמט נושא של תבנית."
 
-#: src/compose.c:9051
+#: src/compose.c:9060
 msgid "Invalid MIME type."
 msgstr "טיפוס MIME שגוי."
 
-#: src/compose.c:9066
+#: src/compose.c:9075
 msgid "File doesn't exist or is empty."
 msgstr "קובץ לא קיים או שהינו ריק."
 
-#: src/compose.c:9140
+#: src/compose.c:9149
 msgid "Properties"
 msgstr "מאפיינים"
 
-#: src/compose.c:9157
+#: src/compose.c:9166
 msgid "MIME type"
 msgstr "טיפוס MIME"
 
-#: src/compose.c:9198
+#: src/compose.c:9207
 msgid "Encoding"
 msgstr "קידוד"
 
-#: src/compose.c:9218
+#: src/compose.c:9227
 msgid "Path"
 msgstr "נתיב"
 
-#: src/compose.c:9219
+#: src/compose.c:9228
 msgid "File name"
 msgstr "שם קובץ"
 
-#: src/compose.c:9470
+#: src/compose.c:9479
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2299,15 +2293,15 @@ msgstr ""
 "לכפות את סיום התהליך?\n"
 "process group id: %d"
 
-#: src/compose.c:9959 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:9985
+#: src/compose.c:9994
 msgid "Could not queue message."
 msgstr "לא היתה אפשרות להשים הודעה בתור."
 
-#: src/compose.c:9987
+#: src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2318,15 +2312,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10174
 msgid "Could not save draft."
 msgstr "לא היתה אפשרות לשמור טיוטה."
 
-#: src/compose.c:10169
+#: src/compose.c:10178
 msgid "Could not save draft"
 msgstr "לא היתה אפשרות לשמור טיוטה"
 
-#: src/compose.c:10170
+#: src/compose.c:10179
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2334,24 +2328,24 @@ msgstr ""
 "לא היתה אפשרות לשמור טיוטה.\n"
 "האם ברצונך לבטל יציאה או לסלק את דואר זה?"
 
-#: src/compose.c:10172
+#: src/compose.c:10181
 msgid "_Cancel exit"
 msgstr "_ביטול יציאה"
 
-#: src/compose.c:10172
+#: src/compose.c:10181
 msgid "_Discard email"
 msgstr "_סלק דואר"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10341 src/compose.c:10355
 msgid "Select file"
 msgstr "בחירת קובץ"
 
-#: src/compose.c:10360
+#: src/compose.c:10369
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "קובץ '%s' לא היה יכול להיקרא."
 
-#: src/compose.c:10362
+#: src/compose.c:10371
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2360,71 +2354,71 @@ msgstr ""
 "קובץ '%s' מכיל תווים שגויים\n"
 "עבור הקידוד הנוכחי, שיבוץ עשוי להיות לא מדויק."
 
-#: src/compose.c:10449
+#: src/compose.c:10458
 msgid "Discard message"
 msgstr "סילוק הודעה"
 
 # עברה שינוי. האם לסלקה
-#: src/compose.c:10450
+#: src/compose.c:10459
 msgid "This message has been modified. Discard it?"
 msgstr "הודעה זו שונתה. לסלק אותה?"
 
-#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_סלק"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10460 src/compose.c:10464
 msgid "_Save to Drafts"
 msgstr "_שמור לטיוטות"
 
-#: src/compose.c:10453 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:10454
+#: src/compose.c:10463
 msgid "This message has been modified. Save the latest changes?"
 msgstr "הודעה זו שונתה. לשמור שינויים אחרונים?"
 
-#: src/compose.c:10455
+#: src/compose.c:10464
 msgid "_Don't save"
 msgstr "_אל תשמור"
 
-#: src/compose.c:10526
+#: src/compose.c:10535
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "האם ברצונך להחיל את התבנית '%s'?"
 
-#: src/compose.c:10528
+#: src/compose.c:10537
 msgid "Apply template"
 msgstr "החלת תבנית"
 
-#: src/compose.c:10529 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:11387
+#: src/compose.c:11396
 msgid "Insert or attach?"
 msgstr "לשבץ או לספח?"
 
-#: src/compose.c:11388
+#: 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:11390
+#: src/compose.c:11399
 msgid "_Attach"
 msgstr "_ספח"
 
-#: src/compose.c:11607
+#: src/compose.c:11616
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "שגיאת פורמט ציטטה בשורה %d."
 
-#: src/compose.c:11902
+#: src/compose.c:11911
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2472,11 +2466,11 @@ msgstr "צור דו״ח bug"
 msgid "Save crash information"
 msgstr "שמור מידע קריסה"
 
-#: src/editaddress.c:155 src/editaddress.c:231
+#: src/editaddress.c:156 src/editaddress.c:232
 msgid "Add New Person"
 msgstr "הוספת אישיות חדשה"
 
-#: src/editaddress.c:157
+#: src/editaddress.c:158
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2502,7 +2496,7 @@ msgstr ""
 "הקלק אישור כדי להמשיך לערוך את איש קשר זה.\n"
 "הקלק על ביטול כדי לסגור בלי לשמור."
 
-#: src/editaddress.c:168
+#: src/editaddress.c:169
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2524,35 +2518,35 @@ msgstr ""
 "הקלק אישור כדי להמשיך לערוך את איש קשר זה.\n"
 "הקלק על ביטול כדי לסגור בלי לשמור."
 
-#: src/editaddress.c:232
+#: src/editaddress.c:233
 msgid "Edit Person Details"
 msgstr "עריכת פרטי אישיות"
 
-#: src/editaddress.c:410
+#: src/editaddress.c:411
 msgid "An Email address must be supplied."
 msgstr "יש לספק כתובת דוא״ל."
 
-#: src/editaddress.c:586 src/editaddress_other_attributes_ldap.c:198
+#: src/editaddress.c:587 src/editaddress_other_attributes_ldap.c:198
 msgid "A Name and Value must be supplied."
 msgstr "יש לספק שם וערך."
 
-#: src/editaddress.c:675 src/prefs_folder_item.c:1675
+#: src/editaddress.c:676 src/prefs_folder_item.c:1675
 msgid "Discard"
 msgstr "סילוק"
 
-#: src/editaddress.c:676
+#: src/editaddress.c:677
 msgid "Apply"
 msgstr "החל"
 
-#: src/editaddress.c:706 src/editaddress.c:755
+#: src/editaddress.c:707 src/editaddress.c:756
 msgid "Edit Person Data"
 msgstr "עריכת נתוני אישיות"
 
-#: src/editaddress.c:784
+#: src/editaddress.c:785
 msgid "Choose a picture"
 msgstr "בחירת תמונה"
 
-#: src/editaddress.c:803
+#: src/editaddress.c:804
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2561,58 +2555,58 @@ msgstr ""
 "כשל בייבוא תמונה: \n"
 "%s"
 
-#: src/editaddress.c:845
+#: src/editaddress.c:846
 msgid "_Set picture"
 msgstr "_קבע תמונה"
 
-#: src/editaddress.c:846
+#: src/editaddress.c:847
 msgid "_Unset picture"
 msgstr "_אפס תמונה"
 
-#: src/editaddress.c:904
+#: src/editaddress.c:905
 msgid "Photo"
 msgstr "תצלום"
 
-#: src/editaddress.c:951 src/editaddress.c:953 src/expldifdlg.c:516
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
 #: src/exporthtml.c:761 src/ldif.c:746
 msgid "Display Name"
 msgstr "שם צג"
 
-#: src/editaddress.c:962 src/editaddress.c:966 src/ldif.c:754
+#: src/editaddress.c:963 src/editaddress.c:967 src/ldif.c:754
 msgid "Last Name"
 msgstr "שם משפחה"
 
-#: src/editaddress.c:963 src/editaddress.c:965 src/ldif.c:750
+#: src/editaddress.c:964 src/editaddress.c:966 src/ldif.c:750
 msgid "First Name"
 msgstr "שם פרטי"
 
-#: src/editaddress.c:969 src/editaddress.c:971
+#: src/editaddress.c:970 src/editaddress.c:972
 msgid "Nickname"
 msgstr "שם כינוי"
 
-#: src/editaddress.c:1055 src/editaddress.c:1123
+#: src/editaddress.c:1056 src/editaddress.c:1124
 msgid "Alias"
 msgstr "שם נוסף"
 
-#: src/editaddress.c:1265 src/editaddress.c:1334 src/editaddress.c:1354
+#: src/editaddress.c:1266 src/editaddress.c:1335 src/editaddress.c:1355
 #: src/editaddress_other_attributes_ldap.c:303
 #: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:222
 msgid "Value"
 msgstr "ערך"
 
-#: src/editaddress.c:1425
+#: src/editaddress.c:1426
 msgid "_User Data"
 msgstr "מידע _משתמש"
 
-#: src/editaddress.c:1426
+#: src/editaddress.c:1427
 msgid "_Email Addresses"
 msgstr "_כתובות דוא״ל"
 
-#: src/editaddress.c:1429 src/editaddress.c:1432
+#: src/editaddress.c:1430 src/editaddress.c:1433
 msgid "O_ther Attributes"
 msgstr "א_פיונים אחרים"
 
-#: src/editaddress.c:1583
+#: src/editaddress.c:1584
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2642,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:1970
-#: src/wizard.c:1197 src/wizard.c:1617
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "File"
 msgstr "קובץ"
 
@@ -2691,12 +2685,12 @@ msgstr "ערוך תיקייה"
 msgid "Input the new name of folder:"
 msgstr "הזן את השם החדש של תיקייה:"
 
-#: src/editgroup.c:556 src/foldersel.c:582 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: 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
 msgid "New folder"
 msgstr "תיקייה חדשה"
 
-#: src/editgroup.c:557 src/foldersel.c:583 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
 msgstr "הזן את השם של תיקייה חדשה:"
@@ -2725,16 +2719,16 @@ msgstr "הוספת רשומת JPilot חדשה"
 msgid "Edit LDAP - Select Search Base"
 msgstr "עריכת LDAP - בחירת בסיס חיפוש"
 
-#: src/editldap_basedn.c:156 src/editldap.c:441
+#: src/editldap_basedn.c:156 src/editldap.c:440
 msgid "Hostname"
 msgstr "שם מארח"
 
-#: src/editldap_basedn.c:166 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:108
+#: src/editldap_basedn.c:166 src/editldap.c:457
+#: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:110
 msgid "Port"
 msgstr "פורט"
 
-#: src/editldap_basedn.c:176 src/editldap.c:502
+#: src/editldap_basedn.c:176 src/editldap.c:501
 msgid "Search Base"
 msgstr "בסיס חיפוש"
 
@@ -2746,37 +2740,37 @@ msgstr "בסיסי חיפוש זמינים"
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "לא היתה אפשרות לקרוא בסיסי חיפוש מתוך שרת - אנא קבע ידנית"
 
-#: src/editldap_basedn.c:291 src/editldap.c:281
+#: src/editldap_basedn.c:291 src/editldap.c:280
 msgid "Could not connect to server"
 msgstr "לא היתה אפשרות לקשר לשרת"
 
-#: src/editldap.c:152
+#: src/editldap.c:151
 msgid "A Name must be supplied."
 msgstr "חובה לספק שם."
 
-#: src/editldap.c:164
+#: src/editldap.c:163
 msgid "A Hostname must be supplied for the server."
 msgstr "חובה לספק שם מארח עבור השרת."
 
-#: src/editldap.c:177
+#: src/editldap.c:176
 msgid "At least one LDAP search attribute should be supplied."
 msgstr "ישנו צורך כי לפחות אפיון חיפוש LDAP אחד יסופק."
 
 # Connected to server successfully
 # חובר לשרת בהצלחה
-#: src/editldap.c:278
+#: src/editldap.c:277
 msgid "Connected successfully to server"
 msgstr "חובר בהצלחה לשרת"
 
-#: src/editldap.c:336 src/editldap.c:970
+#: src/editldap.c:335 src/editldap.c:973
 msgid "Edit LDAP Server"
 msgstr "ערוך שרת LDAP"
 
-#: src/editldap.c:437
+#: src/editldap.c:436
 msgid "A name that you wish to call the server."
 msgstr "שם מיוחל עבור השרת."
 
-#: src/editldap.c:450
+#: src/editldap.c:449
 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 "
@@ -2787,15 +2781,15 @@ msgstr ""
 "הארגון \"mydomain.com\". כתובת IP גם כן ניתנת לשימוש. באפשרותך לציין "
 "\"localhost\" אם שרת LDAP מורץ על אותו מחשב בו Claws Mail עליו מורץ."
 
-#: src/editldap.c:470
+#: src/editldap.c:469
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3383
+#: src/editldap.c:470 src/prefs_account.c:3343
 msgid "SSL"
 msgstr "SSL"
 
-#: src/editldap.c:475
+#: src/editldap.c:474
 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 "
@@ -2804,7 +2798,7 @@ msgstr ""
 "אפשר חיבור מאובטח לשרת LDAP מבעד אל TLS. אם חיבור נכשל, היה בטוח לבדוק את "
 "התצורה המדויקת בתוך ldap.conf (שדות TLS_CACERTDIR וגם TLS_REQCERT)."
 
-#: src/editldap.c:479
+#: src/editldap.c:478
 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 "
@@ -2813,19 +2807,19 @@ msgstr ""
 "אפשר חיבור מאובטח לשרת LDAP מבעד אל SSL. אם חיבור נכשל, היה בטוח לבדוק את "
 "התצורה המדויקת בתוך ldap.conf (שדות TLS_CACERTDIR וגם TLS_REQCERT)."
 
-#: src/editldap.c:491
+#: src/editldap.c:490
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "מספר הפורט שהשרת מאזין עליו. הפורט 389 הוא פורט ברירת מחדל."
 
-#: src/editldap.c:494
+#: src/editldap.c:493
 msgid " Check Server "
 msgstr " בדוק שרת "
 
-#: src/editldap.c:498
+#: src/editldap.c:497
 msgid "Press this button to test the connection to the server."
 msgstr "לחץ על לחצן זה כדי לבחון את החיבור לשרת."
 
-#: src/editldap.c:511
+#: src/editldap.c:510
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2838,27 +2832,27 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=שם ארגון,c=ארץ\n"
 
-#: src/editldap.c:522
+#: src/editldap.c:521
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr "לחץ על לחצן זה כדי לחפש את השם של שמות המדור הזמינים על השרת."
 
-#: src/editldap.c:578
+#: src/editldap.c:577
 msgid "Search Attributes"
 msgstr "אפיוני חיפוש"
 
-#: src/editldap.c:587
+#: src/editldap.c:586
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
 msgstr "רשימה של שמות אפיון LDAP אשר צריך לחפשם כאשר מנסים למצוא שם או כתובת."
 
-#: src/editldap.c:590
+#: src/editldap.c:589
 msgid " Defaults "
 msgstr " משתמטים "
 
-#: src/editldap.c:594
+#: src/editldap.c:593
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
@@ -2866,11 +2860,11 @@ msgstr ""
 "זה מאפס את שמות האפיון לערך שגרתי שאמור למצוא את רוב השמות והכתובות במהלך "
 "תהליך חיפוש של שם או כתובת."
 
-#: src/editldap.c:600
+#: src/editldap.c:599
 msgid "Max Query Age (secs)"
 msgstr "גיל שאילתא מרבי (שניות)"
 
-#: src/editldap.c:615
+#: src/editldap.c:614
 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 "
@@ -2891,11 +2885,11 @@ msgstr ""
 "יותר יפחית את זמן החיפוש עבור חיפושים עוקבים. זה שימושי עבור שרתים להם זמני "
 "תגובה אטיים על חשבון של עוד זיכרון להטמנת תוצאות."
 
-#: src/editldap.c:632
+#: src/editldap.c:631
 msgid "Include server in dynamic search"
 msgstr "כלול שרת בחיפוש דינמי"
 
-#: src/editldap.c:637
+#: src/editldap.c:636
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
@@ -2903,28 +2897,29 @@ msgstr ""
 "סמן את אפשרות זו כדי להכליל את שרת זה עבור חיפושים דינמיים בעת שימוש בהשלמת "
 "כתובת."
 
-#: src/editldap.c:643
+#: src/editldap.c:642
 msgid "Match names 'containing' search term"
 msgstr "התאם שמות 'מכילים' מונחי חיפוש"
 
-#: src/editldap.c:648
+#: 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:701
+#: src/editldap.c:700
 msgid "Bind DN"
 msgstr "‏DN קשור"
 
-#: src/editldap.c:710
+#: src/editldap.c:709
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2935,40 +2930,40 @@ msgstr ""
 "מוגנים. באופן אופייני שם זה מעוצב כך: \"cn=user,dc=claws-mail,dc=org\". זה "
 "נשאר לרוב ריק בעת ביצוע חיפוש."
 
-#: src/editldap.c:717
+#: src/editldap.c:716
 msgid "Bind Password"
 msgstr "סיסמת קשירה"
 
-#: src/editldap.c:727
+#: src/editldap.c:726
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "הסיסמה לשימוש בעת התחברות בתור משתמש \"DN קשור\"."
 
-#: src/editldap.c:732
+#: src/editldap.c:731
 msgid "Timeout (secs)"
 msgstr "פקיעת זמן (שניות)"
 
-#: src/editldap.c:746
+#: src/editldap.c:745
 msgid "The timeout period in seconds."
 msgstr "משך זמן פקיעת זמן בשניות."
 
-#: src/editldap.c:750
+#: src/editldap.c:749
 msgid "Maximum Entries"
 msgstr "רשומות מרביות"
 
-#: src/editldap.c:764
+#: src/editldap.c:763
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "המספר המקסימלי של רשומות שיוחזרו בתוצאות חיפוש."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:778 src/prefs_account.c:3234
 msgid "Basic"
 msgstr "בסיסי"
 
-#: src/editldap.c:781 src/gtk/quicksearch.c:680
+#: src/editldap.c:780 src/gtk/quicksearch.c:680
 msgid "Extended"
 msgstr "מורחב"
 
-#: src/editldap.c:975
+#: src/editldap.c:978
 msgid "Add New LDAP Server"
 msgstr "הוספת שרת LDAP חדש"
 
@@ -3094,20 +3089,20 @@ 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:941
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5992
+#: 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 "ברירת מחדל"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:243
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
+#: src/plugins/pgpcore/sgpgme.c:147 src/plugins/pgpcore/sgpgme.c:163
 msgid "Full"
 msgstr "מלא"
 
@@ -3332,7 +3327,7 @@ msgstr "ייצוא פנקס כתובות לקובץ LDIF"
 msgid "Distinguished Name"
 msgstr "שם מובחן"
 
-#: src/export.c:113 src/summaryview.c:8139
+#: src/export.c:113 src/summaryview.c:8190
 msgid "Export to mbox file"
 msgstr "ייצוא לקובץ mbox"
 
@@ -3473,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"
@@ -3572,154 +3567,149 @@ msgid ""
 msgstr ""
 
 # נכנסות
-#: src/folder.c:1565 src/foldersel.c:400 src/prefs_folder_item.c:300
+#: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:300
 msgid "Inbox"
 msgstr "דואר נכנס"
 
 # נשלחו
-#: src/folder.c:1569 src/foldersel.c:404
+#: src/folder.c:1569 src/foldersel.c:407
 msgid "Sent"
 msgstr "דואר יוצא"
 
-#: src/folder.c:1573 src/foldersel.c:408 src/prefs_folder_item.c:303
+#: src/folder.c:1573 src/foldersel.c:411 src/prefs_folder_item.c:303
 msgid "Queue"
 msgstr "תור"
 
-#: src/folder.c:1577 src/foldersel.c:412 src/prefs_folder_item.c:304
+#: src/folder.c:1577 src/foldersel.c:415 src/prefs_folder_item.c:304
 msgid "Trash"
 msgstr "אשפה"
 
-#: src/folder.c:1581 src/foldersel.c:416 src/prefs_folder_item.c:302
+#: src/folder.c:1581 src/foldersel.c:419 src/prefs_folder_item.c:302
 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:3563
+#: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "כעת מעדכן מטמון עבור %s..."
 
-#: src/folder.c:4424
+#: src/folder.c:4427
 msgid "Processing messages..."
 msgstr "כעת מעבד הודעות..."
 
-#: src/folder.c:4559
+#: src/folder.c:4563
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "כעת מסנכרן את %s עבור שימוש לא־מקוון...\n"
 
-#: src/folder.c:4816
-msgid "A folder name cannot begin or end with a dot."
-msgstr "שם תיקייה לא יכול להתחיל או להסתיים עם נקודה."
-
 #: src/folder.c:4820
-#, fuzzy
-msgid "A folder name can not end with a space."
+msgid "A folder name cannot begin or end with a dot."
 msgstr "שם תיקייה לא יכול להתחיל או להסתיים עם נקודה."
 
 #: src/foldersel.c:247
 msgid "Select folder"
 msgstr "בחירת תיקייה"
 
-#: src/foldersel.c:584 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: 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
 msgid "NewFolder"
 msgstr "תיקייה_חדשה"
 
-#: src/foldersel.c:592 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
-#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2056
+#: 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' לא יכול להיכלל בשם תיקייה."
 
-#: src/foldersel.c:607 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
-#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:434 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2063
+#: 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:2050
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "התיקייה '%s' כבר קיימת."
 
-#: src/foldersel.c:614 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: 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
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "אין אפשרות ליצור את התיקייה '%s'."
 
-#: src/folderview.c:237
+#: src/folderview.c:236
 msgid "Mark all re_ad"
 msgstr "סמן את כולן בתור נ_קראו"
 
-#: src/folderview.c:238
+#: src/folderview.c:237
 msgid "Mark all read recursi_vely"
 msgstr "סמן _רקורסיבית את כולן ככאלה שנקראו"
 
-#: src/folderview.c:240
+#: src/folderview.c:239
 msgid "R_un processing rules"
 msgstr "ה_רץ כללי עיבוד"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:240 src/mainwindow.c:547
 msgid "_Search folder..."
 msgstr "_חפש תיקייה..."
 
-#: src/folderview.c:243
+#: src/folderview.c:242
 msgid "Process_ing..."
 msgstr "_עיבוד..."
 
-#: src/folderview.c:244
+#: src/folderview.c:243
 msgid "Empty _trash..."
 msgstr "רוקן _אשפה..."
 
-#: src/folderview.c:245
+#: src/folderview.c:244
 msgid "Send _queue..."
 msgstr "שלח _תור..."
 
 # חדשה
-#: src/folderview.c:385 src/folderview.c:432
+#: 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:6266
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6316
 msgid "New"
 msgstr "חדשות"
 
-#: src/folderview.c:386 src/folderview.c:433
+#: 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:6268
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6318
 msgid "Unread"
 msgstr "לא נקראו"
 
-#: src/folderview.c:387 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:389 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "סך הכל"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:435 src/summaryview.c:445
+#: src/folderview.c:437 src/summaryview.c:445
 msgid "#"
 msgstr "מס׳"
 
-#: src/folderview.c:765
+#: src/folderview.c:767
 msgid "Setting folder info..."
 msgstr "כעת מגדיר מידע תיקייה..."
 
-#: src/folderview.c:837
+#: src/folderview.c:839
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3727,98 +3717,98 @@ msgstr ""
 "האם אתה בטוח כי ברצונך לסמן את כל הדואר בתיקייה זו ובתיקיות המשנה שלה ככזה "
 "נקרא?"
 
-#: src/folderview.c:839 src/summaryview.c:4115
+#: src/folderview.c:841 src/summaryview.c:4134
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "האם אתה בטוח כי ברצונך לסמן את כל הדואר בתיקייה זו ככזה נקרא?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:845 src/summaryview.c:4133
 msgid "Mark all as read"
 msgstr "סמן את כולן ככאלה שנקראו"
 
-#: src/folderview.c:1019 src/imap.c:4639
-#, fuzzy, c-format
-msgid "Scanning folder %s/%s..."
+#: 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:1022 src/imap.c:4643 src/mainwindow.c:5193 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..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1050
 msgid "Rebuild folder tree"
 msgstr "בנה מחדש עץ תיקייה"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1051
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "בנייה מחודשת של עץ התיקייה תסיר רק את המטמונים המקומיים. האם ברצונך להמשיך?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1061
 msgid "Rebuilding folder tree..."
 msgstr "כעת בונה מחדש עץ תיקייה..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1063
 msgid "Scanning folder tree..."
 msgstr "כעת סורק עץ תיקייה..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1154
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "לא היתה אפשרות לסרוק תיקייה %s\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1208
 msgid "Checking for new messages in all folders..."
 msgstr "כעת בודק עבור הודעות חדשות בכל התיקיות..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2124
 #, c-format
 msgid "Closing folder %s..."
 msgstr "כעת סוגר תיקייה %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2219
 #, c-format
 msgid "Opening folder %s..."
 msgstr "כעת פותח תיקייה %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2237
 msgid "Folder could not be opened."
 msgstr "תיקייה לא היתה ניתנת להיפתח."
 
-#: src/folderview.c:2386 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
 msgid "Empty trash"
 msgstr "ריקון אשפה"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2380
 msgid "Delete all messages in trash?"
 msgstr "מחיקת כל ההודעות באשפה?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2381
 msgid "_Empty trash"
 msgstr "_רוקן אשפה"
 
-#: src/folderview.c:2431 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2424 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "אזהרת לא־מקוון"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2425 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "אתה עובד במצב לא־מקוון. לעקוף?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2436 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "שליחת הודעות בהמתנה"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2437 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "שליחת כל ההודעות שבהמתנה?"
 
-#: src/folderview.c:2453 src/toolbar.c:2647
+#: src/folderview.c:2446 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "אירעו שגיאות מסוימות במהלך שליחת הודעות בהמתנה."
 
-#: src/folderview.c:2456 src/main.c:2743 src/toolbar.c:2650
+#: src/folderview.c:2449 src/main.c:2717 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3827,64 +3817,64 @@ msgstr ""
 "אירעו שגיאות מסוימות במהלך שליחת הודעות בהמתנה:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2524
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "האם אתה בטוח כי ברצונך להעתיק את תיקייה '%s' בתוך '%s'?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2525
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "האם אתה בטוח כי ברצונך להפוך את תיקייה '%s' לתיקיית משנה של '%s'?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Copy folder"
 msgstr "העתקת תיקייה"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2527
 msgid "Move folder"
 msgstr "העברת תיקייה"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2538
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "כעת מעתיק את %s אל %s..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2538
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "כעת מעביר את %s אל %s..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2572
 msgid "Source and destination are the same."
 msgstr "מקור ויעד הינם זהים."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2575
 msgid "Can't copy a folder to one of its children."
 msgstr "אין אפשרות להעתיק תיקייה לתוך אחד מצאצאיה."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2576
 msgid "Can't move a folder to one of its children."
 msgstr "אין אפשרות להעביר תיקייה לתוך אחד מצאצאיה."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2579
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "תיקייה לא ניתנת להעברה בין תיבות דואר שונות."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2582
 msgid "Copy failed!"
 msgstr "העתקה נכשלה!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2582
 msgid "Move failed!"
 msgstr "העברה נכשלה!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2632
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "תצורת עיבוד עבור תיקייה %s"
 
-#: src/folderview.c:3068 src/summaryview.c:4553 src/summaryview.c:4658
+#: src/folderview.c:3060 src/summaryview.c:4579 src/summaryview.c:4684
 msgid "The destination folder can only be used to store subfolders."
 msgstr "תיקיית היעד ניתנת לשימוש רק לאחסון תיקיות משנה."
 
@@ -3908,7 +3898,7 @@ msgstr " חיפוש "
 msgid "Newsgroup name"
 msgstr "שם קבוצת דיונים"
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:171
+#: src/grouplistdialog.c:205
 msgid "Messages"
 msgstr "הודעות"
 
@@ -3934,7 +3924,7 @@ msgstr "לא מוכר"
 msgid "Can't retrieve newsgroup list."
 msgstr "אין אפשרות לאחזר רשימת קבוצת דיונים."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1565
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1584
 msgid "Done."
 msgstr "סיים."
 
@@ -3973,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 ""
@@ -4027,7 +4017,7 @@ msgstr ""
 "מקומיות: %s (מערך תווים: %s)\n"
 "מערכת הפעלה: לא ידועה"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:705 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"
 
@@ -4144,44 +4134,44 @@ msgstr ""
 "תוכנית זו אמורה להיות מלווה בעותק של הרשיון GNU General Public License; אם "
 "לא, ראה ‭"
 
-#: src/gtk/about.c:698 src/main.c:2567
+#: src/gtk/about.c:698 src/main.c:2541
 msgid "Session statistics\n"
 msgstr "סטטיסטיקות סשן\n"
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2577 src/main.c:2580
+#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2551 src/main.c:2554
 #, c-format
 msgid "Started: %s\n"
 msgstr "אותחל: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2586
+#: src/gtk/about.c:718 src/main.c:2560
 msgid "Incoming traffic\n"
 msgstr "תעבורה נכנסת\n"
 
-#: src/gtk/about.c:721 src/main.c:2589
+#: src/gtk/about.c:721 src/main.c:2563
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "הודעות אשר נתקבלו: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2595
+#: src/gtk/about.c:728 src/main.c:2569
 msgid "Outgoing traffic\n"
 msgstr "תעבורה יוצאת\n"
 
-#: src/gtk/about.c:731 src/main.c:2598
+#: src/gtk/about.c:731 src/main.c:2572
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "הודעות חדשות/שכוונו מחדש: %d\n"
 
-#: src/gtk/about.c:736 src/main.c:2602
+#: src/gtk/about.c:736 src/main.c:2576
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "הודעות אשר נענו: %d\n"
 
-#: src/gtk/about.c:741 src/main.c:2606
+#: src/gtk/about.c:741 src/main.c:2580
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "הודעות אשר קודמו: %d\n"
 
-#: src/gtk/about.c:746 src/main.c:2610
+#: src/gtk/about.c:746 src/main.c:2584
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "סך כל הודעות יוצאות: %d\n"
@@ -4224,63 +4214,63 @@ msgstr "_הערות שחרור"
 msgid "_Statistics"
 msgstr "ס_טטיסטיקות"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
 msgid "Orange"
 msgstr "כתום"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
 msgid "Red"
 msgstr "אדום"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
 msgid "Pink"
 msgstr "ורוד"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
 msgid "Sky blue"
 msgstr "כחול שמים"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
 msgid "Blue"
 msgstr "כחול"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
 msgid "Green"
 msgstr "ירוק"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
 msgid "Brown"
 msgstr "חום"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
 msgid "Grey"
 msgstr "אפור"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
 msgid "Light brown"
 msgstr "חום בהיר"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
 msgid "Dark red"
 msgstr "אדום כהה"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:402
 msgid "Dark pink"
 msgstr "ורוד כהה"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
 msgid "Steel blue"
 msgstr "כחול פלדה"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:410
 msgid "Gold"
 msgstr "זהב"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
 msgid "Bright green"
 msgstr "ירוק בהיר"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
 msgid "Magenta"
 msgstr "ארגמן"
 
@@ -4464,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 "‎עותק‎"
 
@@ -4507,7 +4496,7 @@ msgstr "‎נושא‎"
 msgid "Subject:"
 msgstr "נושא:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:433
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:432
 msgid "Comments"
 msgstr "‎הערות‎"
 
@@ -4625,11 +4614,11 @@ msgstr "נראתה:"
 
 #: 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:2786
+#: src/prefs_summary_column.c:79 src/summaryview.c:2805
 msgid "Status"
 msgstr "‎מצב‎"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:880
+#: src/gtk/headers.h:37 src/prefs_themes.c:881
 msgid "Status:"
 msgstr "מצב:"
 
@@ -4698,7 +4687,7 @@ msgstr "‎קדימות‎"
 msgid "Precedence:"
 msgstr "קדימות:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1066
+#: src/gtk/headers.h:46 src/prefs_account.c:1071
 msgid "Organization"
 msgstr "‎ארגון‎"
 
@@ -4937,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 "קלט סיסמה"
 
@@ -5011,9 +4999,9 @@ msgstr ""
 #: src/plugins/clamd/clamav_plugin_gtk.c:552
 #: src/plugins/fancy/fancy_prefs.c:114
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:137
+#: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:424
+#: src/plugins/managesieve/sieve_prefs.c:412
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5022,10 +5010,10 @@ 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:617 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:82
+#: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/spam_report/spam_report_prefs.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:734 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "תוספים"
 
@@ -5062,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:3273 src/prefs_account.c:3291 src/prefs_account.c:3309
-#: src/prefs_account.c:3327 src/prefs_account.c:3345 src/prefs_account.c:3363
-#: src/prefs_account.c:3382 src/prefs_account.c:3475
+#: 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"
@@ -5349,7 +5337,7 @@ msgid "Signer"
 msgstr "חוֹתם"
 
 #: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:836
+#: src/prefs_themes.c:837
 msgid "Name: "
 msgstr "שם: "
 
@@ -5476,21 +5464,21 @@ msgstr "תעודת SSL שונתה והינה חסרת תוקף"
 msgid "SSL certificate changed"
 msgstr "תעודת SSL שונתה"
 
-#: src/headerview.c:94
+#: src/headerview.c:95
 msgid "Tags:"
 msgstr "תגיות:"
 
-#: src/headerview.c:192 src/plugins/notification/notification_popup.c:316
+#: src/headerview.c:193 src/plugins/notification/notification_popup.c:316
 #: src/plugins/notification/notification_popup.c:623
-#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3344
-#: src/summaryview.c:3362 src/summaryview.c:3383
+#: src/plugins/notification/notification_trayicon.c:845 src/summaryview.c:3363
+#: src/summaryview.c:3381 src/summaryview.c:3402
 msgid "(No From)"
 msgstr "(אין ממען)"
 
-#: src/headerview.c:207 src/plugins/notification/notification_popup.c:318
+#: src/headerview.c:208 src/plugins/notification/notification_popup.c:318
 #: src/plugins/notification/notification_popup.c:627
-#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3395
-#: src/summaryview.c:3398
+#: src/plugins/notification/notification_trayicon.c:848 src/summaryview.c:3414
+#: src/summaryview.c:3417
 msgid "(No Subject)"
 msgstr "(אין נושא)"
 
@@ -5531,216 +5519,176 @@ msgid "IMAP error on %s:"
 msgstr "שגיאת IMAP אצל %s:"
 
 #: src/imap.c:621
-#, fuzzy
-msgid "authenticated"
+msgid " authenticated\n"
 msgstr " מאומת\n"
 
 #: src/imap.c:624
-#, fuzzy
-msgid "not authenticated"
+msgid " not authenticated\n"
 msgstr " לא מאומת\n"
 
 #: src/imap.c:627
-#, fuzzy
-msgid "bad state"
+msgid " bad state\n"
 msgstr " מצב רע\n"
 
 #: src/imap.c:630
-#, fuzzy
-msgid "stream error"
+msgid " stream error\n"
 msgstr " שגיאת זרם\n"
 
 #: 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:637
-#, fuzzy
-msgid "connection refused"
+msgid " connection refused\n"
 msgstr " חיבור סורב\n"
 
 #: src/imap.c:640
-#, fuzzy
-msgid "memory error"
+msgid " memory error\n"
 msgstr " שגיאת זיכרון\n"
 
 #: src/imap.c:643
-#, fuzzy
-msgid "fatal error"
+msgid " fatal error\n"
 msgstr " שגיאה פטאלית\n"
 
 #: 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 " שגיאת פרוטוקול (קרוב לוודאי אי תאימות RFC מתוך השרת)\n"
 
 #: src/imap.c:650
-#, fuzzy
-msgid "connection not accepted"
+msgid " connection not accepted\n"
 msgstr " חיבור לא קביל\n"
 
 #: src/imap.c:653
-#, fuzzy
-msgid "APPEND error"
+msgid " APPEND error\n"
 msgstr " שגיאת APPEND\n"
 
 #: src/imap.c:656
-#, fuzzy
-msgid "NOOP error"
+msgid " NOOP error\n"
 msgstr " שגיאת NOOP\n"
 
 #: src/imap.c:659
-#, fuzzy
-msgid "LOGOUT error"
+msgid " LOGOUT error\n"
 msgstr " שגיאת LOGOUT\n"
 
 #: src/imap.c:662
-#, fuzzy
-msgid "CAPABILITY error"
+msgid " CAPABILITY error\n"
 msgstr " שגיאת CAPABILITY\n"
 
 #: src/imap.c:665
-#, fuzzy
-msgid "CHECK error"
+msgid " CHECK error\n"
 msgstr " שגיאת CHECK\n"
 
 #: src/imap.c:668
-#, fuzzy
-msgid "CLOSE error"
+msgid " CLOSE error\n"
 msgstr " שגיאת CLOSE\n"
 
 #: src/imap.c:671
-#, fuzzy
-msgid "EXPUNGE error"
+msgid " EXPUNGE error\n"
 msgstr " שגיאת EXPUNGE\n"
 
 #: src/imap.c:674
-#, fuzzy
-msgid "COPY error"
+msgid " COPY error\n"
 msgstr " שגיאת COPY\n"
 
 #: src/imap.c:677
-#, fuzzy
-msgid "UID COPY error"
+msgid " UID COPY error\n"
 msgstr " שגיאת UID COPY\n"
 
 #: src/imap.c:680
-#, fuzzy
-msgid "CREATE error"
+msgid " CREATE error\n"
 msgstr " שגיאת CREATE\n"
 
 #: src/imap.c:683
-#, fuzzy
-msgid "DELETE error"
+msgid " DELETE error\n"
 msgstr " שגיאת DELETE\n"
 
 #: src/imap.c:686
-#, fuzzy
-msgid "EXAMINE error"
+msgid " EXAMINE error\n"
 msgstr " שגיאת EXAMINE\n"
 
 #: src/imap.c:689
-#, fuzzy
-msgid "FETCH error"
+msgid " FETCH error\n"
 msgstr " שגיאת FETCH\n"
 
 #: src/imap.c:692
-#, fuzzy
-msgid "UID FETCH error"
+msgid " UID FETCH error\n"
 msgstr " שגיאת UID FETCH\n"
 
 #: src/imap.c:695
-#, fuzzy
-msgid "LIST error"
+msgid " LIST error\n"
 msgstr " שגיאת LIST\n"
 
 #: src/imap.c:698
-#, fuzzy
-msgid "LOGIN error"
+msgid " LOGIN error\n"
 msgstr " שגיאת LOGIN\n"
 
 #: src/imap.c:701
-#, fuzzy
-msgid "LSUB error"
+msgid " LSUB error\n"
 msgstr " שגיאת LSUB\n"
 
 #: src/imap.c:704
-#, fuzzy
-msgid "RENAME error"
+msgid " RENAME error\n"
 msgstr " שגיאת RENAME\n"
 
 #: src/imap.c:707
-#, fuzzy
-msgid "SEARCH error"
+msgid " SEARCH error\n"
 msgstr " שגיאת SEARCH\n"
 
 #: src/imap.c:710
-#, fuzzy
-msgid "UID SEARCH error"
+msgid " UID SEARCH error\n"
 msgstr " שגיאת UID SEARCH\n"
 
 #: src/imap.c:713
-#, fuzzy
-msgid "SELECT error"
+msgid " SELECT error\n"
 msgstr " שגיאת SELECT\n"
 
 #: src/imap.c:716
-#, fuzzy
-msgid "STATUS error"
+msgid " STATUS error\n"
 msgstr " שגיאת STATUS\n"
 
 #: src/imap.c:719
-#, fuzzy
-msgid "STORE error"
+msgid " STORE error\n"
 msgstr " שגיאת STORE\n"
 
 #: src/imap.c:722
-#, fuzzy
-msgid "UID STORE error"
+msgid " UID STORE error\n"
 msgstr " שגיאת UID STORE\n"
 
 #: src/imap.c:725
-#, fuzzy
-msgid "SUBSCRIBE error"
+msgid " SUBSCRIBE error\n"
 msgstr " שגיאת SUBSCRIBE\n"
 
 #: src/imap.c:728
-#, fuzzy
-msgid "UNSUBSCRIBE error"
+msgid " UNSUBSCRIBE error\n"
 msgstr " שגיאת UNSUBSCRIBE\n"
 
 #: src/imap.c:731
-#, fuzzy
-msgid "STARTTLS error"
+msgid " STARTTLS error\n"
 msgstr " שגיאת STARTTLS\n"
 
 #: src/imap.c:734
-#, fuzzy
-msgid "INVAL error"
+msgid " INVAL error\n"
 msgstr " שגיאת INVAL\n"
 
 #: src/imap.c:737
-#, fuzzy
-msgid "EXTENSION error"
+msgid " EXTENSION error\n"
 msgstr " שגיאת EXTENSION\n"
 
 #: src/imap.c:740
-#, fuzzy
-msgid "SASL error"
+msgid " SASL error\n"
 msgstr " שגיאת SASL\n"
 
 #: src/imap.c:744
-#, fuzzy
-msgid "SSL error"
+msgid " SSL error\n"
 msgstr " שגיאת SSL\n"
 
 #: src/imap.c:748
-#, fuzzy, c-format
-msgid "Unknown error [%d]"
+#, c-format
+msgid " Unknown error [%d]\n"
 msgstr " שגיאה לא מוכרת [%d]\n"
 
-#: src/imap.c:952
+#: src/imap.c:940
 msgid ""
 "\n"
 "\n"
@@ -5752,7 +5700,7 @@ msgstr ""
 "התחברויות CRAM-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף CRAM-MD5 "
 "SASL הינו מותקן."
 
-#: src/imap.c:958
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5761,10 +5709,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"התחברויות DIGEST-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף DIGEST-"
-"MD5 SASL הינו מותקן."
+"התחברויות DIGEST-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף "
+"DIGEST-MD5 SASL הינו מותקן."
 
-#: src/imap.c:964
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5776,63 +5724,37 @@ msgstr ""
 "התחברויות SCRAM-SHA-1 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף SCRAM "
 "SASL הינו מותקן."
 
-#: src/imap.c:970
-#, 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:976
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"LOGIN logins only work if libetpan has been compiled with SASL support and "
-"the LOGIN SASL plugin is installed."
-msgstr ""
-"\n"
-"\n"
-"התחברויות DIGEST-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף DIGEST-"
-"MD5 SASL הינו מותקן."
-
-#: src/imap.c:983
+#: src/imap.c:959
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "חיבור %s נכשל: התחברות סורבה.%s"
 
-#: src/imap.c:987
+#: src/imap.c:963
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "חיבור %s נכשל: התחברות סורבה.%s\n"
 
-#: src/imap.c:1005
+#: src/imap.c:981
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "התחברות אל %s נכשלה"
 
 # מחדש חיבור כעת
-#: src/imap.c:1012 src/imap.c:1015
+#: 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:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 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:1154 src/inc.c:811 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:1155 src/inc.c:812 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"
@@ -5845,128 +5767,128 @@ msgstr ""
 "\n"
 "האם יש ברצונך להמשיך להתחבר לשרת זה? ההתקשרות לא תהא מאובטחת."
 
-#: src/imap.c:1161 src/inc.c:818 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:1171
+#: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "חשבון '%s': כעת מתחבר לשרת IMAP4: ‏%s:%d..."
 
-#: src/imap.c:1219
+#: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "אין אפשרות לקשר לשרת IMAP4: ‏%s:%d"
 
-#: src/imap.c:1222
+#: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "אין אפשרות לקשר לשרת IMAP4: ‏%s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4110
+#: src/imap.c:1231 src/imap.c:4073
 msgid "Can't start TLS session.\n"
 msgstr "אין אפשרות להתחיל סשן TLS.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "לא היתה אפשרות להתחבר לשרת IMAP ‏%s.\n"
 
-#: src/imap.c:1325
+#: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "לא היתה אפשרות להתחבר לשרת IMAP ‏%s."
 
-#: src/imap.c:1752
+#: src/imap.c:1715
 msgid "Adding messages..."
 msgstr "כעת מוסיף הודעות..."
 
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1920 src/mh.c:532
 msgid "Copying messages..."
 msgstr "כעת מעתיק הודעות..."
 
-#: src/imap.c:2550
+#: src/imap.c:2513
 msgid "can't set deleted flags\n"
 msgstr "אין אפשרות לקבוע דגלים של מחיקה\n"
 
-#: src/imap.c:2557 src/imap.c:5061
+#: src/imap.c:2520 src/imap.c:5028
 msgid "can't expunge\n"
 msgstr "אין אפשרות להסיר באופן מוחלט\n"
 
-#: src/imap.c:2908
+#: src/imap.c:2871
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "כעת מחפש עבור תיקיות לא רשומות אצל %s..."
 
-#: src/imap.c:2911
+#: src/imap.c:2874
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "כעת מחפש עבור תיקיות משנה של %s..."
 
-#: src/imap.c:3229
+#: src/imap.c:3192
 msgid "can't create mailbox: LIST failed\n"
 msgstr "אין אפשרות ליצור תיבת דואר: LIST נכשל\n"
 
-#: src/imap.c:3244
+#: src/imap.c:3207
 msgid "can't create mailbox\n"
 msgstr "אין אפשרות ליצור תיבת דואר\n"
 
-#: src/imap.c:3375
+#: src/imap.c:3338
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "אין אפשרות לשנות תיבת דואר: %s אל %s\n"
 
-#: src/imap.c:3488
+#: src/imap.c:3451
 msgid "can't delete mailbox\n"
 msgstr "אין אפשרות למחוק תיבת דואר\n"
 
-#: src/imap.c:3767
+#: src/imap.c:3730
 msgid "LIST failed\n"
 msgstr "LIST נכשל\n"
 
-#: src/imap.c:3852
+#: src/imap.c:3815
 msgid "Flagging messages..."
 msgstr "כעת מדגל הודעות..."
 
-#: src/imap.c:3955
+#: src/imap.c:3918
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "אין אפשרות לבחור תיקייה: %s\n"
 
-#: src/imap.c:4107
+#: src/imap.c:4070
 msgid "Server requires TLS to log in.\n"
 msgstr "שרת מצריך TLS כדי להתחבר.\n"
 
-#: src/imap.c:4117
+#: src/imap.c:4080
 msgid "Can't refresh capabilities.\n"
 msgstr "אין אפשרות לרענן יכולות.\n"
 
-#: src/imap.c:4122
+#: 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:4130
+#: src/imap.c:4093
 msgid "Server logins are disabled.\n"
 msgstr "התחברויות שרת הינן מנוטרלות.\n"
 
-#: src/imap.c:4353
+#: 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
-#, fuzzy
+#: 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 accounts are disabled.\n"
+"Mail has been built without IMAP support; your IMAP account(s) are "
+"disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
@@ -6013,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 "_בטל הרשמה..."
 
@@ -6034,7 +5956,7 @@ msgstr "_בנה מחדש עץ תיקייה"
 msgid "Show only subscribed _folders"
 msgstr "הצג תיקיות _רשומות בלבד"
 
-#: src/imap_gtk.c:194
+#: src/imap_gtk.c:195
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
@@ -6044,26 +5966,26 @@ msgstr ""
 "(אם ברצונך ליצור תיקייה כדי ליצור תיקיות משנה\n"
 "בלבד וללא דואר, הוסף '/' לשם התיקייה)"
 
-#: src/imap_gtk.c:198 src/mh_gtk.c:147
+#: src/imap_gtk.c:199 src/mh_gtk.c:147
 msgid "Inherit properties from parent folder"
 msgstr "הורש מאפיינים מתוך תיקיית הורה"
 
-#: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:411 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: 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:2035
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "הזן שם חדש עבור '%s':"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:412
-#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: 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:2036
 msgid "Rename folder"
 msgstr "שנה שם תיקייה"
 
-#: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2069
+#: 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:2056
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6071,7 +5993,7 @@ msgstr ""
 "שם תיקייה לא היה ניתן לשינוי.\n"
 "שם תיקייה חדשה אינו מותר."
 
-#: src/imap_gtk.c:357 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:359 src/mh_gtk.c:202 src/plugins/rssyl/rssyl_cb_menu.c:152
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6083,45 +6005,45 @@ msgstr ""
 "\n"
 "האם אתה בטוח כי ברצונך למחוק?"
 
-#: src/imap_gtk.c:376 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
-#: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: 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:1989
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "אין אפשרות להסיר את התיקייה '%s'."
 
 # תחת
-#: src/imap_gtk.c:498
+#: src/imap_gtk.c:506
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "האם ברצונך לחפש עבור תיקיות משנה לא רשומות של '%s'?"
 
-#: src/imap_gtk.c:501
+#: src/imap_gtk.c:509
 msgid "Search recursively"
 msgstr "חפש באופן רקורסיבית"
 
-#: src/imap_gtk.c:506 src/imap_gtk.c:565
+#: src/imap_gtk.c:514 src/imap_gtk.c:573
 msgid "Subscriptions"
 msgstr "הרשמות"
 
-#: src/imap_gtk.c:507
+#: src/imap_gtk.c:515
 msgid "_Search"
 msgstr "_חפש"
 
-#: src/imap_gtk.c:517
+#: src/imap_gtk.c:525
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "בחר תיקיית משנה של %s להירשם אל: "
 
-#: src/imap_gtk.c:528 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:675
 msgid "Subscribe"
 msgstr "הרשמה"
 
-#: src/imap_gtk.c:530 src/imap_gtk.c:532
+#: src/imap_gtk.c:538 src/imap_gtk.c:540
 msgid "All of them"
 msgstr "כולן"
 
-#: src/imap_gtk.c:548
+#: src/imap_gtk.c:556
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6133,29 +6055,29 @@ msgstr ""
 "כאשר קיימות תיקיות חדשות, שנוצרו ונרשמו אל מתוך לקוח אחר, ניתן לעשות שימוש "
 "בפעולה \"בדוק עבור תיקיות חדשות\" בתיקיית השורש של תיבת דואר."
 
-#: src/imap_gtk.c:557
+#: src/imap_gtk.c:565
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "האם ברצונך %s את התיקייה '%s'?"
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:566
 msgid "subscribe"
 msgstr "לירשום"
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:566
 msgid "unsubscribe"
 msgstr "לבטל את רישום"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
+#: 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 "החל על תיקיות משנה"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:574
 msgid "_Subscribe"
 msgstr "_הירשם"
 
-#: src/imap_gtk.c:567 src/news_gtk.c:252
+#: src/imap_gtk.c:575 src/news_gtk.c:267
 msgid "_Unsubscribe"
 msgstr "_בטל הרשמה"
 
@@ -6340,143 +6262,143 @@ msgstr "בחירת קובץ Pine"
 msgid "Import Pine file into Address Book"
 msgstr "ייבוא קובץ Pine לתוך פנקס כתובות"
 
-#: src/inc.c:186 src/inc.c:294 src/inc.c:321
+#: 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:343
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "‏%s נכשלה\n"
 
-#: src/inc.c:416
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "מאחזר כעת הודעות חדשות"
 
-#: src/inc.c:474
+#: src/inc.c:478
 #, fuzzy
 msgid "Standby"
 msgstr "כוננות"
 
-#: src/inc.c:615 src/inc.c:669
+#: src/inc.c:621 src/inc.c:675
 msgid "Cancelled"
 msgstr "בוטלה"
 
-#: src/inc.c:626
+#: src/inc.c:632
 msgid "Retrieving"
 msgstr "אחזור"
 
-#: src/inc.c:635
+#: 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:641
+#: src/inc.c:647
 msgid "Done (no new messages)"
 msgstr "סוים (אין הודעות חדשות)"
 
-#: src/inc.c:646
+#: src/inc.c:652
 msgid "Connection failed"
 msgstr "חיבור נכשל"
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:886
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "אימות נכשל"
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:88 src/summaryview.c:2782 src/summaryview.c:6292
+#: 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:666 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "פקיעת זמן"
 
-#: src/inc.c:752
+#: src/inc.c:759
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "הוגמר (הודעה חדשה %d)"
 msgstr[1] "הוגמר (%d הודעות חדשות)"
 
-#: src/inc.c:756
+#: src/inc.c:763
 msgid "Finished (no new messages)"
 msgstr "הוגמר (אין הודעות חדשות)"
 
-#: src/inc.c:795
+#: src/inc.c:802
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "‏%s: מאחזר כעת הודעות חדשות"
 
-#: src/inc.c:825
+#: src/inc.c:832
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "חשבון '%s': כעת מתחבר לשרת POP3: ‏%s:%d..."
 
-#: src/inc.c:843
+#: src/inc.c:850
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "אין אפשרות להתחבר לשרת POP3: ‏%s:%d"
 
-#: src/inc.c:847
+#: src/inc.c:854
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "אין אפשרות להתחבר לשרת POP3: ‏%s:%d\n"
 
-#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
-#: src/send_message.c:496
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
+#: src/send_message.c:497
 msgid "Authenticating..."
 msgstr "כעת מאמת..."
 
-#: src/inc.c:929
+#: src/inc.c:936
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "כעת מאחזר הודעות מתוך %s ‏(%s)..."
 
-#: src/inc.c:935
+#: src/inc.c:942
 msgid "Getting the number of new messages (STAT)..."
 msgstr "כעת משיג את המספר של הודעות חדשות (STAT)..."
 
-#: src/inc.c:939
+#: src/inc.c:946
 msgid "Getting the number of new messages (LAST)..."
 msgstr "כעת משיג את המספר של הודעות חדשות (LAST)..."
 
-#: src/inc.c:943
+#: src/inc.c:950
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "כעת משיג את המספר של הודעות חדשות (UIDL)..."
 
-#: src/inc.c:947
+#: src/inc.c:954
 msgid "Getting the size of messages (LIST)..."
 msgstr "כעת משיג את הגודל הודעות (LIST)..."
 
-#: src/inc.c:954 src/send_message.c:514
+#: src/inc.c:961 src/send_message.c:515
 msgid "Quitting"
 msgstr "כעת יוצא"
 
-#: src/inc.c:979
+#: src/inc.c:986
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "כעת מאחזר הודעה (%d / %d) ‏(%s / %s)"
 
-#: src/inc.c:992
+#: src/inc.c:999
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "כעת מאחזר (הודעה %d ‏(%s) התקבלה)"
 msgstr[1] "כעת מאחזר (%d הודעות (%s) התקבלו)"
 
-#: src/inc.c:1151
+#: src/inc.c:1158
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "חיבור אל %s:%d נכשל."
 
-#: src/inc.c:1156
+#: src/inc.c:1163
 msgid "Error occurred while processing mail."
 msgstr "אירעה שגיאה במהלך עיבוד דואר."
 
-#: src/inc.c:1162
+#: src/inc.c:1169
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6486,37 +6408,37 @@ msgstr ""
 "%s"
 
 # נותר
-#: src/inc.c:1168
+#: src/inc.c:1175
 msgid "No disk space left."
 msgstr "לא נשאר שטח כונן."
 
-#: src/inc.c:1173
+#: src/inc.c:1180
 msgid "Can't write file."
 msgstr "אין אפשרות לכתוב קובץ."
 
-#: src/inc.c:1178
+#: src/inc.c:1185
 msgid "Socket error."
 msgstr "שגיאת Socket."
 
-#: src/inc.c:1181
+#: src/inc.c:1188
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "שגיאת Socket בעת התחברות אל %s:%d."
 
-#: src/inc.c:1186 src/send_message.c:425 src/send_message.c:688
+#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
 msgid "Connection closed by the remote host."
 msgstr "חיבור נסגר על ידי מארח מרוחק."
 
-#: src/inc.c:1189
+#: src/inc.c:1196
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "חיבור אל %s:%d נסגר על ידי מארח מרוחק."
 
-#: src/inc.c:1194
+#: src/inc.c:1201
 msgid "Mailbox is locked."
 msgstr "תיבת דואר הינה נעולה."
 
-#: src/inc.c:1198
+#: src/inc.c:1205
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6525,11 +6447,11 @@ msgstr ""
 "תיבת דואר הינה נעולה:\n"
 "%s"
 
-#: src/inc.c:1204 src/send_message.c:673
+#: src/inc.c:1211 src/send_message.c:674
 msgid "Authentication failed."
 msgstr "אימות נכשל."
 
-#: src/inc.c:1210 src/send_message.c:676
+#: src/inc.c:1217 src/send_message.c:677
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6539,7 +6461,7 @@ msgstr ""
 "%s"
 
 # הינך עשוי להשיב
-#: src/inc.c:1215 src/send_message.c:692
+#: 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."
@@ -6547,26 +6469,26 @@ msgstr ""
 "זמן סשן פקע. ניתן אולי להשיב על ידי הגברת ערך תפוגת זמן בתוך "
 "העדפות/אחרות/שונות."
 
-#: src/inc.c:1220
+#: src/inc.c:1227
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "זמן התחברות אל %s:%d פקע."
 
-#: src/inc.c:1258
+#: src/inc.c:1265
 msgid "Incorporation cancelled\n"
 msgstr "איחוד בוטל\n"
 
-#: src/inc.c:1523
+#: src/inc.c:1530
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sאתה עובד במצב מקוון. לעקוף למשך %d דקות?"
 
-#: src/inc.c:1529
+#: src/inc.c:1536
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sאתה עובד במצב מקוון. לעקוף?"
 
-#: src/inc.c:1536
+#: src/inc.c:1543
 msgid "On_ly once"
 msgstr "_רק פעם אחת"
 
@@ -6578,7 +6500,7 @@ msgstr "‏SN מסוים"
 msgid "Nick Name"
 msgstr "שם כינוי"
 
-#: src/main.c:244
+#: src/main.c:242
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6588,7 +6510,7 @@ msgstr ""
 "אין אפשרות ליצור תיקייה."
 
 # להגר
-#: src/main.c:365
+#: src/main.c:363
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6597,7 +6519,7 @@ msgstr ""
 "תצורה עבור %s נמצאה.\n"
 "האם ברצונך למזג את תצורה זו?"
 
-#: src/main.c:367
+#: src/main.c:365
 #, c-format
 msgid ""
 "\n"
@@ -6610,11 +6532,11 @@ msgstr ""
 "ניתן להמיר כללי סינון Sylpheed עם\n"
 "תסריט אשר זמין אצל %s."
 
-#: src/main.c:379
+#: src/main.c:377
 msgid "Keep old configuration"
 msgstr "שמור תצורה ישנה"
 
-#: src/main.c:382
+#: src/main.c:380
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6623,31 +6545,31 @@ msgstr ""
 "שמירת גיבוי תתיר לך לחזור לגרסא ישנה יותר, אך זו עשויה לקחת פרק זמן מסוים אם "
 "יש לך IMAP מוטמן או נתונים של News, וייקח מקום נוסף מסוים בכונן שלך."
 
-#: src/main.c:390
+#: src/main.c:388
 msgid "Migration of configuration"
 msgstr "מיזוג של תצורה"
 
-#: src/main.c:401
+#: src/main.c:399
 msgid "Copying configuration... This may take a while..."
 msgstr "כעת מעתיק תצורה... פעולה זו עשויה לקחת זמן מה..."
 
-#: src/main.c:410
+#: src/main.c:408
 msgid "Migration failed!"
 msgstr "מיזוג נכשל!"
 
-#: src/main.c:419
+#: src/main.c:417
 msgid "Migrating configuration..."
 msgstr "כעת מהגר תצורה..."
 
-#: src/main.c:1119
+#: src/main.c:1117
 msgid "g_thread is not supported by glib.\n"
 msgstr "‏g_thread אינו נתמך על ידי glib.\n"
 
-#: src/main.c:1139 src/main.c:1143 src/main.c:1147
+#: src/main.c:1137 src/main.c:1141 src/main.c:1145
 msgid "(or older)"
 msgstr ""
 
-#: src/main.c:1448
+#: src/main.c:1445
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6664,7 +6586,7 @@ msgstr[1] ""
 "התוספות הבאות כשלו מלהיטען. בדוק את תצורת התוספות למידע נוסף:\n"
 "%s"
 
-#: src/main.c:1499
+#: src/main.c:1473
 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 "
@@ -6674,7 +6596,7 @@ msgstr ""
 "IMAP נכשל. השתמש באפשרות \"בנה מחדש עץ תיקייה\" בתפריט ההקשר של תיקיית הורה "
 "בתיבת הדואר כדי לתקנה."
 
-#: src/main.c:1505
+#: src/main.c:1479
 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 "
@@ -6683,37 +6605,37 @@ msgstr ""
 "‏Claws Mail איתר תיבת דואר מוגדרת, אך לא יכל לטעונה. ייתכן כי זו מסופקת על "
 "ידי תוסף חיצוני מיושן. אנא התקן מחדש את התוסף ונסה שוב."
 
-#: src/main.c:1750
+#: src/main.c:1729
 msgid "Missing filename\n"
 msgstr "שם קובץ חסר\n"
 
 # filename or file?
-#: src/main.c:1757
+#: src/main.c:1736
 msgid "Cannot open filename for reading\n"
 msgstr "אין אפשרות לפתוח שם קובץ לקריאה\n"
 
-#: src/main.c:1768
+#: src/main.c:1747
 msgid "Malformed header\n"
 msgstr "תקורה פגומה\n"
 
-#: src/main.c:1775
+#: src/main.c:1754
 msgid "Duplicated 'To:' header\n"
 msgstr "תקורת 'To:' כפולה\n"
 
-#: src/main.c:1786
+#: src/main.c:1765
 msgid "Missing required 'To:' header\n"
 msgstr "תקורת 'To:' נדרשת חסרה\n"
 
-#: src/main.c:1929
+#: src/main.c:1908
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "‭שומיש: %s [תורשפא]...\n"
 
-#: src/main.c:1931
+#: src/main.c:1910
 msgid "  --compose [address]    open composition window"
 msgstr "‭  --compose [תבותכ]      הנחלה ןולח חתפ"
 
-#: src/main.c:1932
+#: src/main.c:1911
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6729,11 +6651,11 @@ msgstr ""
 "‭                         דע (To: שרדנ) שארב תורוקת :טמרופ ןכות\n"
 "‭                         ץבוק ףוס דע ראוד ףוג זא ,הרוש ףוס."
 
-#: src/main.c:1937
+#: src/main.c:1916
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "‭  --subscribe [uri]      ןתינ רשאכ ןותנ URI לא םשריה"
 
-#: src/main.c:1938
+#: src/main.c:1917
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6743,23 +6665,23 @@ msgstr ""
 "‭                         םיניוצמ םיצבק םע הנחלה ןולח חתפ\n"
 "‭                         םיחפוסמ"
 
-#: src/main.c:1941
+#: src/main.c:1920
 msgid "  --receive              receive new messages"
 msgstr "‭  --receive              תושדח תועדוה גשה"
 
-#: src/main.c:1942
+#: src/main.c:1921
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "‭  --receive-all          תונובשחה לכמ תושדח תועדוה גשה"
 
-#: src/main.c:1943
+#: src/main.c:1922
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "‭  --cancel-receiving     תועדוה תלבק לטב"
 
-#: src/main.c:1944
+#: src/main.c:1923
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "‭  --cancel-sending       תועדוה תחילש לטב"
 
-#: src/main.c:1945
+#: src/main.c:1924
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6770,15 +6692,15 @@ msgid ""
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:1931
 msgid "  --send                 send all queued messages"
 msgstr "‭  --send                 תודמועו תיולתה תועדוהה לכ תא חלש"
 
-#: src/main.c:1953
+#: src/main.c:1932
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "‭  --status [הייקית]...   תועדוהה לכ לש ללוכה רפסמה תא גצה"
 
-#: src/main.c:1954
+#: src/main.c:1933
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6786,15 +6708,15 @@ msgstr ""
 "‭  --status-full [הייקית]...\n"
 "‭                         הייקית לכ לש סוטטסה תא גצה"
 
-#: src/main.c:1956
+#: src/main.c:1935
 msgid "  --statistics           show session statistics"
 msgstr "‭  --statistics           ןשס תוקיטסיטטס גצה"
 
-#: src/main.c:1957
+#: src/main.c:1936
 msgid "  --reset-statistics     reset session statistics"
 msgstr "‭  --reset-statistics     ןשס תוקיטסיטטס ספא"
 
-#: src/main.c:1958
+#: src/main.c:1937
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6802,45 +6724,45 @@ msgstr ""
 "‭  --select הייקית[/עדה]  תנייוצמ הייקית/העדוה לא ץופק\n"
 "‭                         'folder/sub_folder' ומכ הייקית לש id איה הייקית"
 
-#: src/main.c:1960
+#: src/main.c:1939
 msgid "  --online               switch to online mode"
 msgstr "‭  --online               ןווקמ בצמל ףלחה"
 
-#: src/main.c:1961
+#: src/main.c:1940
 msgid "  --offline              switch to offline mode"
 msgstr "‭  --offline              ןווקמ אל בצמל ףלחה"
 
-#: src/main.c:1962
+#: src/main.c:1941
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "‭  --exit --quit -q       Claws Mail ךותמ אצ"
 
-#: src/main.c:1963
+#: src/main.c:1942
 msgid "  --debug                debug mode"
 msgstr "‭  --debug                גאביד בצמ"
 
-#: src/main.c:1964
+#: src/main.c:1943
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "‭  --toggle-debug         גאביד בצמ ףלחה"
 
-#: src/main.c:1965
+#: src/main.c:1944
 msgid "  --help -h              display this help and exit"
 msgstr "‭  --help -h              אצו וז הרזע תא ספדה"
 
-#: src/main.c:1966
+#: src/main.c:1945
 msgid "  --version -v           output version information and exit"
 msgstr "‭  --version -v           אצו אסריג עדימ טולפ"
 
-#: src/main.c:1967
+#: src/main.c:1946
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
 msgstr "‭  --version-full -V      אצו built-in תונוכתו אסרג עדימ טולפ"
 
-#: src/main.c:1968
+#: src/main.c:1947
 msgid "  --config-dir           output configuration directory"
 msgstr "‭  --config-dir           הרוצת תיירפס טולפ"
 
-#: src/main.c:1969
+#: src/main.c:1948
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6848,868 +6770,856 @@ msgstr ""
 "‭  --alternate-config-dir [רודמ]\n"
 "‭                         תנייוצמ הרוצת תיירפסב שמתשה"
 
-#: src/main.c:1971
-msgid ""
-"  --geometry -geometry WxH+X+Y\n"
-"                         set geometry for main window"
-msgstr ""
-
-#: src/main.c:2024
+#: src/main.c:1998
 msgid "Unknown option\n"
 msgstr "אפשרות לא מוכרת\n"
 
-#: src/main.c:2042
+#: src/main.c:2016
 #, c-format
 msgid "Processing (%s)..."
 msgstr "כעת מעבד (%s)..."
 
-#: src/main.c:2045
+#: src/main.c:2019
 msgid "top level folder"
 msgstr "תיקייה עילית"
 
-#: src/main.c:2128
+#: src/main.c:2102
 msgid "Queued messages"
 msgstr "הודעות בהמתנה"
 
-#: src/main.c:2129
+#: src/main.c:2103
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "הודעות מסוימות שלא נשלחו מצויות בהמתנה בתור. לצאת עכשיו?"
 
-#: src/main.c:2871
+#: src/main.c:2845
 msgid "NetworkManager: network is online.\n"
 msgstr "‏NetworkManager: רשת תקשורת הינה מקוונות.\n"
 
-#: src/main.c:2877
+#: src/main.c:2851
 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
-#, fuzzy
-msgid "F_older..."
-msgstr "תיקייה"
+#: 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 passphrase"
-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:6218
+#: 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/plugins/notification/notification_trayicon.c:372
+#: 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"
@@ -7719,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 "
@@ -7740,81 +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:548
+#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
 msgid "Exit"
 msgstr "יציאה"
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:548
+#: 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:4982 src/summaryview.c:5709
+#: src/mainwindow.c:4968 src/summaryview.c:5759
 msgid "Processing rules to apply before folder rules"
 msgstr "כללי עיבוד להחלה לפני כללי תיקייה"
 
-#: src/mainwindow.c:4990
+#: src/mainwindow.c:4976
 msgid "Processing rules to apply after folder rules"
 msgstr "כללי עיבוד להחלה עובר כללי תיקייה"
 
-#: src/mainwindow.c:4998 src/summaryview.c:5720
+#: src/mainwindow.c:4984 src/summaryview.c:5770
 msgid "Filtering configuration"
 msgstr "תצורת סינון"
 
-#: src/mainwindow.c:5113
+#: src/mainwindow.c:5099
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "אין אפשרות להירשם בתור לקוח ברירת מחדל: בלתי אפשרי להשיג נתיב נתון ליישום."
 
-#: src/mainwindow.c:5172
+#: src/mainwindow.c:5158
 msgid "Claws Mail has been registered as default client."
 msgstr "‏Claws Mail נרשם בתור לקוח ברירת מחדל."
 
-#: src/mainwindow.c:5174
+#: src/mainwindow.c:5160
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr "אין אפשרות להירשם בתור לקוח ברירת מחדל: בלתי אפשרי לרשום אל registry."
 
-#: src/mainwindow.c:5188 src/setup.c:91
-#, c-format
-msgid "Scanning folder %s%c%s..."
-msgstr "כעת סורק תיקייה %s%c%s..."
-
-#: src/mainwindow.c:5332
+#: src/mainwindow.c:5318
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7895,7 +7800,7 @@ msgstr "כתיבה על קובץ mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "קובץ זה כבר ישנו. האם ברצונך להחליפו?"
 
-#: src/mbox.c:555 src/messageview.c:1855 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 "כתיבה על הכתוב"
@@ -7941,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:1446 src/messageview.c:1597
+#: 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"
@@ -7968,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"
@@ -7984,64 +7889,64 @@ msgstr ""
 "מוּענה אליך באופן רשמי.\n"
 "מוטב שלא לשלוח אישור מסירה."
 
-#: src/messageview.c:1376
+#: src/messageview.c:1323
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "כעת מושך הודעה (%s)..."
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1359 src/procmime.c:1007
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "לא היתה אפשרות לפענח צופן: %s"
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: 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:1847 src/messageview.c:1850 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
-#: src/summaryview.c:4814 src/textview.c:3063
+#: 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:1856
+#: src/messageview.c:1849
 msgid "Overwrite existing file?"
 msgstr "להחליף קובץ קיים?"
 
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
-#: src/summaryview.c:4849
+#: 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:1917
+#: src/messageview.c:1910
 #, c-format
 msgid "Show all %s."
 msgstr "הצג %s נותרים."
 
-#: src/messageview.c:1919
+#: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
 msgstr "רק המגה בייט הראשון של טקסט הינו מוצג."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1943
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "קיבלת קבלת מסירה עבור הודעה זו : זו הוצגה על ידי הנמען."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
 msgstr "ביקשת קבלת מסירה בהודעה זו."
 
-#: src/messageview.c:1959
+#: src/messageview.c:1952
 msgid "This message asks for a return receipt."
 msgstr "הודעה זו מבקשת קבלת מסירה."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1953
 msgid "Send receipt"
 msgstr "שלח קבלה"
 
-#: src/messageview.c:2003
+#: src/messageview.c:1996
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8049,7 +7954,7 @@ msgstr ""
 "הודעה זו אוחזרה באופן חלקי,\n"
 "ונמחקה מתוך השרת."
 
-#: src/messageview.c:2009
+#: src/messageview.c:2002
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8058,15 +7963,15 @@ msgstr ""
 "הודעה זו אוחזרה באופן חלקי;\n"
 "זו כעת %s."
 
-#: src/messageview.c:2013 src/messageview.c:2035
+#: src/messageview.c:2006 src/messageview.c:2028
 msgid "Mark for download"
 msgstr "סמן להורדה"
 
-#: src/messageview.c:2014 src/messageview.c:2026
+#: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
 msgstr "סמן למחיקה"
 
-#: src/messageview.c:2019
+#: src/messageview.c:2012
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8075,12 +7980,12 @@ msgstr ""
 "הודעה זו אוחזרה באופן חלקי;\n"
 "זו כעת %s ותורד בעתיד."
 
-#: src/messageview.c:2024 src/messageview.c:2037
+#: src/messageview.c:2017 src/messageview.c:2030
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "אי סימון"
 
-#: src/messageview.c:2030
+#: src/messageview.c:2023
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8090,12 +7995,12 @@ msgstr ""
 "זו כעת %s ותימחק בעתיד."
 
 # התראת קבלת מסירה
-#: src/messageview.c:2103
+#: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "שלח אישור מסירה"
 
 # ההודעה נשלחה למספר חשבונות אשר מצויים ברשותך
-#: src/messageview.c:2104
+#: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8105,19 +8010,19 @@ msgstr ""
 "הכתובת אשר אליה נשלחה הודעה זו מצויה בשימוש על ידי כמה מחשבונותיך.\n"
 "אנא בחר באיזה חשבון ברצונך להשתמש לצורך שליחת התראת אישור מסירה:"
 
-#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: src/messageview.c:2108
+#: src/messageview.c:2101
 msgid "_Send Notification"
 msgstr "_שלח התראה"
 
-#: src/messageview.c:2197
+#: src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "אין אפשרות להדפיס: ההודעה לא מכילה טקסט."
 
-#: src/messageview.c:2959
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8125,7 +8030,7 @@ msgstr ""
 "\n"
 "  אין הודעות בתיקייה זו"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2960
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8133,7 +8038,7 @@ msgstr ""
 "\n"
 "  הודעה נמחקה"
 
-#: src/messageview.c:2968
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8141,16 +8046,16 @@ msgstr ""
 "\n"
 "  הודעה נמחקה או הועברה לתיקייה אחרת"
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
-#: src/summaryview.c:6987
+#: 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 "כעת מוחק הודעות..."
 
@@ -8158,7 +8063,7 @@ msgstr "כעת מוחק הודעות..."
 msgid "Remove _mailbox..."
 msgstr "הסר _תיבת דואר..."
 
-#: src/mh_gtk.c:222
+#: src/mh_gtk.c:223
 #, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -8170,7 +8075,7 @@ msgstr ""
 "%s."
 
 # לא יימחקו
-#: src/mh_gtk.c:364 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:365 src/plugins/mailmbox/plugin_gtk.c:298
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8179,7 +8084,7 @@ msgstr ""
 "באמת להסיר את תיבת הדואר '%s'?\n"
 "(ההודעות אינן נמחקות מתוך הכונן)"
 
-#: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr "הסרת תיבת דואר"
 
@@ -8251,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"
@@ -8321,7 +8226,7 @@ msgid "Type:"
 msgstr "טיפוס:"
 
 #: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:700 src/summaryview.c:2676
+#: src/plugins/pdf_viewer/poppler_viewer.c:700 src/summaryview.c:2695
 msgid "Size:"
 msgstr "גודל:"
 
@@ -8331,82 +8236,82 @@ 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
-#, fuzzy
+#: 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 accounts are disabled.\n"
+"Mail has been built without News support; your News account(s) are "
+"disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
@@ -8423,64 +8328,19 @@ msgstr "_הירשם לקבוצת דיון..."
 msgid "_Unsubscribe newsgroup"
 msgstr "_בטל הרשמת קבוצת דיון"
 
-#: src/news_gtk.c:250
+#: src/news_gtk.c:265
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "באמת לבטל הרשמה לקבוצת דיונים '%s'?"
 
-#: src/news_gtk.c:251
+#: src/news_gtk.c:266
 msgid "Unsubscribe newsgroup"
 msgstr "ביטול הרשמה לקבוצת דיונים"
 
-#: src/news_gtk.c:291
+#: src/news_gtk.c:306
 msgid "Rename newsgroup folder"
 msgstr "שנה שם תיקיית קבוצת דיונים"
 
-# אחוז
-#: src/password.c:128 src/password.c:129
-#, fuzzy
-msgid "Input master passphrase"
-msgstr "תפוס פלט במהלך הזנת מימרת־סיסמה"
-
-#: src/password.c:141
-#, fuzzy
-msgid "Incorrect master passphrase."
-msgstr "אזור שגוי"
-
-#: src/password_gtk.c:67
-#, fuzzy
-msgid "New passphrases do not match, try again."
-msgstr "מימרות סיסמה לא תאמו.\n"
-
-#: src/password_gtk.c:80
-msgid "Incorrect old master passphrase entered, try again."
-msgstr ""
-
-#: src/password_gtk.c:144
-msgid "Changing master passphrase"
-msgstr ""
-
-#: src/password_gtk.c:165
-msgid ""
-"If a master passphrase is currently active, it\n"
-"needs to be entered."
-msgstr ""
-
-#: src/password_gtk.c:175
-#, fuzzy
-msgid "Old passphrase:"
-msgstr "מימרת־סיסמה רעה.\n"
-
-#: src/password_gtk.c:191
-#, fuzzy
-msgid "New passphrase:"
-msgstr "מימרת סיסמה"
-
-#: src/password_gtk.c:202
-#, fuzzy
-msgid "Confirm passphrase:"
-msgstr "מימרת־סיסמה רעה.\n"
-
 #: src/plugins/acpi_notifier/acpi_notifier.c:51
 msgid "Acpi Notifier"
 msgstr "מתריע Acpi"
@@ -8892,7 +8752,7 @@ msgstr "מיקום ושם ארכיון"
 
 #: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/archive/archiver_prefs.c:194
-#: src/plugins/pgpcore/select-keys.c:421
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_בחר"
 
@@ -9089,12 +8949,12 @@ msgid "Remove attachments"
 msgstr "הסר תצריפים"
 
 #: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:944
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:945
 msgid "Remove"
 msgstr "הסר"
 
 #: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:80 src/summaryview.c:2770
+#: src/prefs_summary_column.c:80 src/summaryview.c:2789
 msgid "Attachment"
 msgstr "תצריף"
 
@@ -9258,8 +9118,8 @@ msgid ""
 msgstr ""
 "התוסף Bogofilter לא יכל לסנן הודעה. הגורם המסתבר של השגיאה הוא שזה לא למד "
 "מאף דואר.\n"
-"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור לגיטימית"
-"\" בכדי לאמן את Bogofilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
+"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור "
+"לגיטימית\" בכדי לאמן את Bogofilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
 
 #: src/plugins/bogofilter/bogofilter.c:619
 #, c-format
@@ -9274,7 +9134,7 @@ msgid "Bogofilter: learning from message..."
 msgstr "‏Bogofilter: כעת לומד מתוך הודעה..."
 
 #: src/plugins/bogofilter/bogofilter.c:779
-#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:513
+#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:511
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "למידה מכשלה; `%s` הוחזרה עם מצב %d."
@@ -9321,12 +9181,12 @@ msgstr ""
 "\n"
 "ניתן למצוא אפשרויות בתוך /תצורה/העדפות/תוספים/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
+#: 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:677
+#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "למידת ספאם"
@@ -9351,7 +9211,7 @@ msgstr "הודעות שגדולות יותר מזה לא יבדקו"
 
 #: 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:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1507
 msgid "KB"
 msgstr "ק״ב"
 
@@ -9460,16 +9320,16 @@ msgid "Bsfilter"
 msgstr "‏Bsfilter"
 
 # What are bodies?
-#: src/plugins/bsfilter/bsfilter.c:300
+#: src/plugins/bsfilter/bsfilter.c:299
 msgid "Bsfilter: fetching body..."
 msgstr "‏Bsfilter: כעת מושך גופים..."
 
-#: src/plugins/bsfilter/bsfilter.c:309
+#: src/plugins/bsfilter/bsfilter.c:308
 msgid "Bsfilter: filtering message..."
 msgstr "‏Bsfilter: כעת מסנן הודעות..."
 
 # משום דואר
-#: src/plugins/bsfilter/bsfilter.c:394
+#: src/plugins/bsfilter/bsfilter.c:393
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9478,23 +9338,23 @@ msgid ""
 msgstr ""
 "התוסף Bsfilter לא יכל לסנן הודעה. הגורם המסתבר של השגיאה הוא שזה לא למד מאף "
 "דואר.\n"
-"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור לגיטימית"
-"\" בכדי לאמן את Bsfilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
+"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור "
+"לגיטימית\" בכדי לאמן את Bsfilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
 
-#: src/plugins/bsfilter/bsfilter.c:401
+#: src/plugins/bsfilter/bsfilter.c:400
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr "התוסף Bsfilter לא יכל לסנן הודעה. הפקודה `%s` לא היתה ניתנת להרצה."
 
-#: src/plugins/bsfilter/bsfilter.c:502
+#: src/plugins/bsfilter/bsfilter.c:501
 msgid "Bsfilter: learning from message..."
 msgstr "‏Bsfilter: כעת לומד מתוך הודעה..."
 
 # בטרם Bogofilter יוכל
 # התווית כמה מאות
-#: src/plugins/bsfilter/bsfilter.c:643
+#: src/plugins/bsfilter/bsfilter.c:641
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -9916,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:1442 src/prefs_account.c:1531 src/prefs_account.c:2002
+#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "   _עיון   "
@@ -9925,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
@@ -10105,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"
@@ -10126,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"
@@ -10157,99 +10017,99 @@ 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:560
+#: 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:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "אימות"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
+#: src/plugins/gdata/cm_gdata_prefs.c:83
+#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
 msgid "Username:"
 msgstr "שם משתמש:"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:95
+#: src/plugins/gdata/cm_gdata_prefs.c:94
 msgid "Polling interval (seconds):"
 msgstr "תדירות קבלה (שניות):"
 
 # תנובות
-#: src/plugins/gdata/cm_gdata_prefs.c:102
+#: src/plugins/gdata/cm_gdata_prefs.c:101
 msgid "Maximum number of results:"
 msgstr "מספר מרבי של תוצאות:"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:138 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
+#: src/plugins/gdata/cm_gdata_prefs.c:137 src/plugins/gdata/gdata_plugin.c:101
+#: src/plugins/gdata/gdata_plugin.c:156
 msgid "GData"
 msgstr "‏GData"
 
-#: src/plugins/gdata/gdata_plugin.c:108
+#: src/plugins/gdata/gdata_plugin.c:107
 msgid "Failed to register address completion hook in the GData plugin"
 msgstr "כשל ברישום hook השלמת כתובת בתוסף GData"
 
-#: src/plugins/gdata/gdata_plugin.c:115
+#: src/plugins/gdata/gdata_plugin.c:114
 msgid "Failed to register offline switch hook in the GData plugin"
 msgstr "כשל ברישום hook מתג לא־מקוון בתוסף GData"
 
-#: src/plugins/gdata/gdata_plugin.c:170
+#: src/plugins/gdata/gdata_plugin.c:161
 msgid ""
 "This plugin provides access to the GData protocol for Claws Mail.\n"
 "\n"
@@ -10268,7 +10128,7 @@ msgstr ""
 "משוב לכבוד <berndth at gmx.de> מקודם בברכה."
 
 # אינטגרציית GeoLocation
-#: src/plugins/gdata/gdata_plugin.c:196
+#: src/plugins/gdata/gdata_plugin.c:187
 msgid "GData integration"
 msgstr "שילוב GData"
 
@@ -10396,8 +10256,8 @@ msgstr "שמור סמלים בכונן לצורך שימוש חוזר במקום
 msgid "Cache refresh interval"
 msgstr "תדירות רענון מטמון"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1487
-#: src/prefs_matcher.c:336 src/prefs_receive.c:177
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1486
+#: src/prefs_matcher.c:336
 msgid "hours"
 msgstr "שעות"
 
@@ -10487,6 +10347,11 @@ msgid "Request timeout"
 msgstr "פקיעת זמן בקשה"
 
 #: 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:557
+#: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr "שניות"
 
@@ -10531,68 +10396,68 @@ msgstr ""
 "תיסרק באופן אוטומטי."
 
 #: src/plugins/mailmbox/plugin_gtk.c:330
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"All folders and messages under '%s' will be deleted.\n"
+"All folder(s) and message(s) under '%s' will be deleted.\n"
 "Do you really want to delete?"
 msgstr ""
 "כל תיקייה וכל הודעה תחת '%s' תימחק.\n"
 "האם אתה בטוח כי ברצונך למחוק?"
 
-#: src/plugins/managesieve/managesieve.c:435
+#: src/plugins/managesieve/managesieve.c:439
 msgid "No Sieve auth method available\n"
 msgstr "אין שיטת אימות Sieve זמינה\n"
 
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:443
 msgid "Selected Sieve auth method not available\n"
 msgstr "שיטת אימות Sieve נבחרת לא זמינה\n"
 
-#: src/plugins/managesieve/managesieve.c:672
+#: src/plugins/managesieve/managesieve.c:676
 msgid "Disconnected"
 msgstr "מנותק"
 
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:680
 #, c-format
 msgid "Disconnected: %s"
 msgstr "מנותק: %s"
 
-#: src/plugins/managesieve/managesieve.c:724
-#: src/plugins/managesieve/managesieve.c:869
+#: src/plugins/managesieve/managesieve.c:728
+#: src/plugins/managesieve/managesieve.c:873
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "הודעה שלא טופלה בסשן Sieve: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:731
+#: src/plugins/managesieve/managesieve.c:735
 msgid "TLS failed"
 msgstr "‏TLS נכשל"
 
-#: src/plugins/managesieve/managesieve.c:796
-#: src/plugins/managesieve/managesieve.c:812
-#: src/plugins/managesieve/managesieve.c:839
-#: src/plugins/managesieve/managesieve.c:921
-#: src/plugins/managesieve/managesieve.c:939
+#: 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 "אירעה שגיאה בסשן SIEVE\n"
 
-#: src/plugins/managesieve/managesieve.c:865
+#: src/plugins/managesieve/managesieve.c:869
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "אירעה שגיאה בסשן Sieve. מידע: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:874
+#: src/plugins/managesieve/managesieve.c:878
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "הודעה שלא טופלה בסשן Sieve: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1131
+#: src/plugins/managesieve/managesieve.c:1135
 msgid "Sieve: retrying auth\n"
 msgstr "‏Sieve: כעת מנסה auth\n"
 
-#: src/plugins/managesieve/managesieve.c:1133
+#: src/plugins/managesieve/managesieve.c:1137
 msgid "Auth method not available"
 msgstr "שיטת אימות לא זמינה"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5607
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5657
 msgid "_Filter"
 msgstr "_סנן"
 
@@ -10649,7 +10514,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - מסנן Sieve %s"
 
 #: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1275
+#: src/plugins/pdf_viewer/poppler_viewer.c:1278
 msgid "Loading..."
 msgstr "כעת טוען..."
 
@@ -10717,94 +10582,94 @@ msgstr "נהל מסנני Sieve..."
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr "נהל מסנני sieve בשרת באמצעות פרוטוקול ManageSieve."
 
-#: src/plugins/managesieve/sieve_prefs.c:149
+#: src/plugins/managesieve/sieve_prefs.c:146
 msgid "Enable Sieve"
 msgstr "אפשר Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1090
+#: src/plugins/managesieve/sieve_prefs.c:153 src/prefs_account.c:1095
 msgid "Server information"
 msgstr "מידע שרת"
 
-#: src/plugins/managesieve/sieve_prefs.c:165
+#: src/plugins/managesieve/sieve_prefs.c:162
 msgid "Server name"
 msgstr "שם שרת"
 
-#: src/plugins/managesieve/sieve_prefs.c:174
+#: src/plugins/managesieve/sieve_prefs.c:171
 msgid "Connect to this host instead of the host used for receiving mail"
 msgstr "התחבר למאחר זה במקום למארח שבשימוש לצורך קבלת דואר"
 
-#: src/plugins/managesieve/sieve_prefs.c:178
+#: src/plugins/managesieve/sieve_prefs.c:175
 msgid "Server port"
 msgstr "פורט של"
 
-#: src/plugins/managesieve/sieve_prefs.c:185
+#: src/plugins/managesieve/sieve_prefs.c:182
 msgid "Connect to this port instead of the default"
 msgstr "התחבר לפורט זה במקום לברירת מחדל"
 
-#: src/plugins/managesieve/sieve_prefs.c:189
+#: src/plugins/managesieve/sieve_prefs.c:186
 msgid "Encryption"
 msgstr "הצפנה"
 
-#: src/plugins/managesieve/sieve_prefs.c:194
+#: src/plugins/managesieve/sieve_prefs.c:191
 msgid "No TLS"
 msgstr "אין TLS"
 
-#: src/plugins/managesieve/sieve_prefs.c:196
+#: src/plugins/managesieve/sieve_prefs.c:193
 msgid "Use TLS when available"
 msgstr "השתמש בהצפנת TLS כאשר זמינה"
 
-#: src/plugins/managesieve/sieve_prefs.c:198
+#: src/plugins/managesieve/sieve_prefs.c:195
 msgid "Require TLS"
 msgstr "דרוש TLS"
 
-#: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:264
+#: src/plugins/managesieve/sieve_prefs.c:203
+#: src/plugins/rssyl/rssyl_feed_props.c:267
 msgid "No authentication"
 msgstr "אין אימות"
 
-#: src/plugins/managesieve/sieve_prefs.c:208
+#: src/plugins/managesieve/sieve_prefs.c:205
 msgid "Use same authentication as for receiving mail"
 msgstr "השתמש באותו אימות אשר משמש לצורך קבלת דואר"
 
-#: src/plugins/managesieve/sieve_prefs.c:210
+#: src/plugins/managesieve/sieve_prefs.c:207
 msgid "Specify authentication"
 msgstr "ציין אימות"
 
-#: src/plugins/managesieve/sieve_prefs.c:240
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
-#: src/prefs_account.c:1795
+#: src/plugins/managesieve/sieve_prefs.c:237
+#: 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:250
-#: src/plugins/rssyl/rssyl_feed_props.c:395
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
-#: src/prefs_account.c:1815 src/prefs_account.c:2529 src/prefs_account.c:2551
-#: src/wizard.c:1215 src/wizard.c:1635
+#: src/plugins/managesieve/sieve_prefs.c:247
+#: src/plugins/rssyl/rssyl_feed_props.c:394
+#: 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:266 src/prefs_account.c:1570
-#: src/prefs_account.c:1767
+#: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
 msgid "Authentication method"
 msgstr "שיטת אימות"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1580
-#: src/prefs_account.c:1776 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
 msgid "Automatic"
 msgstr "אוטומטית"
 
-#: src/plugins/managesieve/sieve_prefs.c:391
+#: src/plugins/managesieve/sieve_prefs.c:379
 msgid "Sieve server must not contain a space."
 msgstr "אסור לשרת Sieve להכיל רווחים."
 
-#: src/plugins/managesieve/sieve_prefs.c:397
+#: src/plugins/managesieve/sieve_prefs.c:385
 msgid "Sieve server is not entered."
 msgstr "שרת Sieve אינו מוזן."
 
-#: src/plugins/managesieve/sieve_prefs.c:425
+#: src/plugins/managesieve/sieve_prefs.c:413
 #, fuzzy
 msgid "Sieve"
 msgstr "Sieve"
@@ -10943,7 +10808,7 @@ msgid "New Calendar message"
 msgstr "הודעת לוח שנה חדשה"
 
 #: src/plugins/notification/notification_popup.c:340
-#: src/plugins/notification/notification_trayicon.c:905
+#: src/plugins/notification/notification_trayicon.c:866
 msgid "A new calendar message arrived"
 msgstr "הודעת לוח שנה חדשה הגיעה"
 
@@ -10952,7 +10817,7 @@ msgid "New RSS feed article"
 msgstr "מאמר ערוץ RSS חדש"
 
 #: src/plugins/notification/notification_popup.c:344
-#: src/plugins/notification/notification_trayicon.c:908
+#: src/plugins/notification/notification_trayicon.c:869
 msgid "A new article in a RSS feed arrived"
 msgstr "מאמר חדש בתוך ערוץ RSS הגיעה"
 
@@ -10965,7 +10830,7 @@ msgid "Unknown message type arrived"
 msgstr "הודעה מטיפוס לא מוכר הגיעה"
 
 #: src/plugins/notification/notification_popup.c:381
-#: src/plugins/notification/notification_trayicon.c:677
+#: src/plugins/notification/notification_trayicon.c:638
 msgid "Present main window"
 msgstr "הצג חלון ראשי"
 
@@ -10990,7 +10855,7 @@ msgid "Calendar message"
 msgstr "הודעת לוח שנה"
 
 #: src/plugins/notification/notification_popup.c:504
-#: src/plugins/notification/notification_trayicon.c:942
+#: src/plugins/notification/notification_trayicon.c:903
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
@@ -11028,7 +10893,7 @@ msgid "Popup"
 msgstr "תיבה מוקפצת"
 
 #: src/plugins/notification/notification_prefs.c:471 src/prefs_actions.c:263
-#: src/prefs_receive.c:152
+#: src/prefs_receive.c:133
 msgid "Command"
 msgstr "פקודה"
 
@@ -11089,12 +10954,12 @@ msgid "Show banner"
 msgstr "הצג כרזה"
 
 #: src/plugins/notification/notification_prefs.c:767
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:231 src/prefs_summaries.c:504
+#: 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 "אף פעם"
 
-#: src/plugins/notification/notification_prefs.c:769 src/prefs_receive.c:229
+#: 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 "תמיד"
@@ -11123,7 +10988,8 @@ msgstr "רוחב כרזה"
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr "הגבל גודל כרזה, השתמש בערך 0 לרוחב מסך"
 
-#: src/plugins/notification/notification_prefs.c:850
+#: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
+#: src/prefs_message.c:223
 msgid "pixel(s)"
 msgstr "פיקסל(ים)"
 
@@ -11190,14 +11056,6 @@ msgstr "אפשר תיבה מוקפצת"
 msgid "Popup timeout"
 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/prefs_receive.c:203 src/prefs_summaries.c:538
-msgid "seconds"
-msgstr "שניות"
-
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
 msgstr "הפוך תיבה מוקפצת לדביקה"
@@ -11309,79 +11167,74 @@ msgstr "<alt>N"
 msgid "Toggle minimize"
 msgstr "מודגש"
 
-#: src/plugins/notification/notification_trayicon.c:121
+#: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
 msgstr "_השג דואר"
 
-#: src/plugins/notification/notification_trayicon.c:122
-#, fuzzy
-msgid "_Get Mail from account"
-msgstr "דו_א״ל מתוך חשבון"
-
-#: src/plugins/notification/notification_trayicon.c:124
+#: src/plugins/notification/notification_trayicon.c:116
 msgid "_Email"
 msgstr "_דוא״ל"
 
-#: src/plugins/notification/notification_trayicon.c:125
+#: src/plugins/notification/notification_trayicon.c:117
 msgid "E_mail from account"
 msgstr "דו_א״ל מתוך חשבון"
 
-#: src/plugins/notification/notification_trayicon.c:126
+#: src/plugins/notification/notification_trayicon.c:118
 msgid "Open A_ddressbook"
 msgstr "פתח פנקס כ_תובות"
 
-#: src/plugins/notification/notification_trayicon.c:127
+#: src/plugins/notification/notification_trayicon.c:119
 msgid "E_xit Claws Mail"
 msgstr "_צא מתוך Claws Mail"
 
-#: src/plugins/notification/notification_trayicon.c:132
+#: src/plugins/notification/notification_trayicon.c:124
 msgid "_Work Offline"
 msgstr "_עבוד לא־מקוון"
 
-#: src/plugins/notification/notification_trayicon.c:134
+#: src/plugins/notification/notification_trayicon.c:126
 msgid "Show Trayicon Notifications"
 msgstr "הצג התראות סמל מגש"
 
-#: src/plugins/notification/notification_trayicon.c:277
+#: src/plugins/notification/notification_trayicon.c:269
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "חדשות %d, לא נקראו: %d, סך הכל: %d"
 
-#: src/plugins/notification/notification_trayicon.c:855
+#: src/plugins/notification/notification_trayicon.c:816
 msgid "New mail message"
 msgstr "הודעת דואר חדשה"
 
-#: src/plugins/notification/notification_trayicon.c:857
+#: src/plugins/notification/notification_trayicon.c:818
 msgid "New news post"
 msgstr "פרסום חדשות חדש"
 
-#: src/plugins/notification/notification_trayicon.c:859
+#: src/plugins/notification/notification_trayicon.c:820
 msgid "New calendar message"
 msgstr "הודעת לוח שנה חדשה"
 
-#: src/plugins/notification/notification_trayicon.c:861
+#: src/plugins/notification/notification_trayicon.c:822
 msgid "New article in RSS feed"
 msgstr "פריט חדש בתוך ערוץ RSS"
 
-#: src/plugins/notification/notification_trayicon.c:864
+#: src/plugins/notification/notification_trayicon.c:825
 msgid "New messages arrived"
 msgstr "הודעות חדשות הגיעו"
 
-#: src/plugins/notification/notification_trayicon.c:920
+#: src/plugins/notification/notification_trayicon.c:881
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
 msgstr[0] "הודעת דואר חדשה %d הגיעה"
 msgstr[1] "%d הודעות דואר חדשות הגיעו"
 
-#: src/plugins/notification/notification_trayicon.c:931
+#: src/plugins/notification/notification_trayicon.c:892
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
 msgstr[0] "פרסום חדשות חדש %d הגיע"
 msgstr[1] "%d פרסומי חדשות חדשות הגיעו"
 
-#: src/plugins/notification/notification_trayicon.c:953
+#: 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"
@@ -11425,88 +11278,88 @@ msgstr "מיועל:"
 msgid "PDF properties"
 msgstr "מאפייני PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1326
+#: src/plugins/pdf_viewer/poppler_viewer.c:1329
 msgid "Enter password"
 msgstr "הזן סיסמה"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1327
+#: src/plugins/pdf_viewer/poppler_viewer.c:1330
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr "מסמך זה הינו נעול ומצריך סיסמה בטרם זה יוכל להיפתח."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1342
+#: src/plugins/pdf_viewer/poppler_viewer.c:1345
 #, c-format
 msgid "%s Document"
 msgstr "%s מסמך"
 
 # typo: out of
-#: src/plugins/pdf_viewer/poppler_viewer.c:1348
+#: src/plugins/pdf_viewer/poppler_viewer.c:1351
 #, c-format
 msgid "of %d"
 msgstr "מתוך %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1364
+#: src/plugins/pdf_viewer/poppler_viewer.c:1368
 msgid "PDF rendering failed for an unknown reason."
 msgstr "שרטוט PDF נכשל משום סיבה לא ידועה."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1728
-#: src/plugins/pdf_viewer/poppler_viewer.c:1945
+#: src/plugins/pdf_viewer/poppler_viewer.c:1732
+#: src/plugins/pdf_viewer/poppler_viewer.c:1950
 msgid "Document Index"
 msgstr "אינדקס מסמך"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1913
+#: src/plugins/pdf_viewer/poppler_viewer.c:1918
 msgid "First Page"
 msgstr "עמוד ראשון"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1921
 msgid "Previous Page"
 msgstr "עמוד קודם"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1924
 msgid "Next Page"
 msgstr "עמוד בא"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1922
+#: src/plugins/pdf_viewer/poppler_viewer.c:1927
 msgid "Last Page"
 msgstr "עמוד אחרון"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1925
+#: src/plugins/pdf_viewer/poppler_viewer.c:1930
 msgid "Zoom In"
 msgstr "זום פנימה"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1932
 msgid "Zoom Out"
 msgstr "זום החוצה"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+#: src/plugins/pdf_viewer/poppler_viewer.c:1935
 msgid "Fit Page"
 msgstr "התאמה לעמוד"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1933
+#: src/plugins/pdf_viewer/poppler_viewer.c:1938
 msgid "Fit Page Width"
 msgstr "התאמה לרוחב עמוד"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1941
 msgid "Rotate Left"
 msgstr "סיבוב לשמאל"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1939
+#: src/plugins/pdf_viewer/poppler_viewer.c:1944
 msgid "Rotate Right"
 msgstr "סיבוב לימין"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1942
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Document Info"
 msgstr "מידע מסמך"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
+#: src/plugins/pdf_viewer/poppler_viewer.c:1952
 msgid "Page Number"
 msgstr "מספר עמוד"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1949
+#: src/plugins/pdf_viewer/poppler_viewer.c:1954
 msgid "Zoom Factor"
 msgstr "זום"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2054
+#: src/plugins/pdf_viewer/poppler_viewer.c:2059
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11520,13 +11373,13 @@ msgstr ""
 "כל משוב יתקבל בברכה: iwkse at claws-mail.org"
 
 # קורא
-#: src/plugins/pdf_viewer/poppler_viewer.c:2060
-#: src/plugins/pdf_viewer/poppler_viewer.c:2068
-#: src/plugins/pdf_viewer/poppler_viewer.c:2088
+#: 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 "מציג PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2064
+#: src/plugins/pdf_viewer/poppler_viewer.c:2069
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11549,40 +11402,40 @@ msgstr "ערוך כללי סינון Perl‏ (ext)..."
 msgid "Failed to register PGP address autocompletion hook"
 msgstr "כשל ברישום hook השלמה אוטומטית של כתובת PGP"
 
-#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:127
+#: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:127
 msgid "Passphrase"
 msgstr "מימרת סיסמה"
 
-#: src/plugins/pgpcore/passphrase.c:248
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[אין מזהה משתמש]"
 
-#: src/plugins/pgpcore/passphrase.c:260
+#: src/plugins/pgpcore/passphrase.c:261
 msgid "Please enter the passphrase for the new key:"
 msgstr "אנא הזן מימרת סיסמה עבור המפתח החדש:"
 
-#: src/plugins/pgpcore/passphrase.c:263
+#: src/plugins/pgpcore/passphrase.c:264
 msgid "Passphrases did not match.\n"
 msgstr "מימרות סיסמה לא תאמו.\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:268
 msgid "Please re-enter the passphrase for the new key:"
 msgstr "אנא הזן מחדש את המימרת סיסמה עבור המפתח החדש:"
 
-#: src/plugins/pgpcore/passphrase.c:272
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Please enter the passphrase for:"
 msgstr "אנא הזן מימרת סיסמה עבור:"
 
-#: src/plugins/pgpcore/passphrase.c:275
+#: src/plugins/pgpcore/passphrase.c:276
 msgid "Bad passphrase.\n"
 msgstr "מימרת־סיסמה רעה.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:121
 msgid "Key import"
 msgstr "ייבוא מפתח"
 
 # טבעת מפתחות key-ring
-#: src/plugins/pgpcore/pgp_viewer.c:174
+#: 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?"
@@ -11590,7 +11443,7 @@ msgstr ""
 "מפתח זה אינו מצוי בתוך מחזיק המפתחות שלך. האם ברצונך מן Claws Mail לנסות "
 "לייבא אותו מתוך שרת מפתחות?"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:279
+#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:201
 msgid ""
 "\n"
 "  Key ID "
@@ -11598,15 +11451,15 @@ msgstr ""
 "\n"
 "  מזהה מפתח "
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:132 src/plugins/pgpcore/pgp_viewer.c:194
 msgid "   This key is not in your keyring.\n"
 msgstr "   מפתח זה אינו מצוי בתוך מחזיק המפתחות שלך.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:133
 msgid "   It should be possible to import it "
 msgstr "   זה אפשרי לייבוא "
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:135
 msgid ""
 "when working online,\n"
 "   or "
@@ -11614,7 +11467,7 @@ msgstr ""
 "בעת תפעול מקוון,\n"
 "   או "
 
-#: src/plugins/pgpcore/pgp_viewer.c:188
+#: src/plugins/pgpcore/pgp_viewer.c:136
 msgid ""
 "with the following command: \n"
 "\n"
@@ -11624,7 +11477,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:143
 msgid ""
 "\n"
 "  Importing key ID "
@@ -11632,19 +11485,19 @@ msgstr ""
 "\n"
 "  ייבוא מזהה מפתח "
 
-#: src/plugins/pgpcore/pgp_viewer.c:268
+#: src/plugins/pgpcore/pgp_viewer.c:186
 msgid "   This key has been imported to your keyring.\n"
 msgstr "   מפתח זה יובא למחזיק המפתחות שלך.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:270
+#: src/plugins/pgpcore/pgp_viewer.c:188
 msgid "   This key couldn't be imported to your keyring.\n"
 msgstr "   מפתח זה לא היה ניתן לייבוא למחזיק המפתחות שלך.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:271
+#: src/plugins/pgpcore/pgp_viewer.c:189
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   שרתי מפתחות הינם איטיים מעת לעת.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid ""
 "   You can try to import it manually with the command:\n"
 "\n"
@@ -11654,7 +11507,11 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:282
+#: src/plugins/pgpcore/pgp_viewer.c:195
+msgid "   Key import isn't implemented in Windows.\n"
+msgstr "   ייבוא מפתח אינו מיושם תחת Windows.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:204
 msgid "   This key is in your keyring.\n"
 msgstr "   מפתח זה מצוי בתוך מחזיק המפתחות שלך.\n"
 
@@ -11670,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"
@@ -11716,11 +11573,10 @@ 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:476
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
-#: src/prefs_receive.c:187
-msgid "minutes"
-msgstr "דקות"
+#: 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 "דקה(ות)"
 
 # אחוז
 #: src/plugins/pgpcore/prefs_gpg.c:173
@@ -11745,96 +11601,96 @@ msgstr "אם נשאר ריק, המיקום של קובץ נתון ליישום G
 msgid "Select GnuPG executable"
 msgstr "בחר קובץ נתון ליישום GnuPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:356
+#: src/plugins/pgpcore/prefs_gpg.c:353
 msgid "Sign key"
 msgstr "החתמת מפתח"
 
-#: src/plugins/pgpcore/prefs_gpg.c:364
+#: src/plugins/pgpcore/prefs_gpg.c:361
 msgid "Use default GnuPG key"
 msgstr "השתמש במפתח GnuPG שגרתי"
 
-#: src/plugins/pgpcore/prefs_gpg.c:375
+#: src/plugins/pgpcore/prefs_gpg.c:372
 msgid "Select key by your email address"
 msgstr "בחר מפתח לפי כתובת הדוא״ל שלך"
 
-#: src/plugins/pgpcore/prefs_gpg.c:386
+#: src/plugins/pgpcore/prefs_gpg.c:383
 msgid "Specify key manually"
 msgstr "ציין מפתח ידנית"
 
-#: src/plugins/pgpcore/prefs_gpg.c:396
+#: src/plugins/pgpcore/prefs_gpg.c:393
 msgid "User or key ID:"
 msgstr "משתמש או מזהה מפתח:"
 
-#: src/plugins/pgpcore/prefs_gpg.c:437
+#: src/plugins/pgpcore/prefs_gpg.c:434
 msgid "No secret key found."
 msgstr "לא נמצא מפתח סודי."
 
-#: src/plugins/pgpcore/prefs_gpg.c:440
+#: src/plugins/pgpcore/prefs_gpg.c:437
 msgid "Generate a new key pair"
 msgstr "הלחן צמד מפתחות חדש"
 
-#: src/plugins/pgpcore/prefs_gpg.c:618
+#: src/plugins/pgpcore/prefs_gpg.c:615
 msgid "GPG"
 msgstr "GPG"
 
-#: src/plugins/pgpcore/select-keys.c:94
+#: src/plugins/pgpcore/select-keys.c:95
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "אין תיאום מדויק עבור '%s'; אנא בחר את המפתח."
 
-#: src/plugins/pgpcore/select-keys.c:97
+#: src/plugins/pgpcore/select-keys.c:98
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "כעת אוסף מידע עבור '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:141
 msgid "Undefined"
 msgstr "לא מוגדר"
 
-#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:149
-#: src/plugins/pgpcore/sgpgme.c:165
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/sgpgme.c:161
 msgid "Marginal"
 msgstr "שולי"
 
-#: src/plugins/pgpcore/select-keys.c:246 src/plugins/pgpcore/sgpgme.c:153
-#: src/plugins/pgpcore/sgpgme.c:169
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:149
+#: src/plugins/pgpcore/sgpgme.c:165
 msgid "Ultimate"
 msgstr "סופי"
 
-#: src/plugins/pgpcore/select-keys.c:367
+#: src/plugins/pgpcore/select-keys.c:368
 msgid "Select Keys"
 msgstr "בחר מפתחות"
 
-#: src/plugins/pgpcore/select-keys.c:394
+#: src/plugins/pgpcore/select-keys.c:395
 msgid "Key ID"
 msgstr "מזהה מפתח"
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:398
 msgid "Trust"
 msgstr "בטח"
 
-#: src/plugins/pgpcore/select-keys.c:422
+#: src/plugins/pgpcore/select-keys.c:423
 msgid "_Other"
 msgstr "_אחר"
 
-#: src/plugins/pgpcore/select-keys.c:423
+#: src/plugins/pgpcore/select-keys.c:424
 msgid "Do_n't encrypt"
 msgstr "א_ל תצפין"
 
-#: src/plugins/pgpcore/select-keys.c:582
+#: src/plugins/pgpcore/select-keys.c:583
 msgid "Add key"
 msgstr "הוסף מפתח"
 
-#: src/plugins/pgpcore/select-keys.c:583
+#: src/plugins/pgpcore/select-keys.c:584
 msgid "Enter another user or key ID:"
 msgstr "הזן משתמש או מזהה מפתח אחר:"
 
-#: src/plugins/pgpcore/select-keys.c:605
+#: src/plugins/pgpcore/select-keys.c:606
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "הצפן אל %s ‏<%s>"
 
-#: src/plugins/pgpcore/select-keys.c:606
+#: src/plugins/pgpcore/select-keys.c:607
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11853,178 +11709,183 @@ msgstr ""
 "\n"
 "האם הינך בוטח מספיק במפתח זה כדי להשתמש בו למרות זאת?"
 
-#: src/plugins/pgpcore/sgpgme.c:83 src/privacy.c:249 src/privacy.c:253
+#: 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 "לא נמצאה חתימה"
 
-#: src/plugins/pgpcore/sgpgme.c:163
+#: src/plugins/pgpcore/sgpgme.c:159
 msgid "Untrusted"
 msgstr "לא מהימן"
 
-#: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
+#: src/plugins/pgpcore/sgpgme.c:199 src/plugins/pgpcore/sgpgme.c:218
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "החתימה לא ניתנת לבדיקה - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:241 src/plugins/pgpcore/sgpgme.c:245
+#: src/plugins/pgpcore/sgpgme.c:203 src/plugins/pgpcore/sgpgme.c:207
 msgid "The signature has not been checked."
 msgstr "החתימה לא נבדקה."
 
-#: src/plugins/pgpcore/sgpgme.c:251
+#: src/plugins/pgpcore/sgpgme.c:213
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "‏PGP Core: אין אפשרות להשיג מפתח - אין סוכן gpg-agent שמורץ כעת."
 
-#: src/plugins/pgpcore/sgpgme.c:269
+#: 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:272
+#: src/plugins/pgpcore/sgpgme.c:244
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "חתימה טובה מאת \"%s\" [מלאה]"
 
-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:247
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "חתימה טובה מאת \"%s\" [שולית]"
 
-#: src/plugins/pgpcore/sgpgme.c:282
+#: src/plugins/pgpcore/sgpgme.c:253
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "חתימה טובה מאת \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:305
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "מפתח 0x%s לא זמין כדי לאמת את חתימה זו"
-
-#: src/plugins/pgpcore/sgpgme.c:292
+#: src/plugins/pgpcore/sgpgme.c:258
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "חתימה פקועה מאת \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:295
+#: 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:298
+#: 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:301
+#: src/plugins/pgpcore/sgpgme.c:267
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "חתימה רעה מאת \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:310
+#: 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:329
+#: src/plugins/pgpcore/sgpgme.c:295
 msgid "Error checking signature: no status\n"
 msgstr "שגיאה בבדיקת חתימה: אין מצב\n"
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:313
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "שגיאה בבדיקת חתימה: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:365
+#: 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:371
+#: 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:376
+#: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "מפתח מזהה משתמש (uid) פקוע \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:381
+#: 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:386
+#: src/plugins/pgpcore/sgpgme.c:352
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "מפתח מזהה משתמש (uid) פסול \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:391
+#: src/plugins/pgpcore/sgpgme.c:357
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "חתימה רעה מאת \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:404
+#: src/plugins/pgpcore/sgpgme.c:370
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "‏uid ‏\"%s\" (תקפות: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:406
+#: src/plugins/pgpcore/sgpgme.c:372
 msgid "Revoked"
 msgstr "פסולה"
 
-#: src/plugins/pgpcore/sgpgme.c:411
+#: src/plugins/pgpcore/sgpgme.c:377
 #, fuzzy, c-format
 msgid "Owner Trust: %s\n"
 msgstr "נאמנות בעלים: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:412
+#: src/plugins/pgpcore/sgpgme.c:378
 msgid "No key!"
 msgstr "אין מפתח!"
 
-#: src/plugins/pgpcore/sgpgme.c:414
+#: src/plugins/pgpcore/sgpgme.c:380
 msgid "Primary key fingerprint:"
 msgstr "טביעת אצבע של מפתח עיקרי:"
 
-#: src/plugins/pgpcore/sgpgme.c:432
+#: 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:438
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "כתובת חותם מאומת הינה \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:472
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "לא היתה אפשרות לקבל מידע מתוך הודעה, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:488
+#: src/plugins/pgpcore/sgpgme.c:454
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "לא היתה אפשרות לאתחל נתונים, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:643
+#: src/plugins/pgpcore/sgpgme.c:609
 msgid "Secret key specification is ambiguous"
 msgstr "מפרט מפתח סודי הינו מעורפל"
 
-#: src/plugins/pgpcore/sgpgme.c:653
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "מפתח סודי לא נמצא (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:666
+#: src/plugins/pgpcore/sgpgme.c:632
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "שגיאה בהגדרת מפתח סודי: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:759
+#: 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:765
+#: src/plugins/pgpcore/sgpgme.c:727
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12033,12 +11894,12 @@ msgstr ""
 "פרוטוקול Gpgme ‏'%s' אינו שמיש: מנוע '%s' גרסא %s אכן מותקן, אולם גרסא %s "
 "נדרשת.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:773
+#: src/plugins/pgpcore/sgpgme.c:735
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "פרוטוקול Gpgme ‏'%s' אינו שמיש (בעיה לא מוכרת)"
 
-#: src/plugins/pgpcore/sgpgme.c:789
+#: src/plugins/pgpcore/sgpgme.c:751
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12046,7 +11907,7 @@ msgstr ""
 "‏GnuPG אינו מותקן כיאות, או שזה צריך שדרוג.\n"
 "תמיכת OpenPGP מנוטרלת."
 
-#: src/plugins/pgpcore/sgpgme.c:866
+#: 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"
@@ -12054,11 +11915,11 @@ msgstr ""
 "עליך לשמור מידע חשבון בעזרת \"אישור\" לפני שתעמוד לרשותך אפשרות להלחין "
 "מפתח.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:871
+#: src/plugins/pgpcore/sgpgme.c:790
 msgid "No PGP key found"
 msgstr "לא נמצא מפתח PGP"
 
-#: src/plugins/pgpcore/sgpgme.c:872
+#: 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"
@@ -12068,12 +11929,12 @@ msgstr ""
 "דואר או לקבל הודעות דואר מוצפנות.\n"
 "האם ברצונך ליצור כעת צמד מפתחות חדש?"
 
-#: src/plugins/pgpcore/sgpgme.c:961 src/plugins/pgpcore/sgpgme.c:983
+#: 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:971
+#: src/plugins/pgpcore/sgpgme.c:868
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12081,11 +11942,11 @@ msgstr ""
 "כעת מחולל את צמד המפתחות החדש שלך... אנא הזז את העכבר סביב כדי לסייע לחולל "
 "אנטרופיה..."
 
-#: src/plugins/pgpcore/sgpgme.c:989
+#: src/plugins/pgpcore/sgpgme.c:883
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "לא היתה אפשרות לחולל צמד מפתחות חדש: שגיאה לא מוכרת"
 
-#: src/plugins/pgpcore/sgpgme.c:993
+#: src/plugins/pgpcore/sgpgme.c:887
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12098,18 +11959,22 @@ msgstr ""
 "\n"
 "האם ברצונך לייצאו לשרת מפתחות?"
 
-#: src/plugins/pgpcore/sgpgme.c:997
+#: src/plugins/pgpcore/sgpgme.c:891
 msgid "Key generated"
 msgstr "מפתח התחולל"
 
-#: src/plugins/pgpcore/sgpgme.c:1073
+#: src/plugins/pgpcore/sgpgme.c:930
 msgid "Key exported."
 msgstr "מפתח יוצא."
 
-#: src/plugins/pgpcore/sgpgme.c:1075
+#: src/plugins/pgpcore/sgpgme.c:932
 msgid "Couldn't export key."
 msgstr "לא היתה אפשרות לייצא מפתח."
 
+#: src/plugins/pgpcore/sgpgme.c:936
+msgid "Key export isn't implemented in Windows."
+msgstr "ייצוא מפתח אינו מיושם תחת Windows."
+
 #: src/plugins/pgpinline/pgpinline.c:155
 msgid "Incorrect part"
 msgstr "אזור שגוי"
@@ -12130,7 +11995,7 @@ msgstr "לא היתה אפשרות להמיר מידע טקסט לאיזה מע
 #: 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:413
+#: src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "לא היתה אפשרות לאתחל הקשר GPG, ‏%s"
@@ -12265,11 +12130,11 @@ msgstr ""
 msgid "Signature boundary not found."
 msgstr "גבול חתימה לא נמצא."
 
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:496
 msgid "Couldn't parse decrypted file."
 msgstr "לא היתה אפשרות לנתח קובץ מפוענח."
 
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:501
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:503
 msgid "Couldn't parse decrypted file parts."
 msgstr "לא היתה אפשרות לנתח חלקי קובץ מפוענח."
 
@@ -12284,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."
 
@@ -12321,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"
 
@@ -12331,18 +12195,17 @@ msgid "Show Python console..."
 msgstr "הצג מסוף Python..."
 
 #: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_feed_props.c:482
 msgid "Refresh"
 msgstr "רענן"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2518
-#: src/prefs_account.c:2540 src/prefs_account.c:2809 src/wizard.c:1205
-#: src/wizard.c:1625
+#: 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"
 
@@ -12361,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"
@@ -12483,26 +12346,26 @@ msgstr "הזן כתובת URL של ערוץ החדשות אליו ברצונך 
 msgid "'%c' can't be used in folder name."
 msgstr "‏'%c' לא יכול להיכלל בשם תיקייה."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:251
+#: 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 זקוק לגישת רשת תקשורת על מנת לעדכן את הערוץ."
 msgstr[1] "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לעדכן את הערוצים."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:314
+#: src/plugins/rssyl/rssyl_cb_menu.c:316
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "באמת להסיר את עץ התיקייה '%s'?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:315
+#: src/plugins/rssyl/rssyl_cb_menu.c:317
 msgid "Remove feed tree"
 msgstr "הסר עץ ערוץ"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:349
+#: src/plugins/rssyl/rssyl_cb_menu.c:351
 msgid "Select an OPML file"
 msgstr "בחירת קובץ OPML"
 
-#: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:158
+#: 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 "לא היתה אפשרות ליצור תיקייה לערוץ חדש '%s'."
@@ -12547,106 +12410,104 @@ msgstr "‏RSSyl: אין אפשרות לעבד ערוץ אצל '%s'\n"
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "‏RSSyl: יישום כעצ יוצא, לא היתה אפשרות לסיים עדכון ערוץ בכתובת '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:270
+#: src/plugins/rssyl/rssyl_feed_props.c:273
 msgid "HTTP Basic authentication"
 msgstr "אימות HTTP Basic"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:290
 msgid "Use default refresh interval"
 msgstr "השתמש בתדירות רענון שגרתית"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:302
 msgid "Keep old items"
 msgstr "שמור פריטים ישנים"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:308
 msgid "_Trim"
 msgstr "ס_דר"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "עדכן ערוץ, מחיקת פריטים אשר כבר לא נמצאים בערוץ מקור"
 
 # אם ניתן
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:313
 msgid "Fetch comments if possible"
 msgstr "תפוס תגובות במידת האפשר"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:339
+#: src/plugins/rssyl/rssyl_feed_props.c:338
 msgid "Always mark it as new"
 msgstr "תמיד סמן זאת כחדש"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:345
+#: src/plugins/rssyl/rssyl_feed_props.c:344
 msgid "Only mark it as new if its text has changed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:351
+#: src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "Never mark it as new"
 msgstr "לעולם אל תסמן זאת כחדש"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 msgid "Add item title to the top of message"
 msgstr "הוסף כותרת פריט לראש הודעה"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:363
+#: src/plugins/rssyl/rssyl_feed_props.c:362
 msgid "Ignore title rename"
 msgstr "התעלם משינוי שם כותרת"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:368
+#: 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 ""
 "אפשר זאת כדי לשמר שם תיקייה, אפילו כאשר מחבר ערוץ משנה את הכותרת של הערוץ."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:372
-#: src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/rssyl/rssyl_feed_props.c:371
+#: src/plugins/vcalendar/vcal_prefs.c:547
 msgid "Verify SSL certificate validity"
 msgstr "אמת תוקף תעודת SSL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:391
 msgid "User name"
 msgstr "שם משתמש"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:404
 msgid "Source URL"
 msgstr "‏URL מקור"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:418
+#: src/plugins/rssyl/rssyl_feed_props.c:417
 msgid "Fetch comments on posts aged less than"
 msgstr "תפוס תגובות על פרסומים שגילם קטן מן"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:426
-#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
-msgid "days"
+#: src/plugins/rssyl/rssyl_feed_props.c:425
+msgid "day(s)"
 msgstr "ימים"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:427
+#: src/plugins/rssyl/rssyl_feed_props.c:426
 msgid "Set to -1 to fetch all comments"
 msgstr "הגדר אל 1- כדי למשוך את כל התגובות"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:451
+#: src/plugins/rssyl/rssyl_feed_props.c:450
 msgid "If an item changes"
 msgstr "אם פריט משתנה"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:455
 msgid "Items"
 msgstr "פריטים"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:469
+#: src/plugins/rssyl/rssyl_feed_props.c:468
 msgid "Refresh interval"
 msgstr "תדירות רענון"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_feed_props.c:476
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "הגדר אל 0 כדי לנטרל רענון אוטומטי עבוד ערוץ זה"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:529
+#: src/plugins/rssyl/rssyl_feed_props.c:528
 msgid "_OK"
 msgstr "_אישור"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:537
+#: src/plugins/rssyl/rssyl_feed_props.c:536
 msgid "Set feed properties"
 msgstr "הגדרת מאפייני ערוץ"
 
@@ -12699,7 +12560,7 @@ msgstr ""
 "יצירה של עץ תיקייה נכשלה.\n"
 "ייתכן כי חלק מהקבצים כבר קיימים, או שאין לך את ההרשאות לכתוב שם?"
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr "הערוצים שלי"
 
@@ -12759,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 (לא נמצא)"
 
@@ -12806,12 +12667,12 @@ msgstr "ערוץ ללא כותרת"
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "‏RSSyl: ערוץ פגום בספק בלי כותרת בכתובת %s.\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:231
+#: src/plugins/rssyl/rssyl_update_feed.c:228
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "כעת מעדכן ערוץ '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:258
+#: src/plugins/rssyl/rssyl_update_feed.c:250
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -12824,7 +12685,7 @@ msgstr ""
 "\n"
 "אנא צור קשר עם המפתחים, זה לא אמור להתרחש."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:342
+#: src/plugins/rssyl/rssyl_update_feed.c:334
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לעדכן את ערוצים שלך."
 
@@ -12837,7 +12698,7 @@ msgstr ""
 "פלט debug מצורף.\n"
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:913
+#: src/plugins/smime/smime.c:915
 msgid "S/MIME"
 msgstr "‏S/MIME"
 
@@ -12875,45 +12736,45 @@ msgstr ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:421
+#: src/plugins/smime/smime.c:423
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "לא היתה אפשרות להגדיר פרוטוקול GPG, ‏%s"
 
-#: src/plugins/smime/smime.c:449
+#: src/plugins/smime/smime.c:451
 msgid "Couldn't open temporary file"
 msgstr "לא היתה אפשרות לפתוח קובץ זמני"
 
-#: src/plugins/smime/smime.c:460 src/plugins/smime/smime.c:475
+#: src/plugins/smime/smime.c:462 src/plugins/smime/smime.c:477
 msgid "Couldn't write to temporary file"
 msgstr "לא היתה אפשרות לכתוב לקובץ זמני"
 
-#: src/plugins/smime/smime.c:486
+#: src/plugins/smime/smime.c:488
 msgid "Couldn't close temporary file"
 msgstr "לא היתה אפשרות לסגור קובץ זמני"
 
-#: src/plugins/smime/smime.c:708
+#: 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:83
+#: 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"
@@ -12929,19 +12790,19 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:413
+#: src/plugins/spam_report/spam_report.c:407
 msgid "Spam reporting"
 msgstr "דיווח ספאם"
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:122
 msgid "Enabled"
 msgstr "אפשר"
 
-#: src/plugins/spam_report/spam_report_prefs.c:169
+#: src/plugins/spam_report/spam_report_prefs.c:149
 msgid "Forward to:"
 msgstr "קדם אל:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1573
+#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
 msgid "Password:"
 msgstr "סיסמה:"
 
@@ -12979,9 +12840,8 @@ msgstr ""
 # BUG: from the remote learner? to > from
 # remote learning server
 #: src/plugins/spamassassin/spamassassin.c:429
-#, fuzzy
 msgid ""
-"Claws Mail needs network access in order to feed the mail to the remote "
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgstr ""
 "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לספק נתונים לדואר זה לשרת המרוחק "
@@ -13144,6 +13004,11 @@ msgstr "התחלה"
 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
+msgid "days"
+msgstr "ימים"
+
 #: src/plugins/vcalendar/month-view.c:109
 msgid "Monday"
 msgstr "שני"
@@ -13233,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:735
+#: src/plugins/vcalendar/vcal_prefs.c:710
 msgid "vCalendar"
 msgstr "‏vCalendar"
 
@@ -13451,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"
@@ -13516,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"
@@ -13539,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"
@@ -13552,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"
@@ -13563,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"
@@ -13574,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 "האם אתה בטוח כי ברצונך לבטל הרשמה?"
 
@@ -13668,15 +13533,15 @@ msgid "Later"
 msgstr "מאוחר יותר"
 
 # מוסכם
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1242
 msgid "Accepted: "
 msgstr "מאושר: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1244
 msgid "Declined: "
 msgstr "סורב: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1246
 msgid "Tentatively Accepted: "
 msgstr "מאושר באופן זמני: "
 
@@ -13697,9 +13562,8 @@ msgid "Add..."
 msgstr "הוסף..."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:779
-#, fuzzy
 msgid ""
-"The following people are busy at the time of your planned meeting:\n"
+"The following person(s) are busy at the time of your planned meeting:\n"
 "- "
 msgstr ""
 "האישיויות הבאות עסוקות בזמן של מפגשך המתוכנן:\n"
@@ -13984,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 "
@@ -14068,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"
 
@@ -14123,57 +13986,57 @@ msgstr "אירעה שגיאה בסשן POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "פקודת TOP לא נתמכת\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1451 src/prefs_account.c:2446
-#: src/wizard.c:1499
+#: 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:335 src/prefs_account.c:1564 src/prefs_account.c:2461
+#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account.c:336
+#: src/prefs_account.c:338
 msgid "News (NNTP)"
 msgstr "חדשות (NNTP)"
 
-#: src/prefs_account.c:337 src/wizard.c:1501
+#: src/prefs_account.c:339 src/wizard.c:1494
 msgid "Local mbox file"
 msgstr "קובץ mbox מקומי"
 
-#: src/prefs_account.c:338
+#: src/prefs_account.c:340
 msgid "None (SMTP only)"
 msgstr "ללא (SMTP בלבד)"
 
-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1033
 msgid "Name of account"
 msgstr "שם חשבון"
 
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1042
 msgid "Set as default"
 msgstr "הגדר כחשבון שגרתי"
 
-#: src/prefs_account.c:1045
+#: src/prefs_account.c:1050
 msgid "Personal information"
 msgstr "מידע אישי"
 
-#: src/prefs_account.c:1054
+#: src/prefs_account.c:1059
 msgid "Full name"
 msgstr "שם מלא"
 
-#: src/prefs_account.c:1060
+#: src/prefs_account.c:1065
 msgid "Mail address"
 msgstr "כתובות דואר"
 
 # אוטומטית
-#: src/prefs_account.c:1123 src/wizard.c:1524
+#: src/prefs_account.c:1128 src/wizard.c:1517
 msgid "Auto-configure"
 msgstr "תצורה-עצמית"
 
-#: src/prefs_account.c:1125 src/wizard.c:1525
+#: src/prefs_account.c:1130 src/wizard.c:1518
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/prefs_account.c:1142
+#: src/prefs_account.c:1147
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14181,78 +14044,78 @@ msgstr ""
 "אזהרה: גרסא זו של Claws Mail\n"
 "נבנתה בלי תמיכת IMAP וחדשות."
 
-#: src/prefs_account.c:1171
+#: src/prefs_account.c:1176
 msgid "This server requires authentication"
 msgstr "שרת זה מצריך אימות"
 
-#: src/prefs_account.c:1178
+#: src/prefs_account.c:1183
 msgid "Authenticate on connect"
 msgstr "אמת בעת התחברות"
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1237
 msgid "News server"
 msgstr "שרת חדשות"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1243
 msgid "Server for receiving"
 msgstr "שרת לקבלה"
 
-#: src/prefs_account.c:1244
+#: src/prefs_account.c:1249
 msgid "Local mailbox"
 msgstr "תיבת דואר מקומית"
 
-#: src/prefs_account.c:1251
+#: src/prefs_account.c:1256
 msgid "SMTP server (send)"
 msgstr "שרת SMTP (שליחה)"
 
-#: src/prefs_account.c:1259
+#: src/prefs_account.c:1264
 msgid "Use mail command rather than SMTP server"
 msgstr "השתמש בפקודת דואר במקום שרת SMTP"
 
-#: src/prefs_account.c:1268
+#: src/prefs_account.c:1273
 msgid "command to send mails"
 msgstr "פקודה לשליחת דואר"
 
-#: src/prefs_account.c:1332
+#: src/prefs_account.c:1338
 #, c-format
 msgid "Account%d"
 msgstr "חשבון%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1424
 msgid "Local"
 msgstr "מקומי"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1430 src/prefs_account.c:1519
 msgid "Default Inbox"
 msgstr "תיבת דואר נכנס שגרתית"
 
-#: src/prefs_account.c:1438 src/prefs_account.c:1445 src/prefs_account.c:1527
-#: src/prefs_account.c:1534
+#: 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 "הודעות לא מסוננות יאוחסנו בתיקייה זו"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1452
 msgid "Use secure authentication (APOP)"
 msgstr "השתמש באימות מאובטח (APOP)"
 
 # בעת במועד קבלה
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1455
 msgid "Remove messages on server when received"
 msgstr "הסר הודעות שעל שרת לאחר קבלה"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1466
 msgid "Remove after"
 msgstr "הסר כעבור"
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1484
+#: src/prefs_account.c:1473 src/prefs_account.c:1483
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 ימים וגם 0 שעות : הסרה מידית"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1496
 msgid "Receive size limit"
 msgstr "מגבלת גודל לקבלה"
 
-#: src/prefs_account.c:1500
+#: 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."
@@ -14260,85 +14123,80 @@ msgstr ""
 "הודעות מעל לגודל זה יאוחזרו באופן חלקי. בעת בחירה תעמוד לך האפשרות להורידן "
 "במלואן או למוחקן."
 
-#: src/prefs_account.c:1540 src/prefs_account.c:2476
+#: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
 msgstr "NNTP"
 
 # פריטים
-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1546
 msgid "Maximum number of articles to download"
 msgstr "מספר מרבי של מאמרים להורדה"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1556
 msgid "unlimited if 0 is specified"
 msgstr "בלי הגבלה אם 0 מצוין"
 
-#: src/prefs_account.c:1582
-#, fuzzy
-msgid "Plain text"
-msgstr "מצא טקסט:"
-
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "מדור שרת IMAP"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1596
 msgid "(usually empty)"
 msgstr "(לרוב ריק)"
 
 # מורשמות
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1610
 msgid "Show subscribed folders only"
 msgstr "הצג תיקיות רשומות בלבד"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1617
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "מצב רוחב-פס-תועלתי (מונע אחזור של תגיות מרוחקות)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "מצב זה משתמש בפחות רוחב פס, אך עשוי להיות אטי יותר עם שרתים מסוימים."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
 msgstr "סנן הודעות בעת קבלה"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
 msgstr "התר סינון באמצעות תוספים בעת קבלה"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'השג דואר' בודקת עבור הודעות חדשות בחשבון זה"
 
 # כותר
-#: src/prefs_account.c:1722 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:1724
+#: src/prefs_account.c:1720
 msgid "Generate Message-ID"
 msgstr "הלחן Message-ID"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
 msgstr "שלח כתובת דואר של חשבון בתוך Message-ID"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1726
 msgid "Add user agent header"
 msgstr "הוסף תקורת סוכן משתמש"
 
 # שמוגדרת לפי משתמש
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1733
 msgid "Add user-defined header"
 msgstr "הוסף תקורה מוגדרת-משתמש"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "אימות SMTP ‏(SMTP AUTH)"
 
-#: src/prefs_account.c:1837
+#: src/prefs_account.c:1833
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14346,289 +14204,305 @@ msgstr ""
 "כאשר ערכים אלו יישארו ריקים, ייעשה שימוש באותו מזהה משתמש ובאותה סיסמה אשר "
 "משמשים לצורך קבלה."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
 msgstr "אמת עם POP3 טרם שליחה"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1859
 msgid "POP authentication timeout: "
 msgstr "פקיעת זמן אימות POP: "
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1867
+msgid "minutes"
+msgstr "דקות"
+
+#: src/prefs_account.c:1937 src/prefs_account.c:1983
 msgid "Signature"
 msgstr "חתימה"
 
 # שיבוץ חתימה אוטומטי
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1940
 msgid "Automatically insert signature"
 msgstr "שבץ חתימה אוטומטית"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1945
 msgid "Signature separator"
 msgstr "מפריד חתימה"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1970
 msgid "Command output"
 msgstr "פלט פקודה"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2003
 msgid "Automatically set the following addresses"
 msgstr "הגדר אוטומטית את הכתובות הבאות"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
 msgstr "מילונים לבדיקת איות"
 
-#: src/prefs_account.c:2076 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:2089 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:2175 src/prefs_account.c:3328
+#: 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:2190 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:2205 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:2252
+#: src/prefs_account.c:2241
 msgid "Default privacy system"
 msgstr "מערכת פרטיות שגרתית"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2270
 msgid "Always sign messages"
 msgstr "תמיד חתום הודעות"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2272
 msgid "Always encrypt messages"
 msgstr "תמיד הצפן הודעות"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr "תמיד חתום הודעות בעת מענה להודעה חתומה"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "תמיד הצפן הודעות בעת מענה להודעה מוצפנת"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "הצפן הודעות נשלחות עם המפתח העצמי שלך בנוסף לזה של נמען"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
 msgstr "שמור הודעות מוצפנות אשר נשלחו בתור טקסט גלוי"
 
 # לא לעשות שימוש בהצפנת
-#: src/prefs_account.c:2450 src/prefs_account.c:2465 src/prefs_account.c:2479
+#: 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:2453
+#: src/prefs_account.c:2441
 msgid "Use SSL for POP3 connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור POP3"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2502
+#: 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:2468
+#: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור IMAP4"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2476
 msgid "Use SSL for NNTP connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור NNTP"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2480
 msgid "Send (SMTP)"
 msgstr "שליחה (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2484
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "אל תשתמש בהצפנת SSL (אולם, במידת וקיים הצורך, תתעל את STARTTLS)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2487
 msgid "Use SSL for SMTP connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור SMTP"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2495
 msgid "Client certificates"
 msgstr "תעודות לקוח"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2503
 msgid "Certificate for receiving"
 msgstr "תעודה עבור קבלה"
 
-#: src/prefs_account.c:2520 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2544
+#: 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:2537
+#: src/prefs_account.c:2525
 msgid "Certificate for sending"
 msgstr "תעודה עבור שליחה"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2558
 msgid "Automatically accept valid SSL certificates"
 msgstr "קבל אוטומטית תעודות SSL תקינות"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
 msgstr "נצל SSL שאינו חוסם (non-blocking)"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2573
 msgid "Turn this off if you have SSL connection problems"
 msgstr "כבה את העדפה זו אם קיימות אצלך בעיות התחברות אשר קשורות אל SSL"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2691
 msgid "SMTP port"
 msgstr "פורט SMTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2698
 msgid "POP3 port"
 msgstr "פורט POP3"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2705
 msgid "IMAP4 port"
 msgstr "פורט IMAP4"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2712
 msgid "NNTP port"
 msgstr "פורט NNTP"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2718
 msgid "Domain name"
 msgstr "שם מתחם"
 
-#: src/prefs_account.c:2743
+#: 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:2757
+#: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
 msgstr "השתמש בפקודה לתקשור עם שרת"
 
-#: src/prefs_account.c:2766
+# מוסר
+#: src/prefs_account.c:2743
+msgid "Move deleted mails to trash and expunge immediately"
+msgstr "העבר דואר מחוק לאשפה והסירו לחלוטין לאלתר"
+
+#: src/prefs_account.c:2745
+msgid ""
+"Moves deleted mails to trash instead of using the \\Deleted flag without "
+"expunging."
+msgstr ""
+"העבר דואר מחוק לאשפה במקום לעשות שימוש בדגל ‪\\Deleted‬ ללא הסרה מוחלטת."
+
+#: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
 msgstr "סמן הודעות פרסום-צולב ככאלה שנקראו וצבע:"
 
 # השמת
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2805
 msgid "Put sent messages in"
 msgstr "השם הודעות שנשלחו בתוך"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2807
 msgid "Put queued messages in"
 msgstr "השם הודעות בהמתנה בתוך"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2809
 msgid "Put draft messages in"
 msgstr "השם הודעות טיוטה בתוך"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2811
 msgid "Put deleted messages in"
 msgstr "השם הודעות מחוקות בתוך"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2871
 msgid "Account name is not entered."
 msgstr "שם חשבון אינו מוזן."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2875
 msgid "Mail address is not entered."
 msgstr "כתובת דואר אינה מוזנת."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
 msgstr "שרת SMTP אינו מוזן."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2887
 msgid "User ID is not entered."
 msgstr "מזהה משתמש לא מוזן."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
 msgstr "שרתPOP3 אינו מוזן."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
 msgstr "תיקיית דואר נכנס שגרתית לא קיימת."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
 msgstr "שרת IMAP4 אינו מוזן."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
 msgstr "שרת NNTP אינו מוזן."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
 msgstr "שם קובץ תיבת דואר מקומית אינו מוזן."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2935
 msgid "mail command is not entered."
 msgstr "פקודת דואר אינה מוזנת."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3252
 msgid "Receive"
 msgstr "קבלה"
 
-#: src/prefs_account.c:3346 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:3364
+#: src/prefs_account.c:3324
 msgid "Privacy"
 msgstr "פרטיות"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3435
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3726
 msgid "Preferences for new account"
 msgstr "העדפות עבור חשבון חדש"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3728
 #, c-format
 msgid "%s - Account preferences"
 msgstr "‏%s - העדפות חשבון"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3849 src/wizard.c:1382
 msgid "Failed (wrong address)"
 msgstr "נכשל (כתובת שגויה)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:3934
 msgid "Select signature file"
 msgstr "בחירת קובץ חתימה"
 
-#: src/prefs_account.c:4019 src/prefs_account.c:4036 src/wizard.c:1066
+#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
 msgid "Select certificate file"
 msgstr "בחירת קובץ תעודה"
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4065
 msgid "Protocol:"
 msgstr "פרוטוקול:"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4205
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (תוסף לא טעון)"
@@ -14863,7 +14737,7 @@ msgstr "החל סינון פעולות בין {} להודעות נבחרות"
 msgid "for a literal %"
 msgstr "עבור % מילולי"
 
-#: src/prefs_actions.c:1004 src/prefs_themes.c:935
+#: src/prefs_actions.c:1004 src/prefs_themes.c:936
 msgid "Actions"
 msgstr "פעולות"
 
@@ -14875,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 "כ_פילות"
 
@@ -14889,25 +14762,26 @@ msgstr "פעולות נוכחיות"
 msgid "Action string is not valid."
 msgstr "מחרוזת פעולה אינה תקפה."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:220 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "שלום,\\n"
 
 # ביום %d נכתב\\n
 # ע״י %f כדלקמן:\\n
-#: src/prefs_common.c:300
+#: src/prefs_common.c:298
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "ביום %d\\nנכתב על ידי %f כדלקמן:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:306 src/prefs_quote.c:85
+#: 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:450
+#: src/prefs_common.c:448
 msgid "%x(%a) %H:%M"
 msgstr ""
 
@@ -15137,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 "תצוגת הודעה"
 
@@ -15166,7 +15039,7 @@ msgid "Message flags"
 msgstr "דגלי הודעה"
 
 #: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:78 src/summaryview.c:2776
+#: src/prefs_summary_column.c:78 src/summaryview.c:2795
 msgid "Mark"
 msgstr "סמן"
 
@@ -15207,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 "ניקוד"
 
@@ -15293,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 "% מילולי"
 
@@ -15302,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 "שורה חדשה"
 
@@ -15353,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 "כולם"
@@ -15674,7 +15543,7 @@ msgstr "תצוגה"
 msgid "Fonts"
 msgstr "גופנים"
 
-#: src/prefs_gtk.c:911 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -15817,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 "אחרות"
 
@@ -15895,11 +15764,11 @@ msgstr "אזור גוף"
 msgid "whole message"
 msgstr "הודעה בשלמותה"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6282
+#: src/prefs_matcher.c:394 src/summaryview.c:6332
 msgid "Marked"
 msgstr "מסומנת"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6280
+#: src/prefs_matcher.c:395 src/summaryview.c:6330
 msgid "Deleted"
 msgstr "מחוקה"
 
@@ -15907,12 +15776,12 @@ msgstr "מחוקה"
 msgid "Replied"
 msgstr "נענתה"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6274
+#: src/prefs_matcher.c:397 src/summaryview.c:6324
 msgid "Forwarded"
 msgstr "קודמה"
 
 # דואר זבל
-#: src/prefs_matcher.c:399 src/summaryview.c:6264 src/toolbar.c:416
+#: src/prefs_matcher.c:399 src/summaryview.c:6314 src/toolbar.c:416
 #: src/toolbar.c:934 src/toolbar.c:1978
 msgid "Spam"
 msgstr "ספאם"
@@ -15921,7 +15790,7 @@ msgstr "ספאם"
 msgid "Has attachment"
 msgstr "מכילה תצריף"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6300
+#: src/prefs_matcher.c:401 src/summaryview.c:6350
 msgid "Signed"
 msgstr "חתומה"
 
@@ -16182,8 +16051,8 @@ msgid ""
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"‏'Test' מתיר לך לבחון הודעה או אלמנט של הודעה באמצעות תכנית חיצונית או תסריט. "
-"התוכנית תחזיר 0 או 1.\n"
+"‏'Test' מתיר לך לבחון הודעה או אלמנט של הודעה באמצעות תכנית חיצונית או "
+"תסריט. התוכנית תחזיר 0 או 1.\n"
 "\n"
 "הסמלים הבאים ניתנים לשימוש:"
 
@@ -16232,11 +16101,6 @@ msgstr "בחר אזור HTML של הודעות חלופיות או מרובות
 msgid "Line space"
 msgstr "ריווח שורה"
 
-#: src/prefs_message.c:189 src/prefs_message.c:223
-#, fuzzy
-msgid "pixels"
-msgstr "פיקסל(ים)"
-
 #: src/prefs_message.c:195
 msgid "Scroll"
 msgstr "גלילה"
@@ -16273,24 +16137,6 @@ msgstr "התייחס לתווים אלו בתור סימני ציטטה: "
 msgid "Text Options"
 msgstr "אפשרויות טקסט"
 
-#: src/prefs_migration.c:95
-#, c-format
-msgid ""
-"Your Claws Mail configuration is from a newer version than the version which "
-"you are currently using.\n"
-"\n"
-"This is not recommended.\n"
-"\n"
-"For further information see the %sClaws Mail website%s.\n"
-"\n"
-"Do you want to exit now?"
-msgstr ""
-
-#: src/prefs_migration.c:104
-#, fuzzy
-msgid "Configuration warning"
-msgstr "תצורה הושלמה"
-
 #: src/prefs_msg_colors.c:147
 msgid "Message view"
 msgstr "תצוגת הודעה"
@@ -16477,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."
@@ -16493,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"
@@ -16533,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."
@@ -16549,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)"
@@ -16581,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."
@@ -16589,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 passphrase"
-msgstr "מימרת־סיסמה רעה.\n"
-
-#: src/prefs_other.c:610
-#, fuzzy
-msgid "Use a master passphrase"
-msgstr "אנא הזן מימרת סיסמה עבור:"
-
-#: src/prefs_other.c:613
-msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"passphrase. If no master passphrase is set, you will be prompted to set one."
-msgstr ""
-
-#: src/prefs_other.c:618
-#, fuzzy
-msgid "Change master passphrase"
-msgstr "אנא הזן מימרת סיסמה עבור:"
-
-#: src/prefs_other.c:778
+#: src/prefs_other.c:689
 msgid "Miscellaneous"
 msgstr "שונות"
 
@@ -16624,73 +16449,73 @@ msgstr "שונות"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "ביום %d\\nנכתב על ידי %f כדלקמן:\\n\\n%q"
 
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:123
 msgid "External incorporation program"
 msgstr "תוכנית מאוחדת חיצונית"
 
-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
 msgstr "השתמש בתוכנית חיצונית לצורך קבלת דואר"
 
-#: src/prefs_receive.c:161
+#: src/prefs_receive.c:142
 msgid "Automatic checking"
 msgstr "בדיקה אוטומטית"
 
-#: src/prefs_receive.c:168
+#: src/prefs_receive.c:149
 msgid "Check for new mail every"
 msgstr "בדוק עבור דואר חדש כל"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:167
 msgid "Check for new mail on start-up"
 msgstr "בדוק עבור דואר חדש בעת הפעלה"
 
-#: src/prefs_receive.c:218
+#: src/prefs_receive.c:170
 msgid "Dialogs"
 msgstr "דו שיח"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:172
 msgid "Show receive dialog"
 msgstr "הצג דו שיח קבלה"
 
-#: src/prefs_receive.c:230
+#: src/prefs_receive.c:182
 msgid "Only on manual receiving"
 msgstr "רק בעת קבלה ידנית"
 
-#: src/prefs_receive.c:241
+#: src/prefs_receive.c:193
 msgid "Close receive dialog when finished"
 msgstr "סגור דו שיח קבלה בעת סיום"
 
-#: src/prefs_receive.c:244
+#: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
 msgstr "אל תקפיץ דו שיח שגיאה בעת שגיאת קבלה"
 
-#: src/prefs_receive.c:247
+#: src/prefs_receive.c:199
 msgid "After receiving new mail"
 msgstr "כעבור קבלת דואר חדש"
 
 # הודעות שנכנסו
-#: src/prefs_receive.c:249
+#: src/prefs_receive.c:201
 msgid "Go to Inbox"
 msgstr "עבור לתיקיית דואר נכנס"
 
 # עדכן כל תיקיות מקומיות
-#: src/prefs_receive.c:251
+#: src/prefs_receive.c:203
 msgid "Update all local folders"
 msgstr "עדכן את כל התיקיות המקומיות"
 
-#: src/prefs_receive.c:253
+#: src/prefs_receive.c:205
 msgid "Run command"
 msgstr "הרץ פקודה"
 
-#: src/prefs_receive.c:258
+#: src/prefs_receive.c:210
 msgid "after automatic check"
 msgstr "כעבור בידוק אוטומטי"
 
-#: src/prefs_receive.c:260
+#: src/prefs_receive.c:212
 msgid "after manual check"
 msgstr "כעבור בדיקה ידנית"
 
-#: src/prefs_receive.c:268
+#: src/prefs_receive.c:220
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -16700,177 +16525,181 @@ msgstr ""
 "(השתמש במשתנה ‎%d בתור מספר של דואר חדש)"
 
 # טיפול בדואר
-#: src/prefs_receive.c:411 src/prefs_send.c:371
+#: src/prefs_receive.c:343 src/prefs_send.c:358
 msgid "Mail Handling"
 msgstr "ניהול דואר"
 
-#: src/prefs_receive.c:412
+#: src/prefs_receive.c:344
 msgid "Receiving"
 msgstr "קבלה"
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:161
 msgid "Save sent messages"
 msgstr "שמור הודעות שנשלחו"
 
-#: src/prefs_send.c:162
-msgid "Never send Return Receipts"
-msgstr "אל תשלח אף פעם קבלת מסירה"
-
-#: src/prefs_send.c:180
+#: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
 msgstr "ודא טרם שליחת הודעות בהמתנה"
 
-#: src/prefs_send.c:183
+#: src/prefs_send.c:167
+msgid "Never send Return Receipts"
+msgstr "אל תשלח אף פעם קבלת מסירה"
+
+#: src/prefs_send.c:170
 msgid "Show send dialog"
 msgstr "הצג דו שיח שליחה"
 
-#: src/prefs_send.c:186
+#: src/prefs_send.c:172
 msgid "Warn when Subject is empty"
 msgstr "הזהר כאשר Subject (נושא) הינו ריק"
 
-#: src/prefs_send.c:193
+#: src/prefs_send.c:180
 msgid "Outgoing encoding"
 msgstr "קידוד יוצא"
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:205
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr "אם 'אוטומטי' נבחרת, יעשה שימוש בקידוד האופטימלי עבור מקומיות נוכחית"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:220
+msgid "Automatic (Recommended)"
+msgstr "אוטומטי (מומלצת)"
+
+#: src/prefs_send.c:222
 msgid "7bit ASCII (US-ASCII)"
 msgstr "‏7bit ASCII ‏(US-ASCII)"
 
-#: src/prefs_send.c:236
+#: src/prefs_send.c:223
 msgid "Unicode (UTF-8)"
 msgstr "קידוד אוניברסלי (UTF-8)"
 
-#: src/prefs_send.c:238
+#: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
 msgstr "מערב אירופאי (ISO-8859-1)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
 msgstr "מערב אירופאי (ISO-8859-15)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
 msgstr "מרכז אירופאי (ISO-8859-2)"
 
-#: src/prefs_send.c:243
+#: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
 msgstr "בלטי (ISO-8859-13)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:231
 msgid "Baltic (ISO-8859-4)"
 msgstr "בלטי (ISO-8859-4)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:233
 msgid "Greek (ISO-8859-7)"
 msgstr "יווני (ISO-8859-7)"
 
-#: src/prefs_send.c:248
+#: src/prefs_send.c:235
 msgid "Hebrew (ISO-8859-8)"
 msgstr "עברי (ISO-8859-8)"
 
-#: src/prefs_send.c:249
+#: src/prefs_send.c:236
 msgid "Hebrew (Windows-1255)"
 msgstr "עברי (Windows-1255)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:238
 msgid "Arabic (ISO-8859-6)"
 msgstr "ערבי (ISO-8859-6)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:239
 msgid "Arabic (Windows-1256)"
 msgstr "ערבי (Windows-1256)"
 
-#: src/prefs_send.c:254
+#: src/prefs_send.c:241
 msgid "Turkish (ISO-8859-9)"
 msgstr "טורקי (ISO-8859-9)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:243
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "קירילי (ISO-8859-5)"
 
-#: src/prefs_send.c:257
+#: src/prefs_send.c:244
 msgid "Cyrillic (KOI8-R)"
 msgstr "קירילי (KOI8-R)"
 
-#: src/prefs_send.c:258
+#: src/prefs_send.c:245
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "קירילי (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
 msgstr "קירילי (KOI8-U)"
 
-#: src/prefs_send.c:260
+#: src/prefs_send.c:247
 msgid "Cyrillic (Windows-1251)"
 msgstr "קירילי (Windows-1251)"
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:249
 msgid "Japanese (ISO-2022-JP)"
 msgstr "יפני (ISO-2022-JP)"
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:251
 msgid "Japanese (EUC-JP)"
 msgstr "יפני (EUC-JP)"
 
-#: src/prefs_send.c:265
+#: src/prefs_send.c:252
 msgid "Japanese (Shift_JIS)"
 msgstr "יפני (Shift_JIS)"
 
-#: src/prefs_send.c:268
+#: src/prefs_send.c:255
 msgid "Simplified Chinese (GB18030)"
 msgstr "סינית מפושטת (GB18030)"
 
-#: src/prefs_send.c:269
+#: src/prefs_send.c:256
 msgid "Simplified Chinese (GB2312)"
 msgstr "סינית מפושטת (GB2312)"
 
-#: src/prefs_send.c:270
+#: src/prefs_send.c:257
 msgid "Simplified Chinese (GBK)"
 msgstr "סינית מפושטת (GBK)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:258
 msgid "Traditional Chinese (Big5)"
 msgstr "סינית מסורתית (Big5)"
 
-#: src/prefs_send.c:273
+#: src/prefs_send.c:260
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "סינית מסורתית (EUC-TW)"
 
-#: src/prefs_send.c:274
+#: src/prefs_send.c:261
 msgid "Chinese (ISO-2022-CN)"
 msgstr "סיני (ISO-2022-CN)"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:264
 msgid "Korean (EUC-KR)"
 msgstr "קוריאני (EUC-KR)"
 
-#: src/prefs_send.c:279
+#: src/prefs_send.c:266
 msgid "Thai (TIS-620)"
 msgstr "תאי (TIS-620)"
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:267
 msgid "Thai (Windows-874)"
 msgstr "תאי (Windows-874)"
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:271
 msgid "Transfer encoding"
 msgstr "המרת קידוד"
 
-#: src/prefs_send.c:295
+#: src/prefs_send.c:282
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr "ציין קידוד-העברת-תוכן בשימוש כאשר גוף הודעה מכיל תווים שאינם ASCII"
 
 # שולח כעת
-#: src/prefs_send.c:372 src/send_message.c:501 src/send_message.c:505
-#: src/send_message.c:510
+#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
+#: src/send_message.c:511
 msgid "Sending"
 msgstr "שליחה"
 
@@ -17000,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 "פורמט תאריך"
 
@@ -17094,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
@@ -17298,7 +17126,7 @@ msgstr "תבניות נוכחיות"
 msgid "Template"
 msgstr "תבנית"
 
-#: src/prefs_themes.c:344 src/prefs_themes.c:704
+#: src/prefs_themes.c:344 src/prefs_themes.c:705
 msgid "Default internal theme"
 msgstr "מוטיב פנימי שגרתי"
 
@@ -17405,54 +17233,54 @@ msgstr ""
 "קובץ %s נכשל\n"
 "במהלך התקנת מוטיב."
 
-#: src/prefs_themes.c:666
+#: src/prefs_themes.c:667
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d מוטיבים זמינים (%d משתמש, %d מערכת, 1 פנימי)"
 
-#: src/prefs_themes.c:707
+#: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "מוטיב פנימי מונה %d סמלים"
 
-#: src/prefs_themes.c:713
+#: src/prefs_themes.c:714
 msgid "No info file available for this theme"
 msgstr "אין קובץ מידע זמין עבור מוטיב זה"
 
-#: src/prefs_themes.c:731
+#: src/prefs_themes.c:732
 msgid "Error: couldn't get theme status"
 msgstr "שגיאה: לא היתה אפשרות להשיג מצב מוטיב"
 
-#: src/prefs_themes.c:755
+#: src/prefs_themes.c:756
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d קבצים (%d סמלים), גודל: %s"
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:804
 msgid "Selector"
 msgstr "בורר"
 
-#: src/prefs_themes.c:814
+#: src/prefs_themes.c:815
 msgid "Install new..."
 msgstr "התקן חדש..."
 
-#: src/prefs_themes.c:819
+#: src/prefs_themes.c:820
 msgid "Get more..."
 msgstr "השג עוד..."
 
-#: src/prefs_themes.c:830
+#: src/prefs_themes.c:831
 msgid "Information"
 msgstr "מידע"
 
-#: src/prefs_themes.c:844
+#: src/prefs_themes.c:845
 msgid "Author: "
 msgstr "מחבר: "
 
-#: src/prefs_themes.c:852
+#: src/prefs_themes.c:853
 msgid "URL:"
 msgstr "‏URL:"
 
-#: src/prefs_themes.c:894
+#: src/prefs_themes.c:895
 msgid "Preview"
 msgstr "הצגה מוקדמת"
 
@@ -17602,36 +17430,36 @@ msgstr "אין מידע זמין"
 msgid "No recipient keys defined."
 msgstr "אין מפתחות נמען מוגדרים."
 
-#: src/procmime.c:433 src/procmime.c:435 src/procmime.c:436
+#: 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."
@@ -17639,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"
 
@@ -17814,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
@@ -17845,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>"
@@ -17948,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:350
+#: src/send_message.c:351
 msgid "Connecting"
 msgstr "מתחבר כעת"
 
 # מיישם מבצע
-#: src/send_message.c:355
+#: src/send_message.c:356
 msgid "Doing POP before SMTP..."
 msgstr "מקיים POP לפני SMTP..."
 
-#: src/send_message.c:358
+#: src/send_message.c:359
 msgid "POP before SMTP"
 msgstr "POP לפני SMTP"
 
-#: src/send_message.c:363
+#: 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:420
+#: src/send_message.c:421
 msgid "Mail sent successfully."
 msgstr "דואר נשלח בהצלחה."
 
-#: src/send_message.c:486
+#: src/send_message.c:487
 msgid "Sending HELO..."
 msgstr "כעת שולח HELO..."
 
-#: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
+#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
 msgid "Authenticating"
 msgstr "מאמת כעת"
 
-#: src/send_message.c:488 src/send_message.c:493
+#: src/send_message.c:489 src/send_message.c:494
 msgid "Sending message..."
 msgstr "כעת שולח הודעה..."
 
-#: src/send_message.c:491
+#: src/send_message.c:492
 msgid "Sending EHLO..."
 msgstr "כעת שולח EHLO..."
 
-#: src/send_message.c:500
+#: src/send_message.c:501
 msgid "Sending MAIL FROM..."
 msgstr "כעת שולח MAIL FROM..."
 
-#: src/send_message.c:504
+#: src/send_message.c:505
 msgid "Sending RCPT TO..."
 msgstr "כעת שולח RCPT TO..."
 
-#: src/send_message.c:509
+#: src/send_message.c:510
 msgid "Sending DATA..."
 msgstr "כעת שולח DATA..."
 
-#: src/send_message.c:513
+#: src/send_message.c:514
 msgid "Quitting..."
 msgstr "כעת יוצא..."
 
-#: src/send_message.c:542
+#: src/send_message.c:543
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "כעת שולח הודעה (%d / %d בתים)"
 
-#: src/send_message.c:595
+#: src/send_message.c:596
 msgid "Sending message"
 msgstr "כעת שולח הודעה"
 
-#: src/send_message.c:664 src/send_message.c:684
+#: src/send_message.c:665 src/send_message.c:685
 msgid "Error occurred while sending the message."
 msgstr "אירעה שגיאה במהלך שליחת ההודעה."
 
-#: src/send_message.c:667
+#: src/send_message.c:668
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18065,15 +17895,15 @@ msgstr "מקור של ההודעה"
 msgid "%s - Source"
 msgstr "%s - מקור"
 
-#: src/ssl_manager.c:156
+#: src/ssl_manager.c:157
 msgid "Saved SSL certificates"
 msgstr "תעודות SSL שמורות"
 
-#: src/ssl_manager.c:436
+#: src/ssl_manager.c:431
 msgid "Delete certificate"
 msgstr "מחיקת תעודה"
 
-#: src/ssl_manager.c:437
+#: src/ssl_manager.c:432
 msgid "Do you really want to delete this certificate?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את תעודה זו?"
 
@@ -18101,7 +17931,7 @@ msgstr "תנאי:"
 msgid "Find _all"
 msgstr "מצא _הכל"
 
-#: src/summary_search.c:690 src/summaryview.c:1086 src/summaryview.c:1347
+#: src/summary_search.c:690 src/summaryview.c:1105 src/summaryview.c:1366
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "כעת מחפש בתוך %s... \n"
@@ -18126,263 +17956,260 @@ msgstr "הצג/הסתר שורת חיפוש מהיר"
 msgid "Toggle multiple selection"
 msgstr "החלף בחירה מרובה"
 
-#: src/summaryview.c:1275
+#: src/summaryview.c:1294
 msgid "Process mark"
 msgstr "סימן עיבוד"
 
-#: src/summaryview.c:1276
+#: src/summaryview.c:1295
 msgid "Some marks are left. Process them?"
 msgstr "נשארו כמה סימונים. לעבדם?"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1345
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "כעת סורק תיקייה (%s)..."
 
-#: src/summaryview.c:1823 src/summaryview.c:1875
+#: src/summaryview.c:1842 src/summaryview.c:1894
 msgid "No more unread messages"
 msgstr "אין עוד הודעות שלא נקראו"
 
-#: src/summaryview.c:1824
+#: src/summaryview.c:1843
 msgid "No unread message found. Search from the end?"
 msgstr "לא נמצאו הודעות שלא נקראו. לחפש מן הסוף?"
 
-#: src/summaryview.c:1836 src/summaryview.c:1888 src/summaryview.c:1931
-#: src/summaryview.c:1983 src/summaryview.c:2062
+#: src/summaryview.c:1855 src/summaryview.c:1907 src/summaryview.c:1950
+#: src/summaryview.c:2002 src/summaryview.c:2081
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "שגיאה פנימית: ערך לא צפוי עבור prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1844
+#: src/summaryview.c:1863
 msgid "No unread messages."
 msgstr "אין הודעות שלא נקראו."
 
-#: src/summaryview.c:1876
+#: src/summaryview.c:1895
 msgid "No unread message found. Go to next folder?"
 msgstr "לא נמצאו הודעות שלא נקראו. לעבור לתיקייה הבאה?"
 
-#: src/summaryview.c:1918 src/summaryview.c:1970
+#: src/summaryview.c:1937 src/summaryview.c:1989
 msgid "No more new messages"
 msgstr "אין עוד הודעות חדשות"
 
-#: src/summaryview.c:1919
+#: src/summaryview.c:1938
 msgid "No new message found. Search from the end?"
 msgstr "לא נמצאו הודעות חדשות. לחפש מן הסוף?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1958
 msgid "No new messages."
 msgstr "אין הודעות חדשות."
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1990
 msgid "No new message found. Go to next folder?"
 msgstr "לא נמצאו הודעות חדשות. לעבור לתיקייה הבאה?"
 
-#: src/summaryview.c:2008 src/summaryview.c:2049
+#: src/summaryview.c:2027 src/summaryview.c:2068
 msgid "No more marked messages"
 msgstr "אין עוד הודעות מסומנות"
 
-#: src/summaryview.c:2009
+#: src/summaryview.c:2028
 msgid "No marked message found. Search from the end?"
 msgstr "לא נמצאו הודעות מסומנות. לחפש מן הסוף?"
 
-#: src/summaryview.c:2018
+#: src/summaryview.c:2037
 msgid "No marked messages."
 msgstr "אין הודעות מסומנות."
 
-#: src/summaryview.c:2050
+#: src/summaryview.c:2069
 msgid "No marked message found. Go to next folder?"
 msgstr "לא נמצאו הודעות מסומנות. לעבור לתיקייה הבאה?"
 
-#: src/summaryview.c:2087 src/summaryview.c:2112
+#: src/summaryview.c:2106 src/summaryview.c:2131
 msgid "No more labeled messages"
 msgstr "אין עוד הודעות מסווגות"
 
-#: src/summaryview.c:2088
+#: src/summaryview.c:2107
 msgid "No labeled message found. Search from the end?"
 msgstr "לא נמצאו הודעות מסווגות. לחפש מן הסוף?"
 
-#: src/summaryview.c:2097 src/summaryview.c:2122
+#: src/summaryview.c:2116 src/summaryview.c:2141
 msgid "No labeled messages."
 msgstr "אין הודעות מסווגות."
 
-#: src/summaryview.c:2113
+#: src/summaryview.c:2132
 msgid "No labeled message found. Search from the beginning?"
 msgstr "לא נמצאו הודעות מסווגות. לחפש מן ההתחלה?"
 
-#: src/summaryview.c:2427
+#: src/summaryview.c:2446
 msgid "Attracting messages by subject..."
 msgstr "כעת מושך הודעות לפי נושא..."
 
-#: src/summaryview.c:2612
+#: src/summaryview.c:2631
 #, c-format
 msgid "%d deleted"
 msgstr "%d נמחקו"
 
-#: src/summaryview.c:2616
+#: src/summaryview.c:2635
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d הועברו"
 
-#: src/summaryview.c:2617 src/summaryview.c:2624
+#: src/summaryview.c:2636 src/summaryview.c:2643
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2622
+#: src/summaryview.c:2641
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d הועתקו"
 
-#: src/summaryview.c:2636
+#: src/summaryview.c:2655
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " פריט נבחר"
 msgstr[1] " פריטים נבחרו"
 
-#: src/summaryview.c:2654 src/summaryview.c:2697
+#: src/summaryview.c:2673 src/summaryview.c:2716
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d חדשות, %d לא נקראו, %d סך הכל (%s)"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2691
 msgid "Message summary"
 msgstr "תמצית הודעה"
 
-#: src/summaryview.c:2673
+#: src/summaryview.c:2692
 msgid "New:"
 msgstr "חדש:"
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2693
 msgid "Unread:"
 msgstr "לא נקראו:"
 
-#: src/summaryview.c:2675
+#: src/summaryview.c:2694
 msgid "Total:"
 msgstr "סך הכל:"
 
-#: src/summaryview.c:2677
+#: src/summaryview.c:2696
 msgid "Marked:"
 msgstr "מסומנות:"
 
-#: src/summaryview.c:2678
+#: src/summaryview.c:2697
 msgid "Replied:"
 msgstr "נענו:"
 
-#: src/summaryview.c:2679
+#: src/summaryview.c:2698
 msgid "Forwarded:"
 msgstr "קודמו:"
 
-#: src/summaryview.c:2680
+#: src/summaryview.c:2699
 msgid "Locked:"
 msgstr "נעולות:"
 
-#: src/summaryview.c:2681
+#: src/summaryview.c:2700
 msgid "Ignored:"
 msgstr "מנוכרות:"
 
-#: src/summaryview.c:2682
+#: src/summaryview.c:2701
 msgid "Watched:"
 msgstr "מפוקחות:"
 
-#: src/summaryview.c:2692
+#: src/summaryview.c:2711
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d נבחרו (%s/%s), %d לא נקראו"
 
-#: src/summaryview.c:2972
+#: src/summaryview.c:2991
 msgid "Sorting summary..."
 msgstr "כעת ממיין תמצית..."
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3130
 msgid "Setting summary from message data..."
 msgstr "כעת ממיין תמצית מתוך נתוני הודעה..."
 
-#: src/summaryview.c:3316
+#: src/summaryview.c:3335
 msgid "(No Date)"
 msgstr "(אין תאריך)"
 
-#: src/summaryview.c:3368
+#: src/summaryview.c:3387
 msgid "(No Recipient)"
 msgstr "(אין נמען)"
 
-#: src/summaryview.c:3403
+#: src/summaryview.c:3422
 #, c-format
 msgid "From: %s, on %s"
 msgstr "מאת: %s, ביום %s"
 
-#: src/summaryview.c:3412
+#: src/summaryview.c:3431
 #, c-format
 msgid "To: %s, on %s"
 msgstr "לכבוד: %s, ביום %s"
 
-#: src/summaryview.c:4291
+#: src/summaryview.c:4310
 msgid "You're not the author of the article.\n"
 msgstr "אינך המחבר של המאמר.\n"
 
-#: src/summaryview.c:4381
+#: 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] "האם אתה בטוח כי ברצונך למחוק את ההודעה הנבחרת?"
 msgstr[1] "האם אתה בטוח כי ברצונך למחוק את %d ההודעות הנבחרות?"
 
-#: src/summaryview.c:4384
-#, fuzzy
-msgid "Delete message"
-msgid_plural "Delete messages"
-msgstr[0] "מחק הודעה"
-msgstr[1] "מחק הודעה"
+#: src/summaryview.c:4406
+msgid "Delete message(s)"
+msgstr "מחיקת הודעה(ות)"
 
-#: src/summaryview.c:4548
+#: src/summaryview.c:4574
 msgid "Destination is same as current folder."
 msgstr "היעד הינו זהה לזה של התיקייה הנוכחית."
 
-#: src/summaryview.c:4653
+#: src/summaryview.c:4679
 msgid "Destination to copy is same as current folder."
 msgstr "היעד להעתקה הינו זהה לזה של התיקייה הנוכחית."
 
-#: src/summaryview.c:4818
+#: src/summaryview.c:4844
 msgid "Append or Overwrite"
 msgstr "הוספה על או החלפה"
 
-#: src/summaryview.c:4819
+#: src/summaryview.c:4845
 msgid "Append or overwrite existing file?"
 msgstr "הוסף על או החלף קובץ קיים?"
 
-#: src/summaryview.c:4820
+#: src/summaryview.c:4846
 msgid "_Append"
 msgstr "ל_צרף"
 
-#: src/summaryview.c:4820
+#: src/summaryview.c:4846
 msgid "_Overwrite"
 msgstr "_החלף"
 
-#: src/summaryview.c:4861
+#: src/summaryview.c:4887
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "בחרת להדפיס %d הודעות, בזו אחר זו. האם ברצונך להמשיך?"
 
-#: src/summaryview.c:5321
+#: src/summaryview.c:5371
 msgid "Building threads..."
 msgstr "כעת בונה שרשורים..."
 
-#: src/summaryview.c:5569
+#: src/summaryview.c:5619
 msgid "Skip these rules"
 msgstr "דלג על כללים אלו"
 
-#: src/summaryview.c:5572
+#: src/summaryview.c:5622
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "החל את כללים אלו בלי להתחשב בחשבון לו הם שייכים"
 
-#: src/summaryview.c:5575
+#: src/summaryview.c:5625
 msgid "Apply these rules if they apply to the current account"
 msgstr "החל את כללים אלו אם הם חלים לחשבון הנוכחי"
 
-#: src/summaryview.c:5604
+#: src/summaryview.c:5654
 msgid "Filtering"
 msgstr "סינון"
 
-#: src/summaryview.c:5605
+#: src/summaryview.c:5655
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18390,55 +18217,55 @@ msgstr ""
 "קיימים כללים מסוימים אשר שייכים לחשבון.\n"
 "אנא בחר מה לעשות עם כללים אלו:"
 
-#: src/summaryview.c:5635
+#: src/summaryview.c:5685
 msgid "Filtering..."
 msgstr "כעת מסנן..."
 
-#: src/summaryview.c:5714
+#: src/summaryview.c:5764
 msgid "Processing configuration"
 msgstr "תצורת עיבוד"
 
-#: src/summaryview.c:6260
+#: src/summaryview.c:6310
 msgid "Ignored thread"
 msgstr "שרשור מנוכר"
 
-#: src/summaryview.c:6262
+#: src/summaryview.c:6312
 msgid "Watched thread"
 msgstr "שרשור מפוקח"
 
-#: src/summaryview.c:6270
+#: src/summaryview.c:6320
 msgid "Replied but also forwarded - click to see reply"
 msgstr "נענתה אך גם קודמה - הקלק כדי לראות מענה"
 
-#: src/summaryview.c:6272
+#: src/summaryview.c:6322
 msgid "Replied - click to see reply"
 msgstr "נענתה - הקלק כדי לראות מענה"
 
-#: src/summaryview.c:6284
+#: src/summaryview.c:6334
 msgid "To be moved"
 msgstr "להעברה"
 
-#: src/summaryview.c:6286
+#: src/summaryview.c:6336
 msgid "To be copied"
 msgstr "להעתקה"
 
-#: src/summaryview.c:6298
+#: src/summaryview.c:6348
 msgid "Signed, has attachment(s)"
 msgstr "חתומה, מכילה תצריף(ים)"
 
-#: src/summaryview.c:6302
+#: src/summaryview.c:6352
 msgid "Encrypted, has attachment(s)"
 msgstr "מוצפנת, מכילה תצריף(ים)"
 
-#: src/summaryview.c:6304
+#: src/summaryview.c:6354
 msgid "Encrypted"
 msgstr "מוצפנת"
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6356
 msgid "Has attachment(s)"
 msgstr "מכילה תצריף(ים)"
 
-#: src/summaryview.c:7953
+#: src/summaryview.c:8004
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18447,11 +18274,11 @@ msgstr ""
 "שגיאת ביטוי רגולרי (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8056
+#: src/summaryview.c:8107
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "חזור לרשימת תיקייה (יש לך הודעות שלא נקראו)"
 
-#: src/summaryview.c:8061
+#: src/summaryview.c:8112
 msgid "Go back to the folder list"
 msgstr "חזור לרשימת תיקייה"
 
@@ -18915,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"
@@ -19013,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:975
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "שמך:"
 
-#: src/wizard.c:986
+#: src/wizard.c:979
 msgid "Your email address:"
 msgstr "כתובות דוא״ל שלך:"
 
-#: src/wizard.c:997
+#: src/wizard.c:990
 msgid "Your organization:"
 msgstr "ארגונך:"
 
-#: src/wizard.c:1031
+#: src/wizard.c:1024
 msgid "Mailbox name:"
 msgstr "שם תיבת דואר:"
 
-#: src/wizard.c:1039
+#: 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:1110
+#: 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:1113
+#: src/wizard.c:1106
 msgid "SMTP server address:"
 msgstr "כתובת שרת SMTP:"
 
-#: src/wizard.c:1119
+#: src/wizard.c:1112
 msgid "Use authentication"
 msgstr "השתמש באימות"
 
 # בזה של
-#: src/wizard.c:1128
+#: src/wizard.c:1121
 msgid "(empty to use the same as receive)"
 msgstr "(השאר ריק כדי להשתמש באותו מידע אשר משמש לצורך קבלה)"
 
-#: src/wizard.c:1142
+#: src/wizard.c:1135
 msgid "SMTP username:"
 msgstr "שם משתמש SMTP:"
 
-#: src/wizard.c:1153
+#: src/wizard.c:1146
 msgid "SMTP password:"
 msgstr "סיסמת SMTP:"
 
-#: src/wizard.c:1166
+#: src/wizard.c:1159
 msgid "Use SSL to connect to SMTP server"
 msgstr "השתמש בהצפנת SSL להתחברות לשרת SMTP"
 
-#: src/wizard.c:1177 src/wizard.c:1597
+#: src/wizard.c:1170 src/wizard.c:1590
 msgid "Use SSL via STARTTLS"
 msgstr "SSL דרך STARTTLS"
 
-#: src/wizard.c:1189 src/wizard.c:1609
+#: src/wizard.c:1182 src/wizard.c:1602
 msgid "Client SSL certificate (optional)"
 msgstr "תעודת לקוח SSL (רשות)"
 
-#: src/wizard.c:1257 src/wizard.c:1289 src/wizard.c:1544
+#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
 msgid "Server address:"
 msgstr "כתובת שרת:"
 
-#: src/wizard.c:1321
+#: src/wizard.c:1314
 msgid "Local mailbox:"
 msgstr "תיבת דואר מקומית:"
 
-#: src/wizard.c:1490
+#: src/wizard.c:1483
 msgid "Server type:"
 msgstr "טיפוס שרת:"
 
-#: src/wizard.c:1500
+#: src/wizard.c:1493
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1555
+#: 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:1586
+#: src/wizard.c:1579
 msgid "Use SSL to connect to receiving server"
 msgstr "השתמש בהצפנת SSL כדי להתחבר לשרת קבלה"
 
-#: src/wizard.c:1651
+#: src/wizard.c:1644
 msgid "IMAP server directory:"
 msgstr "מדור שרת IMAP:"
 
-#: src/wizard.c:1662
+#: src/wizard.c:1655
 msgid "Show only subscribed folders"
 msgstr "הצג תיקיות רשומות בלבד"
 
-#: src/wizard.c:1670
+#: src/wizard.c:1663
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19142,15 +18969,15 @@ msgstr ""
 "אזהרה: גרסא זו של Claws Mail\n"
 "נבנתה בלי תמיכת IMAP."
 
-#: src/wizard.c:1788
+#: src/wizard.c:1781
 msgid "Claws Mail Setup Wizard"
 msgstr "אשף הבניית Claws Mail"
 
-#: src/wizard.c:1822
+#: src/wizard.c:1815
 msgid "Welcome to Claws Mail"
 msgstr "ברוכים הבאים אל Claws Mail"
 
-#: src/wizard.c:1829
+#: src/wizard.c:1823
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19163,31 +18990,31 @@ msgstr ""
 "אנחנו נתחיל בהגדרת מידע בסיסי אודותייך ואפשרויות דואר שהכי נפוצות עבורך כדי "
 "שתעמוד לרשותך האפשרות להתחיל את Claws Mail בתוך פחות מחמש דקות."
 
-#: src/wizard.c:1842
+#: src/wizard.c:1836
 msgid "About You"
 msgstr "אודותייך"
 
-#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
+#: 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:1857
+#: src/wizard.c:1851
 msgid "Receiving mail"
 msgstr "קבלת דואר"
 
-#: src/wizard.c:1872
+#: src/wizard.c:1866
 msgid "Sending mail"
 msgstr "שליחת דואר"
 
-#: src/wizard.c:1888
+#: src/wizard.c:1882
 msgid "Saving mail on disk"
 msgstr "שמירת דואר בכונן"
 
-#: src/wizard.c:1904
+#: src/wizard.c:1898
 msgid "Configuration finished"
 msgstr "תצורה הושלמה"
 
-#: src/wizard.c:1911
+#: src/wizard.c:1906
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19195,40 +19022,6 @@ msgstr ""
 "‏Claws Mail הינו מוכן כעת.\n"
 "להתחלה, לחץ על שמור."
 
-#~ msgid "_Other folder..."
-#~ msgstr "תיקייה _אחרת..."
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   ייבוא מפתח אינו מיושם תחת Windows.\n"
-
-#~ msgid "minute(s)"
-#~ msgstr "דקה(ות)"
-
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "החתימה לא ניתנת לבדיקה - %s."
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "ייצוא מפתח אינו מיושם תחת Windows."
-
-#~ msgid "day(s)"
-#~ msgstr "ימים"
-
-# מוסר
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr "העבר דואר מחוק לאשפה והסירו לחלוטין לאלתר"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "העבר דואר מחוק לאשפה במקום לעשות שימוש בדגל ‪\\Deleted‬ ללא הסרה מוחלטת."
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "אוטומטי (מומלצת)"
-
-#~ msgid "Delete message(s)"
-#~ msgstr "מחיקת הודעה(ות)"
-
 #~ msgid "+_Insert"
 #~ msgstr "+_שבץ"
 
@@ -19305,6 +19098,9 @@ msgstr ""
 #~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
 #~ msgstr "<span color=\"red\">שגיאה בטיהור מטמון סמל.</span>"
 
+#~ msgid "seconds"
+#~ msgstr "שניות"
+
 #~ msgid "mbox (etPan!)..."
 #~ msgstr "‏mbox ‏(!etPan)..."
 
@@ -19312,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 301084f..d2a48b7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,7 +11,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-08-18 23:19+0200\n"
+"POT-Creation-Date: 2016-08-04 06:36+0200\n"
 "PO-Revision-Date: 2016-08-06 03:18+0200\n"
 "Last-Translator: rezso <rezso at rezso.net>\n"
 "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@ -4240,13 +4240,13 @@ msgstr "Biztosan meg akarod jelölni olvasottként a mappa összes üzenetét?"
 msgid "Mark all as read"
 msgstr "Összes megjelölése olvasottként"
 
-#: src/folderview.c:1019 src/imap.c:4639
+#: src/folderview.c:1019 src/imap.c:4641
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "%s%s mappa átvizsgálása..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/folderview.c:1022 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "%s mappa átvizsgálása..."
@@ -6454,8 +6454,8 @@ msgstr "Kapcsolódás nem sikerült: %s"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s IMAP kapcsolat megszakadt. Újrakapcsolódás...\n"
 
-#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 src/imap.c:5431
+#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
+#: src/imap.c:4622 src/imap.c:5433
 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."
 
@@ -6501,99 +6501,99 @@ 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:1255 src/imap.c:4110
+#: src/imap.c:1255 src/imap.c:4112
 msgid "Can't start TLS session.\n"
 msgstr "TLS folyamat nem indítható.\n"
 
 # src/send.c:371
-#: src/imap.c:1322
+#: src/imap.c:1324
 #, 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:1325
+#: src/imap.c:1327
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nem lehet bejelentkezni %s IMAP szerverre."
 
 # src/send.c:536
-#: src/imap.c:1752
+#: src/imap.c:1754
 msgid "Adding messages..."
 msgstr "Üzenetek hozzáadása..."
 
 # src/main.c:411
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1959 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Üzenetek másolása..."
 
 # src/imap.c:870 src/imap.c:922
-#: src/imap.c:2550
+#: src/imap.c:2552
 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:2557 src/imap.c:5061
+#: src/imap.c:2559 src/imap.c:5063
 msgid "can't expunge\n"
 msgstr "nem törölhető\n"
 
-#: src/imap.c:2908
+#: src/imap.c:2910
 #, 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:2911
+#: src/imap.c:2913
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "%s almappáinak vizsgálata..."
 
 # src/imap.c:1351
-#: src/imap.c:3229
+#: src/imap.c:3231
 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:3244
+#: src/imap.c:3246
 msgid "can't create mailbox\n"
 msgstr "nem tudtam postaládát létehozni\n"
 
 # src/imap.c:1443
-#: src/imap.c:3375
+#: src/imap.c:3377
 #, 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:3488
+#: src/imap.c:3490
 msgid "can't delete mailbox\n"
 msgstr "nem tudtam törölni a postaládát\n"
 
 # src/send.c:285
-#: src/imap.c:3767
+#: src/imap.c:3769
 msgid "LIST failed\n"
 msgstr "LIST sikertelen\n"
 
 # src/summaryview.c:2611
-#: src/imap.c:3852
+#: src/imap.c:3854
 msgid "Flagging messages..."
 msgstr "Üzenetek megjelölése..."
 
 # src/imap.c:2202
-#: src/imap.c:3955
+#: src/imap.c:3957
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappa kiválasztása nem sikerült\n"
 
-#: src/imap.c:4107
+#: src/imap.c:4109
 msgid "Server requires TLS to log in.\n"
 msgstr "A szerver TLS-t követel a bejelentkezéshez.\n"
 
-#: src/imap.c:4117
+#: src/imap.c:4119
 msgid "Can't refresh capabilities.\n"
 msgstr "A lehetőségek nem frissíthetőek.\n"
 
-#: src/imap.c:4122
+#: src/imap.c:4124
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6602,22 +6602,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:4130
+#: src/imap.c:4132
 msgid "Server logins are disabled.\n"
 msgstr "Szerverbejelentkezések letiltva.\n"
 
 # src/summaryview.c:2611
-#: src/imap.c:4353
+#: src/imap.c:4355
 msgid "Fetching message..."
 msgstr "Üzenet vétele..."
 
 # src/imap.c:870 src/imap.c:922
-#: src/imap.c:5054
+#: src/imap.c:5056
 #, 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:6091
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -8852,7 +8852,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:1855 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Felülírás"
@@ -8913,7 +8913,7 @@ 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:1446 src/messageview.c:1597
+#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Üzenetnézet"
 
@@ -8954,68 +8954,68 @@ msgstr ""
 "Nem ajánlott az olvasási visszaigazolás elküldése."
 
 # src/summaryview.c:2611
-#: src/messageview.c:1376
+#: src/messageview.c:1373
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Üzenet vétele (%s)..."
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1409 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "%s nem fejthető vissza"
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: src/messageview.c:1490 src/messageview.c:1498
 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:1847 src/messageview.c:1850 src/mimeview.c:1995
+#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Mentés másként"
 
 # src/mimeview.c:804 src/summaryview.c:2670
-#: src/messageview.c:1856
+#: src/messageview.c:1853
 msgid "Overwrite existing file?"
 msgstr "Létező fájl felülírása?"
 
 # src/summaryview.c:2677
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "'%s' fájl nem menthető el."
 
-#: src/messageview.c:1917
+#: src/messageview.c:1914
 #, c-format
 msgid "Show all %s."
 msgstr "Összes %s megjelenítése."
 
-#: src/messageview.c:1919
+#: src/messageview.c:1916
 msgid "Only the first megabyte of text is shown."
 msgstr "Csak a szöveg első megabájtja jelenik meg."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1947
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr ""
 
-#: src/messageview.c:1953
+#: src/messageview.c:1950
 msgid "You asked for a return receipt in this message."
 msgstr "Az üzenet visszaigazolást kér."
 
-#: src/messageview.c:1959
+#: src/messageview.c:1956
 msgid "This message asks for a return receipt."
 msgstr "Ez az üzenet visszaigazolást kér."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1957
 msgid "Send receipt"
 msgstr "Visszaigazolás küldése"
 
-#: src/messageview.c:2003
+#: src/messageview.c:2000
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -9024,7 +9024,7 @@ msgstr ""
 "és törölve lesz a szerverről."
 
 # src/compose.c:5094
-#: src/messageview.c:2009
+#: src/messageview.c:2006
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -9033,15 +9033,15 @@ msgstr ""
 "Az üzenet csak részben érkezett meg.\n"
 "%s"
 
-#: src/messageview.c:2013 src/messageview.c:2035
+#: src/messageview.c:2010 src/messageview.c:2032
 msgid "Mark for download"
 msgstr "Kijelölés letöltésre"
 
-#: src/messageview.c:2014 src/messageview.c:2026
+#: src/messageview.c:2011 src/messageview.c:2023
 msgid "Mark for deletion"
 msgstr "Kjelölés törlésre"
 
-#: src/messageview.c:2019
+#: src/messageview.c:2016
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -9052,12 +9052,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:2024 src/messageview.c:2037
+#: src/messageview.c:2021 src/messageview.c:2034
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Kijelölés visszavonása"
 
-#: src/messageview.c:2030
+#: src/messageview.c:2027
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -9066,11 +9066,11 @@ msgstr ""
 "Az üzenet részben lett letöltv