added new account option 'Put signature before quote (not recommended)'.

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

36 files changed, 5960 insertions, 5797 deletions

diff --git a/ChangeLog b/ChangeLog
index 68fce7d8..43ea8dc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2010-07-30
 
+	* libsylph/folder.c: folder_destroy(): remove private data after
+	  folder_tree_destroy() to prevent warnings.
+	* libsylph/prefs_account.[ch]
+	  src/compose.c
+	  src/prefs_account_dialog.c: added new account option 'Put signature
+	  before quote (not recommended)'.
+
+2010-07-30
+
 	* src/summaryview.c: summary_selection_changed(): don't clear message
 	  view on multiple selection and always_show_msg mode.
 	* libsylph/prefs_common.c: made always_show_message_when_selected
diff --git a/libsylph/folder.c b/libsylph/folder.c
index c6cb8a74..74ab3df7 100644
--- a/libsylph/folder.c
+++ b/libsylph/folder.c
@@ -131,15 +131,18 @@ void folder_destroy(Folder *folder)
 	g_return_if_fail(folder != NULL);
 	g_return_if_fail(folder->klass->destroy != NULL);
 
+	debug_print("folder_destroy: destroying Folder (%p)\n", folder);
+
 	folder->klass->destroy(folder);
 
 	folder_list = g_list_remove(folder_list, folder);
 
+	folder_tree_destroy(folder);
+
 	priv = folder_get_priv(folder);
 	folder_priv_list = g_list_remove(folder_priv_list, priv);
 	g_free(priv);
 
-	folder_tree_destroy(folder);
 	g_free(folder->name);
 	g_free(folder);
 }
@@ -419,7 +422,7 @@ void folder_add(Folder *folder)
 	gint i;
 	FolderPrivData *priv;
 
-	debug_print("Adding folder (%p) to folder list\n", folder);
+	debug_print("Adding Folder (%p) to folder list\n", folder);
 
 	g_return_if_fail(folder != NULL);
 
diff --git a/libsylph/prefs_account.c b/libsylph/prefs_account.c
index c9eee518..6682af7a 100644
--- a/libsylph/prefs_account.c
+++ b/libsylph/prefs_account.c
@@ -1,6 +1,6 @@
 /*
  * LibSylph -- E-Mail client library
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2010 Hiroyuki Yamamoto
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -84,6 +84,8 @@ static PrefParam param[] = {
 	{"signature_path", "~" G_DIR_SEPARATOR_S DEFAULT_SIGNATURE,
 	 &tmp_ac_prefs.sig_path, P_STRING},
 	{"signature_text", NULL, &tmp_ac_prefs.sig_text, P_STRING},
+	{"signature_before_quote", "FALSE", &tmp_ac_prefs.sig_before_quote,
+	 P_BOOL},
 	{"set_autocc", "FALSE", &tmp_ac_prefs.set_autocc, P_BOOL},
 	{"auto_cc", NULL, &tmp_ac_prefs.auto_cc, P_STRING},
 	{"set_autobcc", "FALSE", &tmp_ac_prefs.set_autobcc, P_BOOL},
diff --git a/libsylph/prefs_account.h b/libsylph/prefs_account.h
index 1e9bd4b0..d666fd1b 100644
--- a/libsylph/prefs_account.h
+++ b/libsylph/prefs_account.h
@@ -166,6 +166,9 @@ struct _PrefsAccount
 	gint account_id;
 
 	RemoteFolder *folder;
+
+	/* Compose */
+	gboolean  sig_before_quote;
 };
 
 PrefsAccount *prefs_account_new		(void);
diff --git a/po/be.po b/po/be.po
index bb6d1e8f..9f503fe5 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2010-02-22 15:22+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -487,7 +487,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "памылка здарылася падчас сеансу POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "не атрымалася запісаць канфігурацыю ў файл\n"
@@ -686,14 +686,14 @@ msgstr ""
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Назва"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Пратакол"
 
@@ -821,7 +821,7 @@ msgstr "Карыстальніцкі аргумент дзеяння"
 msgid "Add Address to Book"
 msgstr "Дадаць Адрас у Кнігу"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адрас"
@@ -992,7 +992,7 @@ msgstr "Адрасная кніга"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Каталог"
 
@@ -1004,17 +1004,17 @@ msgstr "Адрас эл.пошты"
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Каму:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Скрытая копія:"
@@ -1221,7 +1221,7 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабовы адрас"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Заўвага"
 
@@ -1565,107 +1565,107 @@ msgstr "/_Прылады/Правяраць правапі_с"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Прылады/_Наставіць мову правапісу"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існуе\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Нельга атрымаць частку тэкста\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Памылка фармату пазнакі цытаты."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Памылка фармату адказу/перасылкі паведамлення."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існуе\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Нельга атрымаць памер файла %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пусты."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Нельга прачытаць %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Паведамленне: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку складанага паведамлення."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Напісанне%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Не указаны атрымальнік."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Пустая тэма"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тэма не азначаная. Выслаць як ёсць?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 msgid "Attachment is missing"
 msgstr "Адсутнічаюць дадаткі"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Ліст не мае дадаткаў. Выслаць яго без дадаткаў?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "Праверыць атрымальнікаў"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 msgid "Really send this mail to the following addresses?"
 msgstr "Насамрэч даслаць гэты ліст на наступныя адрасы?"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Адпраўнік:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тэма:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 msgid "_Send"
 msgstr "Адпра_віць"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1673,38 +1673,38 @@ msgstr ""
 "Не указаны уліковы рахунак для адпраўкі пошты.\n"
 "Калі ласка, выберыце акаунт перад адпраўленнем."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Памылка пад час адпраўкі паведамлення да %s."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Нельга запісаць паведамленне ў `Дасланыя'."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Не знойдзена ніводнага ключа, асацыяванага з выбраным ідэнтыфікатарам `%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 msgid "Can't sign the message."
 msgstr "Нельга падпісаць паведамленне."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 msgid "Can't encrypt the message."
 msgstr "Нельга зашыфраваць паведамленне."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 msgid "Can't encrypt or sign the message."
 msgstr "Нельга зашыфраваць ці падпісаць паведамленне."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "нельга змяніць рэжым файла\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1715,11 +1715,11 @@ msgstr ""
 "\n"
 "Выслаць у %s, як ёсць?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Памылка канверсіі коду"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1732,15 +1732,15 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Ліміт даўжыні радка"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Шыфраваць з `Bcc'"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1754,96 +1754,96 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "нельга сцерці старое паведамленне\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "даданне паведамлення ў чаргу...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "не знойдзены каталог чаргі\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "нельга змясціць паведамленне ў чаргу\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існуе."
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "Нельга адкрыць файл %s."
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "сгенераваны Message-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Стварэнне вакна напісання...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Подпіс PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Шыфр PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "тып MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Памер"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Няправільны тып MIME."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існуе ці пусты."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Уласцівасці"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Кадаванне"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Назва файла"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: файл не існуе\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Адкрыццё выканальнага файла"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1854,12 +1854,12 @@ msgstr ""
 "Калі вы жадаеце запусціць яго, запішыце дзе-небудзь, і ўпэўніцеся, што гэта "
 "не вірус ці нешта кшталту шкодных праграм."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Няправільны радок загаду для вонкавага рэдактара: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1868,48 +1868,48 @@ msgstr ""
 "Вонкавы рэдактар яшчэ працуе.\n"
 "Скончыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "На_ставіць стужку прылад..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Нельга змясціць паведамленне ў чаргу."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Выбраць файлы"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Выбраць файл"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Запісаць паведамленне"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Гэта паведамленне было зменена. Запісаць у каталог чарнавікоў?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Закры_ць без запісу"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Жадаеце ужыць шаблон `%s'?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Ужыць шаблон"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Уставіць"
 
@@ -2008,7 +2008,7 @@ msgid " Check File "
 msgstr " Праверыць файл"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Файл"
 
@@ -2088,7 +2088,7 @@ msgid "Edit JPilot Entry"
 msgstr "Змяніць запіс JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2153,7 +2153,7 @@ msgstr "Таймаут (сек)"
 msgid "Maximum Entries"
 msgstr "Максімум запісаў"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Базавыя"
 
@@ -2239,7 +2239,7 @@ msgid "MH (number only)"
 msgstr "MH (толькі нумар)"
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Выбраць... "
 
@@ -4259,232 +4259,232 @@ msgstr "Файл: "
 msgid "Description: "
 msgstr "Апісанне: "
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Адкрыццё вакна пераважанняў акаунта...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Акаунт%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Настаўленні новага акаунта"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Настаўленні акаунта"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Стварэнне вакна пераважанняў акаунта...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Атрыманне"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Адпраўка"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Напісанне"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Прыватнасць"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Адмысловыя"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Назва гэтага акаунта"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Пазначыць тыповым"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Асабовая інфармацыя"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Поўнае імя"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Паштовы адрас"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Арганізацыя"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Інфармацыя аб серверы"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Навіны (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Няма (лакальны)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Гэты сервер патрабуе аўтэнтыфікацыю"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Сервер навін"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Сервер для атрымання"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP-сервер (адпраўка)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "ID карыстальніка"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Пароль"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Ужываць бяспечную аўтэнтыфікацыю (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Сціраць лісты з сервера па атрыманні"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Сціраць пасля"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "дзён"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "(0 дзён: сціраць неадкладна)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "Загружаць усе паведамленні (таксама ўжо атрыманыя) з сервера"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Ліміт памеру атрымання"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "КБ"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Фільтраваць лісты падчас атрымання"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Тыповы inbox"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Неадфільтраваныя лісты застануцца ў гэтым каталогу."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Метад аўтэнтыфікацыі"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Правяраць толькі INBOX падчас атрымання"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Фільтраваць новыя лісты ў INBOX падчас атрымання"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Навіны"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Максімум артыкулаў для загрузкі"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Без абмежавання, калі указаны 0."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Атр.усе' правярае новыя паведамленні для гэтага акаунта"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Загаловак"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Дадаць поле Дата да загалоўка"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Генераваць Message-ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Дадаць загаловак, зададзены карыстальнікам"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Рэдагаваць..."
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Аўтэнтыфікацыя"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Аўтэнтыфікацыя SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4492,203 +4492,207 @@ msgstr ""
 "Калі вы пакінеце гэтыя палі пустымі, будуць ужытыя тыя ж ID карыстальніка і "
 "пароль, што і для атрымання."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Аўтэнтыфікацыя POP3 перад адпраўленнем"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Подпіс"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Непасрэдны ўвод"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Вывад загада"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Аўтаматычна ўпісваць наступныя адрасы"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Копія"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Скрытая копія"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Зваротны адрас"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "Тыпова падпісваць паведамленні PGP"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "Тыпова шыфраваць паведамленні PGP"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Шыфраваць пры адказе на шыфраванае паведамленне"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Ужываць фармат ASCII-armored для шыфравання"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Устаўляць подпіс чыстым тэкстам"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Ключ подпісу"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Ужываць тыповы ключ GnuPG"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Выбар ключа праз свой адрас эл.пошты"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Задаць ключ самастойна"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "ID карыстальніка ці ключа:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Не ўжываць SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Ужываць SSL для злучэння POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Ужываць загад STARTTLS, каб пачаць сеанс SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Ужываць SSL для злучэння IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Ужываць SSL для злучэння NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Адпраўка (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Ужываць SSL для злучэння SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Ужываць не-блакавальны SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Выключце гэта, калі маеце праблемы з SSL злучэннем."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Задаць порт SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Задаць порт POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Задаць порт IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Задаць порт NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Задаць даменнае імя"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP4."
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Толькі падкаталогі гэтага каталога будуць паказаны."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Ачышчаць усе кэшы паведамленняў пры выхадзе"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Змяшчаць дасланыя лісты ў"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Змяшчаць чарнавікі ў"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Змяшчаць чаргу ў"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Змяшчаць сцёртыя лісты ў"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Не ўведзена назва акаунта."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Не ўведзены адрас эл.пошты."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Не ўведзены сервер SMTP."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Не ўведзены ID карыстальніка."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Не ўказаны сервер POP3."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Не ўказаны сервер IMAP4."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Не ўказаны сервер NNTP."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "Указаны каталог не з'яўляецца каталогам чаргі."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/bg.po b/po/bg.po
index b34b9599..9dd0cc02 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -487,7 +487,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "грешка при POP3 сесията\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "неуспешно записване на настройките във файл\n"
@@ -689,14 +689,14 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Име"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -826,7 +826,7 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адрес"
@@ -1002,7 +1002,7 @@ msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
@@ -1015,17 +1015,17 @@ msgstr "E-Mail адрес"
 msgid "Search:"
 msgstr "Търсене"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1240,7 +1240,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1625,111 +1625,111 @@ msgstr "/_Инструменти/_Изпълнение"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Притурки"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Изпращане"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1737,40 +1737,40 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1781,12 +1781,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1795,15 +1795,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1812,98 +1812,98 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не може да се отвори файл %s\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Аксесоари"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1911,12 +1911,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1926,52 +1926,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2072,7 +2072,7 @@ msgid " Check File "
 msgstr " Проверка на файл "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Файл"
 
@@ -2153,7 +2153,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактиране на JPilot запис"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2218,7 +2218,7 @@ msgstr "Пауза (сек)"
 msgid "Maximum Entries"
 msgstr "Максимум записи"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Основни"
 
@@ -2310,7 +2310,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Избор..."
 
@@ -4402,242 +4402,242 @@ msgstr "Файл"
 msgid "Description: "
 msgstr "Описание"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Отваряне на прозорец с предпочитанията за акаунта...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Акаунт%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Предпочитания за нов акаунт"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Предпочитания за акаунт"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Създаване на прозорец с предпочитанията за акаунта...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Получаване"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Изпращане"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Съставяне"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Неприкосновеност"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Напреднал"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Име на акаунтът"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Установяване като подразбиращ се"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Лична информация"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Пълно име"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Пощенски адрес"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Организация"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Информация за сървъра"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Новини (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Без (локално)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Сървърът изисква удостоверяване"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Новинарски сървър"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Сървър за получаване"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP сървър (изпращане)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Потребителски ID"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Парола"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Сървърът изисква удостоверяване"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Изтриване съобщенията от сървъра когато се получат"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Премахване след"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "дни"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 дни: незабавно премахване)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Изтегляне на всички съобщения от сървъра"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Ограничение на размера при получаване"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "КB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Филтриране на съобщенията при получаване"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Входяща кутия"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Нефилтрираните съобщения ще бъдат съхранявани в тази папка)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Метод на удостоверяване"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Само при ръчно получаване"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Филтриране на съобщенията при получаване"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Новини"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Максимален брой изтегляни статии\n"
 "(неограничено ако е въведена 0)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Не е указан получател"
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Получаване всички' проверява за нови съобщения в този акаунт"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заглавна част"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Добавяне на заглавна част Дата"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Генериране на Message-ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Добавяне на заглавна част от потребителя"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Редактиране... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Удостоверяване"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Удостоверяване (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4646,208 +4646,212 @@ msgstr ""
 "Ако оставите тези полета празни, ще бъдат използвани\n"
 "същите user ID и парола като за получаване."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Удостоверяване с POP3 преди изпращане"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Сигнатура"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Изход на команда"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Отговор-до"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Подписване по подразбиране"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Криптиране по подразбиране"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Използване на ASCII-armored формат за криптиране"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Използване на подпис в чист текст"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Подписващ ключ"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Използване на подразбиращия се GnuPG ключ"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Избор на ключ по вашия email адрес"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Ръчен избор на ключ"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "ID на потребителя или ключа:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Не се използва SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Използване на SSL за POP3 връзка"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Използване на STARTTLS команда за старт на SSL сесия"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Използване на SSL за IMAP4 връзка"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Използване на SSL за NNTP връзка"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Изпращане (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Използване на SSL за SMTP връзка"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Използване на неблокиращ SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Изключете ако имате проблеми с SSL връзка)"
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Определяне на SMTP порт"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Определяне на POP3 порт"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Определяне на IMAP4 порт"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Определяне на NNTP порт"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Определяне на име на домейн"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP директория на сървъра"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Изтегляне на всички съобщения от сървъра"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Поставяне на изпратени съобщения в"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Поставяне на черновите в"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Поставяне на изтрити съобщения в"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Поставяне на изтрити съобщения в"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Не е въведено име на акаунта."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Не е въведен пощенски адрес."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Не е въведен SMTP сървър."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Не е въведен потребителски ID."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Не е въведен POP3 сървър."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Не е въведен IMAP4 сървър."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Не е въведен NNTP сървър."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/cs.po b/po/cs.po
index d6c646db..22b2d111 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2010-02-18 23:39+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -495,7 +495,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "v relaci POP3 se vyskytla chyba\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "selhání při zápisu nastavení do souboru\n"
@@ -694,14 +694,14 @@ msgstr ""
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -829,7 +829,7 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do adresáře"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresa"
@@ -1000,7 +1000,7 @@ msgstr "Adresář"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Složka"
 
@@ -1012,17 +1012,17 @@ msgstr "E-mailová adresa"
 msgid "Search:"
 msgstr "Hledat:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Příjemce:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
@@ -1225,7 +1225,7 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1569,107 +1569,107 @@ msgstr "/_Nástroje/Kontrolovat pravopi_s"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/_Nastavit jazyk pro kontrolu pravopisu"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Nelze získat textovou část\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Chyba ve formátu uvozovek."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/předání."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nelze zjistit velikost souboru %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Nelze načíst %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nelze získat část ze zprávy s více částmi."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Bez předmětu)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Není uveden předmět"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto odeslat?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 msgid "Attachment is missing"
 msgstr "Příloha není obsažena"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Není obsažena příloha. Odeslat bez příloh?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "Zkontrolovat příjemce"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 msgid "Really send this mail to the following addresses?"
 msgstr "Opravdu odeslat tuto zprávu na následující adresy?"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "nelze načíst seznam příjemců."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1677,38 +1677,38 @@ msgstr ""
 "Není zadán účet k odesílání e-mailů.\n"
 "Před odesláním prosím vyberte nějaký účet."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Při posílání zprávy na %s se vyskytla chyba."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nelze vyhledat žádný klíč asociovaný s aktuálně vybraným ID klíče \"%s\"."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 msgid "Can't sign the message."
 msgstr "Zprávu nelze podepsat."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 msgid "Can't encrypt the message."
 msgstr "Zprávu nelze šifrovat."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 msgid "Can't encrypt or sign the message."
 msgstr "Zprávu nelze šifrovat nebo podepsat."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "nelze změnit práva souboru\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1719,11 +1719,11 @@ msgstr ""
 "\n"
 "Přesto odeslat jako %s?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Chyba při konverzi kódu"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1736,15 +1736,15 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Maximální délka řádku"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Šifrování s příjemci skryté kopie"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1758,96 +1758,96 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "nelze odstranit starou zprávu\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "zařazování zprávy...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "nelze vyhledat složku pozdržených zpráv\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "zprávu nelze zařadit\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Soubor %s neexistuje."
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nelze otevřít soubor %s."
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytváří se ID zprávy: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Vytváří se okno psaní zprávy...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Podepsat PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Šifrovat PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "Typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Vlastnosti"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Otevírá se spustitelný soubor"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1859,12 +1859,12 @@ msgstr ""
 "Pokud chcete soubor spustit, nejprve jej uložte a ujistěte se, že nejde o "
 "virus či nějaký nebezpečný program."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Chybný příkaz pro externí editor: \"%s\"\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1873,48 +1873,48 @@ msgstr ""
 "Externí editor stále pracuje.\n"
 "Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Vybrat soubory"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Uložit zprávu"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah zprávy se změnil. Uložit do složky konceptů?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "Na_hradit"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "V_ložit"
 
@@ -2013,7 +2013,7 @@ msgid " Check File "
 msgstr " Otestovat soubor "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Soubor"
 
@@ -2094,7 +2094,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upravit záznam JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2159,7 +2159,7 @@ msgstr "Časový limit (v sek.)"
 msgid "Maximum Entries"
 msgstr "Maximum položek"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Základní"
 
@@ -2245,7 +2245,7 @@ msgid "MH (number only)"
 msgstr "MH (pouze číslo)"
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Vybrat... "
 
@@ -4270,232 +4270,232 @@ msgstr "Soubor: "
 msgid "Description: "
 msgstr "Popis: "
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Otevírání okna s nastavením účtu...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Nastavení nového účtu"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Nastavení účtu"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Vytváří se okno nastavení účtu...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Příjem"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Soukromí"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Rozšířené"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Název tohoto účtu"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Osobní informace"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "E-mailová adresa"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organizace"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Informace o serveru"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Žádný (místní)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Server news"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Server pro příjem"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Server SMTP (odesílání)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Uživatelské jméno"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Používat bezpečnou autentizaci (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Odstraňovat zprávy na serveru po jejich přijmutí"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Odstraňovat po"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "dnech"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 dnů: odstraňovat ihned"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "Přijímat všechny zprávy ze serveru (včetně již přijatých)"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Maximální velikost pro příjem"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtrovat zprávy při příjmu"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Výchozí doručená pošta"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Nefiltrované zprávy budou ukládány v této složce."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automaticky rozpoznat"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Při příjmu kontrolovat pouze složku doručené pošty"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrovat zprávy v doručené poště při příjmu"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Diskusní skupiny"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Maximální počet příspěvků ke stažení"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Neomezeně, pokud je zadána 0."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "Při volbě \"Přijmout vše\" zjišťovat, zda existují nové zprávy"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Záhlaví"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Přidávat do záhlaví pole s datem"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Generovat ID zprávy"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Přidávat uživatelsky definované záhlaví"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Upravit... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Autentizace"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentizace SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4503,203 +4503,207 @@ msgstr ""
 "Pokud necháte tyto položky prázdné, bude použito uživatelské jméno a heslo k "
 "příjmu zpráv."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizace s POP3 před odesláním"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Přímý vstup"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavovat následující adresy"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Kopie"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Skrytá kopie"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Odpovědi zaslat na"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "Vždy přidávat podpis PGP"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "Vždy šifrovat zprávu"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Šifrovat při odpovídání na šifrovanou zprávu"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Při šifrování používat formát ASCII-armored"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Používat čistý textový podpis"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Podpisový klíč"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Používat výchozí klíč GnuPG"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Vybírat klíč podle e-mailové adresy"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Zadat klíč ručně"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "ID uživatele nebo klíče:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Nepoužívat SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Používat SSL při spojení přes POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Používat příkaz STARTTLS ke spuštění relace SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Používat SSL při spojení přes IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Používat SSL při spojení přes NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Odesílání (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Používat SSL při spojení přes SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Používat neblokující SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Zrušte tuto volbu v případě problémů se spojením SSL."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Určit port SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Určit port POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Určit port IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Určit port NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Určit název domény"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Adresář serveru IMAP"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Budou zobrazeny pouze podsložky tohoto adresáře."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Při ukončení mazat veškerou vyrovnávací paměť zpráv"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Ukládat odeslané zprávy do"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Ukládat pozdržené zprávy do"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Ukládat smazané zprávy do"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Nebyl zadán název účtu."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Nebyla zadána e-mailová adresa."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Nebyl zadán server SMTP."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Nebylo zadáno uživatelské jméno."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Nebyl zadán server POP3."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Nebyl zadán server IMAP4."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Nebyl zadán server NNTP."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "Zvolená složka není složkou s pozdrženými zprávami."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/da.po b/po/da.po
index a68abf6e..ae3fec39 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -491,7 +491,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "fejl under POP3 session\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "kunne ikke gemme konfiguration til fil\n"
@@ -693,14 +693,14 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Navn"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -830,7 +830,7 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresse"
@@ -1006,7 +1006,7 @@ msgstr "Adressebog"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Mappe"
 
@@ -1019,17 +1019,17 @@ msgstr "E-post adresse"
 msgid "Search:"
 msgstr "Søg"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1238,7 +1238,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Note"
 
@@ -1623,111 +1623,111 @@ msgstr "/_Funktioner/_Udfør"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Vedhæftet"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Emne:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Send"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1735,40 +1735,40 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kunne ikke funde nøgle til den valgte nøgle id `%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1779,12 +1779,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1793,15 +1793,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1810,98 +1810,98 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan ikke åbne filen %s\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Egenskaber"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1909,12 +1909,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1924,52 +1924,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2070,7 +2070,7 @@ msgid " Check File "
 msgstr " Check fil "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Fil"
 
@@ -2151,7 +2151,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigér JPilot indtastning"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2216,7 +2216,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. indtastninger"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Enkelt"
 
@@ -2308,7 +2308,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Vælg... "
 
@@ -4404,239 +4404,239 @@ msgstr "Fil"
 msgid "Description: "
 msgstr "Beskrivelse"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Åbner konti egenskaber...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Opsæt af ny konto"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Konto opsæt"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Opretter konto egenskaber...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Modtag"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Send"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Opret"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privat"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Navn på denne konto"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Standard konto"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Personlige informationener"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Fuldt navn"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "E-post adresse"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Server data"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Ingen (lokal)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Dennes server kræver godkendelse"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Nyheds server"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Server til modtagelse"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP server (afsendelse)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Bruger ID"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Adgangskode"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Dennes server kræver godkendelse"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Slet meddelelser fra server efter modtagelse"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Slet efter"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "dage"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dage: slet straks)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Hent alle meddelelser fra server"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Modtagelses størrelse maks."
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "kB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtrere meddelelse ved modtagelse"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Standard indbakke"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Godkendelses metode"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrere meddelelse ved modtagelse"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Nyheder"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr "Max antal artikler ved hentning (0 angiver alle)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Mangler modtager"
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Hent alle' henter post fra denne konto"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Hoved"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Tilføj dato linie"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Opret meddelelses ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Tilføj bruger defineret hoved"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Redigér... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP godkendelse (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4645,208 +4645,212 @@ msgstr ""
 "Hvis du lader disse være tomme, benyttes\n"
 "samme bruger ID og adgangskode som ved modtagelse."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Godkend med POP3 før afsendelse"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Underskrift"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Kommando tekst"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Svar til"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Signer altid meddelelse"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Krypter altid meddelelser"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Benyt ASCII format til kodning"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Benyt klar tekst underskrift"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Underskrifts nøgle"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Benyt standard GnuPg nøgle"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Vælg nøgle efter e-post adresse"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Angiv nøgle manuelt"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Bruger eller nøgle ID"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Benyt ikke SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Benyt SSL til POP3 forbindelse"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Benyt STARTTLS kommando til at starte SSL session"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Benyt SSL til IMAP4 forbindelse"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Benyt SSL til NNTP forbindelse"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Send (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Benyt SSL til SMTP forbindelse"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Benyt ublokerende SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Slp dette fra hvis du har problemer med SSL forbindelser)"
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Angiv SMTP port"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Angiv POP3 port"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Angiv IMAP4 port"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Angiv NNTP port"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Angiv domæne navn"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP server sti."
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Hent alle meddelelser fra server"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Gem sendte meddelelser i"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Gem kladde i"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Gem slettede meddelelser i"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Gem slettede meddelelser i"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Konto navn er ikke angivet."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "E-post adresse ikke angivet."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "SMTP server ikke angivet."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Bruger ID ikke angivet."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "POP3 server ikke angivet."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server ikke angivet"
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "NNTP server ikke angivet."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/de.po b/po/de.po
index 0af46414..222cba46 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -491,7 +491,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "Fehler während einer POP3-Sitzung\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "konnte nicht in die Konfigurationsdatei schreiben\n"
@@ -694,14 +694,14 @@ msgstr ""
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Name"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -829,7 +829,7 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresse"
@@ -1001,7 +1001,7 @@ msgstr "Adressbuch"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Ablage"
 
@@ -1013,17 +1013,17 @@ msgstr "E-Mail Adresse"
 msgid "Search:"
 msgstr "Suchen:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1230,7 +1230,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1574,110 +1574,110 @@ msgstr "/_Werkzeuge/_Rechtschreibprüfung"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Werkzeug/_Sprache einstellen"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Verfassen%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Leerer Betreff"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Anhänge"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Setze folgende Adressen automatisch"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Senden"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1685,40 +1685,40 @@ msgstr ""
 "Account zum Versenden von E-Mails, wurde nicht angegeben.\n"
 "Bitte wählen sie einen E-Mail-Account vor dem Senden."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kein Schlüssel für die aktuelle gewählte Schlüssel-ID vorhanden '%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1729,11 +1729,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1746,15 +1746,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Mit Bcc verschlüsseln"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1768,96 +1768,96 @@ msgstr ""
 "\n"
 " Dennoch versenden? "
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Datei %s existiert nicht."
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "Kann Datei %s nicht öffnen."
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Eigenschaften"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Öffne ausführbare Datei"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1869,12 +1869,12 @@ msgstr ""
 "Wenn Sie es starten möchten, speichern Sie es irgendwo und stellen Sie "
 "sicher,dass es sich nicht um einen Virus oder anderen Schadcode handelt."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Kommandozeile für den externen Editor ist ungültig: '%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1883,48 +1883,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "_Werkzeugleiste anpassen"
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -2023,7 +2023,7 @@ msgid " Check File "
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Datei"
 
@@ -2103,7 +2103,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot-Eintrag bearbeiten"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2168,7 +2168,7 @@ msgstr "Timeout (Sek.)"
 msgid "Maximum Entries"
 msgstr "Einträge (Max.)"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Einfach"
 
@@ -2260,7 +2260,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Auswählen... "
 
@@ -4311,234 +4311,234 @@ msgstr "Datei"
 msgid "Description: "
 msgstr "Beschreibung"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Öffne Accounteinstellungenfenster...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Einstellungen eines neuen Accounts"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Accounteinstellungen"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Erstelle Accounteinstellungenfenster...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Senden"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privat"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Speziell"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Name dieses Accounts"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Standard-Account"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Serverdaten"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Keiner (lokal)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Dieser Server benötigt Beglaubigung"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Newsserver"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP-Server (senden)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Kennwort"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Verwende sichere Beglaubigung (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Nachrichten vom Server nach Empfang löschen"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Entfernen nach"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "Tag(en)"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 Tage: sofort entfernen"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr ""
 "Lade alle Nachrichten )inklusive bereits empfangener) vom Server herunter"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Grenze für Nachrichtengöße beim Empfang"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Nachrichten beim Empfang filtern"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Standard Posteingang"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ungefilterte Nachrichten werden in dieser Ablage gespeichert."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Prüfe INBOX nur beim Empfang"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtere neue Nachrichten in der INBOX beim Empfang"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Maximum an herunterzuladenden Artikeln"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Ohne Begrenzung, wenn 0 angegeben"
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 "`Hole alle' übeprüft ob neue Nachrichten für diesen Account vorhanden sind"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Kopfzeilen"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Füge Datum in Kopfzeile ein"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Erzeuge Nachrichten-ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Füge benutzerdefinierte Kopfzeile ein"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Bearbeiten... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Beglaubigung"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Beglaubigung (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4546,203 +4546,207 @@ msgstr ""
 "Wenn Sie diese Einträge frei lassen, wird\n"
 "dieselbe ID und dasselbe Passwort wie zum Empfang verwendet."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Beglaubige mit POP3 vor dem Senden"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Direkteingabe"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Befehlsausgabe"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Setze folgende Adressen automatisch"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "Nachrichten standardmäßig mit GPG signieren"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "Nachrichten immer mit PGP verschlüsseln"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Verschlüssele beim Antworten auf verschlüsselte Nachricht"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Benutze ASCII-Hüllen Format zum Verschlüsseln"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Benutze digitale Klartext-Unterschrift"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Schlüssel für digitale Unterschrift"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Benutze voreingestellten GnuPG-Schlüssel"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Wähle Schlüssel nach E-Mail Adresse"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Schlüssel manuell angeben"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Benutzer- oder Schlüssel-ID"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "SSL nicht benutzen"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "SSL für POP3-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Für SSL-Sitzung STARTTLS-Befehl benutzen"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL für IMAP4-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "SSL für NNTP-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "SSL für SMTP-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Benutze non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Ausschalten, wenn Probleme mit der SSL-Verbindung."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "SMTP-Port angeben"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "POP3-Port angeben"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "IMAP4-Port angeben"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "NNTP-Port angeben"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Domännamen angeben"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP-Serververzeichnis."
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Nur die Unterablagen dieses Verzeichnisses werden angezeigt."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Alle Nachrichtenzwischenspeicher beim Beenden leeren"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten speichern in"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Entwürfe speichern in"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Nachrichten der Warteschlange speichern in"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Gelöschte Nachrichten speichern in"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Keine Account-Name angegeben."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse angegeben."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Keinen SMTP-Server angegeben."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID angegeben."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Keinen POP3-Server angegeben."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Keinen IMAP4-Server angegeben."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Keinen NNTP-Server angegeben."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "Ausgewählte Ablage ist keine Warteschlangen-Ablage."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/el.po b/po/el.po
index 30361d12..5f3d9040 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -497,7 +497,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "Προέκυψε σφάλμα στη συνεδρία POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "Η εγγραφή στο αρχείο ρυθμίσεων απέτυχε\n"
@@ -706,14 +706,14 @@ msgstr ""
 "όλων'."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Όνομα"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
@@ -842,7 +842,7 @@ msgstr "Παράμετρος ενέργειας χρήστη"
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο ευρετήριο"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Διεύθυνση"
@@ -1015,7 +1015,7 @@ msgstr "Κατάλογος διευθύνσεων"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Φάκελος"
 
@@ -1027,17 +1027,17 @@ msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 msgid "Search:"
 msgstr "Αναζήτηση:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
@@ -1257,7 +1257,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1604,110 +1604,110 @@ msgstr "/_Εργαλεία/Ορθογραφικός έλε_γχος"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Εργαλεία/Ορισμός _γλώσσας ορθογραφίας"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Δεν είναι δυνατή η λήψη του κειμένου\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Σφάλμα μορφοποίησης σημείωσης παράθεσης."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Σφάλμα στην απάντηση/προώθηση του μηνύματος."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν είναι δυνατή η λήψη του μεγέθους του %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι κενό."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Δεν είναι δυνατή η ανάγνωση του %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Δεν έχει οριστεί παραλήπτης."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Κενό θέμα"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Το θέμα είναι κενό. Να γίνει η αποστολή;"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Συνημμένα"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1715,43 +1715,43 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Δημιουργήθηκε σφάλμα κατά την αποστολή του μηνύματος στο %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Δεν είναι δυνατή η αποθήκεύσή του μηνύματος στα εξερχόμενα."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Δεν ήταν δυνατή η εύρεση του κλειδιού που σχετίζεται με το επιλεγμένο "
 "αναγνωριστικό `%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "Η αλλαγή της κατάστασης του `%s' απέτυχε"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1762,11 +1762,11 @@ msgstr ""
 "του μηνύματος στο προσδιορισμένο σύνολο %s.\n"
 "Να αποσταλεί ως %s;"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής κώδικα"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1779,15 +1779,15 @@ msgstr ""
 "\n"
 "Να γίνει αποστολή;"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Όριο μήκους γραμμής"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Κρυπτογράφηση στους κρυφούς παραλήπτες"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1801,97 +1801,97 @@ msgstr ""
 "\n"
 "Να γίνει η αποστολή;"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του παλιού μηνύματος\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "προσθήκη στην ουρά...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "Δεν είναι δυνατή η εύρεση του πηγαίου φακέλου."
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr ""
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Δημιουργία παραθύρου σύνθεσης...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Υπογραφή PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Κρυπτογράφηση PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Ιδιότητες"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Άνοιγμα εκτελέσιμου αρχείου"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1899,14 +1899,14 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, fuzzy, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 "Η εντολή εκτύπωσης είναι άκυρη:\n"
 "'%s'"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1916,49 +1916,49 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Επιλογή αρχείων"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Αποθήκευση μηνύματος"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Αυτό το μήνυμα έχει τροποποιηθεί. Θέλετε να το αποθηκεύσετε στα πρόχειρα;"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε να εφαρμόσετε το πρότυπο '%s' ;"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -2058,7 +2058,7 @@ msgid " Check File "
 msgstr " Έλεγχος αρχείου "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Αρχείο"
 
@@ -2139,7 +2139,7 @@ msgid "Edit JPilot Entry"
 msgstr "Επεξεργασία εγγραφής JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2204,7 +2204,7 @@ msgstr "Λήξη χρονικού ορίου (δευτ)"
 msgid "Maximum Entries"
 msgstr "Μέγιστες εγγραφές"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Βασικά"
 
@@ -2298,7 +2298,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Επιλογή ... "
 
@@ -4377,234 +4377,234 @@ msgstr "Αρχείο"
 msgid "Description: "
 msgstr "Περιγραφή"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Άνοιγμα παράθυρου προτιμήσεων...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Λογαριασμός%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Επιλογές για το νέο λογαριασμό"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Προτιμήσεις λογαριασμού"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Δημιουργία παράθυρου προτιμήσεων λογαριασμού...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Λήψη"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Σύνθεση"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Απόρρητο"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Προχωρημένες"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Όνομα λογαριασμού"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Ορισμός ως προεπιλεγμένου"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Προσωπικές πληροφορίες"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Πλήρες όνομα"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Διεύθυνση αλληλογραφίας"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Πληροφορίες διακομιστή"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Νέα (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Κανένα (τοπικό)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Αυτός ο διακομιστής απαιτεί πιστοποίηση"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Διακομιστής νέων"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Εξυπηρέτης για λήψη"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Διακομιστής SMTP (αποστολή)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Όνομα χρήστη"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Χρήση ασφαλούς πιστοποίησης (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Διαγραφή μηνυμάτων από τον διακομιστή όταν παραληφθούν"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Διαγραφή μετά"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "ημέρες"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 μέρες: άμεση διαγραφή"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "Λήψη όλων των μηνυμάτων (και των ήδη ληφθέντων) από τον διακομιστή"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Όριο μεγέθους για λήψη"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Προεπιλεγμένος φάκελος εισερχομένων"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Τα μη φιλτραρισμένα μηνύματα θα αποθηκεύονται σε αυτό τον φάκελο"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Μέθοδος πιστοποίησης"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Αυτόματη"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Μόνο στη χειροκίνητη λήψη"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Νέα"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Μέγιστος αριθμός άρθρων που θα ληφθούν"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "χωρίς όριο αν θέσετε 0."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "Το `Λήψη όλων' ελέγχει για νέα μηνύματα σε αυτό το λογαριασμό"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Επικεφαλίδα"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Προσθήκη κεφαλίδας ημερομηνίας"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Δημιουργία Message-ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Προσθήκη κεφαλίδας ορισμένης από τον χρήστη"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Επεξεργασία... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Πιστοποίηση"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Πιστοποίηση SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4612,204 +4612,208 @@ msgstr ""
 "Εάν αφήσετε αυτά τα πεδία άδεια, θα χρησιμοποιηθούν το ίδιο όνομα χρήστη και "
 "κωδικός όπως για τη λήψη."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Πιστοποίηση με POP3 πριν την αποστολή"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Yπογραφή"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Απευθείας εισαγωγή"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Αποτέλεσμα γραμμής εντολών"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Κοινοποίηση"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Κρυφή κοινοποίηση"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Απάντηση σε"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "Ψηφιακή υπογραφή μηνύματος ως προεπιλογή"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "Κρυπτογράφηση μηνύματος ως προεπιλογή"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Κρυπτογράφηση στην απάντηση κρυπτογραφημένων μηνυμάτων"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Χρήση θωρακισμένης κατά ASCII μορφής για την κρυπτογράφηση"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Χρήση υπογραφής καθαρού κειμένου"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Κλειδί υπογραφής"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Χρήση προεπιλεγμένου κλειδιού GnuPG"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Επιλογή κλειδιού με βάση την διεύθυνση αλληλογραφίας"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Ορίστε με το χέρι το κλειδί"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Χρήστης ή key ID:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Να μην χρησιμοποιηθεί SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Χρήση SSL στη σύνδεση POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Χρήση της εντολής STARTTLS για την έναρξη της συνόδου SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Χρήση SSL στη σύνδεση IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Χρήση SSL στη σύνδεση NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Αποστολή (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Χρήση SSL στη σύνδεση SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Χρήση non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Απενεργοποιήστε το εάν έχετε προβλήματα σύνδεσης με το SSL"
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Θύρα SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Θύρα POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Θύρα IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Θύρα NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Όνομα τομέα"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Κατάλογος διακομιστή IMAP"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Θα εμφανίζονται μόνο οι υποφάκελοι αυτού του καταλόγου."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Λήψη όλων των μηνυμάτων από τον διακομιστή"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Αποθήκευση των σταλμένων στο"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Αποθήκευση πρόχειρων στο"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Αποθήκευση μηνυμάτων που βρίσκονται στην ουρά στο"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Αποθήκευση διαγραμμένων μηνυμάτων στο"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Δεν έχει εισάγει όνομα λογαριασμού."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Η διεύθυνση αλληλογραφίας δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Ο διακομιστής SMTP δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Δεν έχετε εισάγει όνομα χρήστη."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Ο διακομιστής POP3 δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Ο διακομιστής IMAP4 δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Ο διακομιστής NNTP δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "Ο ορισμένος φάκελος δεν είναι φάκελος ουράς."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/es.po b/po/es.po
index 953ced8c..9b9bd873 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2010-02-24 08:05+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -489,7 +489,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "hubo algún error en la sesión POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo la configuración al fichero\n"
@@ -689,14 +689,14 @@ msgstr ""
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -824,7 +824,7 @@ msgstr "Parámetro de usuario de la acción"
 msgid "Add Address to Book"
 msgstr "Añadir dirección a la agenda"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Dirección"
@@ -995,7 +995,7 @@ msgstr "Agenda de direcciones"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -1007,17 +1007,17 @@ msgstr "Dirección e-mail"
 msgid "Search:"
 msgstr "Buscar:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1226,7 +1226,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1570,107 +1570,107 @@ msgstr "/_Herramientas/_Comprobar ortografía"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Herramientas/_Establecer idioma ortográfico"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "No se puede obtener el tamaño de %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componer%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 msgid "Attachment is missing"
 msgstr "Falta el adjunto"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "No hay adjunto. ¿Enviarlo sin adjuntos?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "Comprobar destinatarios"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 msgid "Really send this mail to the following addresses?"
 msgstr "¿Enviar realmente este correo a las direcciones siguientes?"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1678,39 +1678,39 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta de correo antes de enviar."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "No se encontró ninguna clave asociada al ID de clave seleccionado "
 "actualmente «%s»."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 msgid "Can't sign the message."
 msgstr "El mensaje no se puede firmar."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 msgid "Can't encrypt the message."
 msgstr "El mensaje no se puede cifrar."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 msgid "Can't encrypt or sign the message."
 msgstr "El mensaje no se puede cifrar o firmar."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1721,11 +1721,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1738,15 +1738,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Cifrando con copia oculta"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1760,96 +1760,96 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "El fichero %s no existe."
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "No se puede abrir el fichero %s."
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Propiedades"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Abriendo fichero ejecutable"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1861,12 +1861,12 @@ msgstr ""
 "Si quiere lanzarlo, guárdelo en algún lugar y asegúrese de que no es un "
 "virus u otro tipo de software malintencionado."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La orden del editor externo es inválida: «%s»\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1875,48 +1875,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "_Configurar barra de herramientas..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Este mensaje ha sido modificado. ¿Guardarlo en la carpeta Borradores?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -2015,7 +2015,7 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Fichero"
 
@@ -2095,7 +2095,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2160,7 +2160,7 @@ msgstr "Tiempo límite (seg.)"
 msgid "Maximum Entries"
 msgstr "Nº máximo de entradas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Básico"
 
@@ -2248,7 +2248,7 @@ msgid "MH (number only)"
 msgstr "MH (sólo número)"
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Seleccionar..."
 
@@ -4274,232 +4274,232 @@ msgstr "Fichero: "
 msgid "Description: "
 msgstr "Descripción: "
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Abriendo ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Cuenta%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Preferencias para una nueva cuenta"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferencias de la cuenta"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Creando ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Enviar"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Componer"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Nombre de esta cuenta"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Cuenta por defecto"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Información personal"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Dirección de correo"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organización"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Información del servidor"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Ninguna (local)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Este servidor requiere autentificación"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Servidor de noticias"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autentificación segura (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibir"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Eliminar después de"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "días"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 días: eliminar inmediatamente"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "Descargar todos los mensajes (incluso los ya recibidos) del servidor"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Tamaño límite para recibir"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "Kb"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Buzón por defecto"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Método de autentificación"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automática"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Sólo comprobar Entrada al recibir"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrar los nuevos mensajes en Entrada al recibir"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Noticias"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Sin límite si se especifica 0."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "«Recibir todo» comprueba si hay mensajes nuevos en esta cuenta"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabecera"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Añadir campo Fecha"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Generar ID-Mensaje"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Autentificación"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificación SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4507,203 +4507,207 @@ msgstr ""
 "Si deja estos campos vacíos, se utilizará el mismo ID de usuario y "
 "contraseña usados para la recepción."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificación con POP3 antes de enviar"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Entrada directa"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "Firmar el mensaje con PGP por defecto"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "Cifrar el mensaje con PGP por defecto"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Cifrar al responder a un mensaje cifrado"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII blindado para el cifrado"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Usar firma de texto claro"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Clave para firmar"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Usar la clave GnuPG por defecto"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Seleccionar la clave por la dirección de correo"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Especificar la clave manualmente"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Usuario o ID de clave:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar el mandato STARTTLS para abrir la sesión SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL no bloqueante"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Desactívelo si tiene problemas con la conexión SSL."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Puerto POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Puerto IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Nombre del dominio"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP4"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Sólo se mostrarán las subcarpetas de este directorio."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Limpiar todas las caches de mensajes al salir"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de cuenta."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "No se especificó el servidor POP3."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "No se especificó el servidor IMAP4."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "La carpeta especificada no es una carpeta de cola."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/et.po b/po/et.po
index d24dfa7f..ef8d1d5e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -494,7 +494,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "autoriseerimisel tekkis viga\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "Häälestuse salvestamine ebaõnnestus\n"
@@ -697,14 +697,14 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nimi"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -832,7 +832,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Aadress"
@@ -1008,7 +1008,7 @@ msgstr "Aadressiraamat"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Kaust"
 
@@ -1021,17 +1021,17 @@ msgstr "E-Posti aadress"
 msgid "Search:"
 msgstr "Otsi"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Pimekoopia:"
@@ -1245,7 +1245,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1631,111 +1631,111 @@ msgstr "/_Tööriist/Käivita"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Manused"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Pealkiri:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Saada"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1743,41 +1743,41 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Ei suutnud leida ühtki võtit, mis oleks seotud valitud võtmega (id'%s')."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1787,12 +1787,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1801,15 +1801,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1818,99 +1818,99 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ei suuda avada faili %s\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1918,12 +1918,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1933,52 +1933,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2079,7 +2079,7 @@ msgid " Check File "
 msgstr " Kontrolli faili "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Fail"
 
@@ -2160,7 +2160,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigeeri JPilot sissekannet"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2225,7 +2225,7 @@ msgstr "Ajalimiit (sek)"
 msgid "Maximum Entries"
 msgstr "Sissekannete piirarv"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Baas"
 
@@ -2317,7 +2317,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Vali... "
 
@@ -4408,241 +4408,241 @@ msgstr "Fail"
 msgid "Description: "
 msgstr "Seletus"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Avan konto parameetrite akent...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Uue konto omadused"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Konto omadused"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Loon konto omaduste akent...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Saabuvad kirjad"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Saada"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privaatsus"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Spetsiaalne"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Selle konto nimi"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Isiku informatsioon"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Täisnimi"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "E-Posti aadress"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Ofganisatsioon"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Serveri informatsioon"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Uudised (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Lokaalarvutist"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "See servar nõuab autoriseerimist"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Uudiste server"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Sissetulevate kirjade server"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Saatmise server (SMTP)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Kasutajanimi"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Parool"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "See servar nõuab autoriseerimist"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Kustuta kirjad pärast kohalejõudmist serverist"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Eemalda pärast"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "päeva"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 päeva: eemalda kohe)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Võta serverist kõik kirjad"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Tõmbamise suuruse limiit"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtreeri saabuvaid kirju"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Vaikimisi sisendkast"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Autoriseerimise meetod"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtreeri saabuvaid kirju"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Uudised"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksimaalne võetavate artiklite arv\n"
 "(määramata kui sisestate 0)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Saaja pole määratud."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "Kui vajutate nuppu 'Võta kõik', siis uusi kirju võetakse ka siia"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Päis"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Lisa kuupäev päisesse"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Loo Kirja-ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Lisa kasutaja defineeritud päis"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Redigeeri... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Autoriseerimine"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autoriseerimine (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4651,208 +4651,212 @@ msgstr ""
 "Kui te jätate need sissekanded tühjaks, siis \n"
 "kasutatakse vastuvõtva kasutaja ID-d ja parooli."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Autoriseeri POP3 enne saatmist"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Allkiri"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 #, fuzzy
 msgid "Command output"
 msgstr "Käsklus"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Vastus saata"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Vaikimisi tuleb kiri allkirjastada"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Vaikimisi tuleb kiri krüpteerida"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Kasuta ASCII-ga varustatud krüpteerimise formaati"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Kasuta seleget teksti allkirja"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Allkirja võti"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Kasuta algset GnuPG võtit"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Vali võti elektronposti aadressi juurest"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Määra võti käsitsi"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Kasutaja või võtme ID:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Ära kasuta SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Kasuta SSL-i POP3-e ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Kasuta STARTTLS käsklust et alustada SSL sessiooni"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Kasuta SSL-i IMAP4-ja ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Kasuta SSL-i NNTP ühenduse loomisel"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Saada (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Kasuta SSL-i SMTP ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Määra SMTP port"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Määra POP3 port"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Määra IMAP4 port"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Määra NNTP port"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Määra domeeni nimi"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP serveri kataloog"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Võta serverist kõik kirjad"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Pane saadetud kirjad"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Pane mustandi kirjad"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Pane kustutatud kirjad"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Pane kustutatud kirjad"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Konto nime ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Postiaadressi ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "SMTP serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Kasutajanime ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "POP3 serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 serverit ei ole sisestatud"
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "NNTP serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/fr.po b/po/fr.po
index 8b48b3bd..7d610b07 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2010-06-19 02:21+0200\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -502,7 +502,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "une erreur est survenue pendant la session POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "Échec d'écriture de la configuration dans le fichier\n"
@@ -703,14 +703,14 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nom"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -838,7 +838,7 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresses"
@@ -1009,7 +1009,7 @@ msgstr "Carnet d'adresses"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Dossier"
 
@@ -1021,17 +1021,17 @@ msgstr "Adresse électronique"
 msgid "Search:"
 msgstr "Rechercher :"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Copie discrète :"
@@ -1242,7 +1242,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Information"
 
@@ -1586,109 +1586,109 @@ msgstr "/_Outils/_Vérifier l'orthographe"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Outils/_Définir la langue du message"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr ""
 "Erreur du format de citation d'un message lors d'une réponse ou d'un "
 "transfert."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Composition%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 msgid "Attachment is missing"
 msgstr "Pièce jointe absente"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Il n'y a pas de pièce jointe. Envoyer sans pièce jointe ?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "Vérification des destinataires"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 msgid "Really send this mail to the following addresses?"
 msgstr "Vraiment envoyer ce courrier aux adresses suivantes ?"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1696,37 +1696,37 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez sélectionner un compte avant d'envoyer du courrier."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Impossible d'enregistrer de message dans la boîte de messages envoyés"
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Impossible de trouver une touche associée au code (de touche) « %s »."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 msgid "Can't sign the message."
 msgstr "Impossible de signer le message."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 msgid "Can't encrypt the message."
 msgstr "Impossible de crypter le message."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 msgid "Can't encrypt or sign the message."
 msgstr "Impossible de crypter ou signer le message."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1737,11 +1737,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1754,15 +1754,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Chiffrement avec « Copie discrète »"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1776,95 +1776,95 @@ msgstr ""
 "\n"
 "Envoyer quand même ?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Le fichier %s n'existe pas."
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossible d'ouvrir le fichier %s"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Propriétés"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 msgid "File not exist."
 msgstr "Le fichier n'existe pas."
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Ouverture du fichier exécutable"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1876,12 +1876,12 @@ msgstr ""
 "Vous pouvez l'enregistrer quelque part pour le lancer vous-même, mais prenez "
 "les précautions d'usage (anti-virus, etc.)."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La ligne de commande pour l'éditeur externe est invalide : « %s »\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1890,50 +1890,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Ce message a été modifié. Voulez-vous l'enregistrer dans le dossier des "
 "brouillons ?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2032,7 +2032,7 @@ msgid " Check File "
 msgstr " Vérifier le fichier "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Fichier"
 
@@ -2114,7 +2114,7 @@ msgid "Edit JPilot Entry"
 msgstr "Édition de données JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2179,7 +2179,7 @@ msgstr "Délai d'attente (secs)"
 msgid "Maximum Entries"
 msgstr "Nombre maximal d'entrées"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Général"
 
@@ -2265,7 +2265,7 @@ msgid "MH (number only)"
 msgstr "MH (numéro uniquement)"
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Choisir... "
 
@@ -4305,234 +4305,234 @@ msgstr "Fichier:"
 msgid "Description: "
 msgstr "Description:"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Ouverture de la fenêtre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Configuration du nouveau compte"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Configuration du compte"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Création de la fenêtre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Composer"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Avancée"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Nom du compte"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Définir comme compte par défaut"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Adresse électronique"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Configuration des serveurs"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Aucun (local)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Ce serveur nécessite une authentification"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Serveur de groupes de discussion"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Serveur de réception"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Serveur SMTP (envoi)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Nom de l'utilisateur"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Utiliser l'authentification sécurisée (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Suppression des messages du serveur après réception"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Supprimer après"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "jours"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 jours : effacer immédiatement"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr ""
 "Téléchargement de tous les messages présents sur le serveur (y compris ceux "
 "déjà reçus)"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Taille maximale pour la réception"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "Ko"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages à la réception"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Boîte de réception par défaut"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Les messages non filtrés seront placés dans ce dossier."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Vérifier seulement INBOX lors de la réception"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrage des nouveaux messages à la réception"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Articles de groupes de discussion"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Nombre maximum d'articles à récupérer"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Aucune limite pour la valeur 0."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "« Tout relever » relève le courrier pour ce compte"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "En-tête"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Ajouter un champ « Date » à l'en-tête"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Génération d'un Message-ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Modifier... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Authentification"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4540,203 +4540,207 @@ msgstr ""
 "Laissez ces champs vides pour utiliser le nom d'utilisateur et le mot de "
 "passe spécifiés pour la réception."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "S'authentifier sur le POP3 avant l'envoi"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Signature"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Texte"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Sortie"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Copie"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Copie discrète"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Répondre à"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "Signer le message par défaut"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "Chiffrer le message par défaut"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Chiffrer les réponses à un message chiffré"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Utiliser le format ASCII-armé pour le chiffrement"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Utiliser une signature non chiffrée"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Clé de signature"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Utiliser la clé par défaut de GnuPG"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Sélectionner la clé en fonction de l'adresse électronique"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Indiquer manuellement la clé"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Utilisateur ou identificateur (ID) de clé :"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Ne pas utiliser SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Utiliser SSL pour les connexions POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utiliser SSL pour les connexions IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Utiliser SSL pour les connexions NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Utiliser SSL pour les connexions SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Utiliser SSL non-bloquant"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Désactivez ceci si vous rencontrez des problèmes de connexion SSL."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Indiquer le port SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Indiquer le port POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Indiquer le port IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Indiquer le port NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Indiquer le nom de domaine"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Répertoire IMAP4"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Seuls les sous-dossiers de ce dossier seront affichés."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Nettoyer les caches de message en quittant"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Placer les messages envoyés dans"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Placer les brouillons dans"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Placer les messages en attente d'envoi dans"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Placer les messages supprimés dans"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Nom du compte non indiqué."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Adresse électronique non saisie."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Serveur SMTP non indiqué."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Nom d'utilisateur manquant."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Serveur POP3 non indiqué."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Serveur IMAP4 non indiqué."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Serveur NNTP non indiqué."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "Le dossier indiqué n'est pas une file d'attente."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/gl.po b/po/gl.po
index bb2c8501..d8d45296 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -491,7 +491,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "ocurriu algún erro na sesión POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo a configuración a ficheiro\n"
@@ -695,14 +695,14 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -830,7 +830,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Enderezo"
@@ -1006,7 +1006,7 @@ msgstr "Axenda de enderezos"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -1019,17 +1019,17 @@ msgstr "Enderezo e-mail"
 msgid "Search:"
 msgstr "Buscar"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1244,7 +1244,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1629,112 +1629,112 @@ msgstr "/_Ferramentas/E_xecutar"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Non se pode obter o tamaño de %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Adxuntos"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Enviar"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1742,40 +1742,40 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Non puiden atopar ningunha clave asociada con a Id-clave actual `%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1786,12 +1786,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1800,15 +1800,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1817,98 +1817,98 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Non poido abrir %s\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Propiedades"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1916,12 +1916,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "o comando do editor externo non e válido: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1931,52 +1931,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2077,7 +2077,7 @@ msgid " Check File "
 msgstr " Comprobar ficheiro "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Ficheiro"
 
@@ -2158,7 +2158,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2223,7 +2223,7 @@ msgstr "Tiempo límite (seg.)"
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Basico"
 
@@ -2316,7 +2316,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Seleccionar..."
 
@@ -4410,241 +4410,241 @@ msgstr "Ficheiro"
 msgid "Description: "
 msgstr "Descripción"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "conta%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Preferencias para unha nova conta"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferencias da conta"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Creando Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Enviar"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Compoñer"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Nome desta conta"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "conta por defecto"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Información persoal"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Enderezo de correo"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organización"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Información do servidor"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Novas (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Ningunha (local)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Este servidor require autenticación"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Servidor de novas"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Contrasinal"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Este servidor require autenticación"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Eliminar mensaxes do servidor ó recibir"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Eliminar despois de"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "días"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 días: eliminar inmediatamente)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Descargar todas as mensaxes do servidor"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Tamaño límite para recibir"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensaxes ó recibir"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Caixa de correo por defecto"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automática"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrar mensaxes ó recibir"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Novas"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Número máximo de artigos a descargar\n"
 "(sen límite si se especifica 0)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Traer todo' comproba si hai mensaxes novas nesta conta"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabeceira"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Engadir campo Data"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Xenerar ID-Mensaxe"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Engadir cabeceira de usuario"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticación SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4653,208 +4653,212 @@ msgstr ""
 "Si deixa estes campos valeiros, utilizaráse o mesmo\n"
 "ID de usuario e contrasinal usados para a recepción."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticación con POP3 antes de enviar"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Sinatura"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 #, fuzzy
 msgid "Command output"
 msgstr "Saida do comando"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Respostar a"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Asinar a mensaxe por defecto"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Encriptar a mensaxe por defecto"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII blindado para encriptación"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Usar sinatura de texto claro"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Asinar clave"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Usar clave GnuPG por defecto"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Seleccionar clave por dirección de correo"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Especificar clave manualmente"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Usuario ou ID clave:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Non usar SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para a conexión POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar o comando STARTTLS para abrir a sesión SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para a conexión IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para a conexión NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para a conexión SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Porto SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Porto POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Porto IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Porto NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Nome do dominio"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Directorio do servidor IMAP4"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Descargar todas as mensaxes do servidor"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Poñer mensaxes enviadas en"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Poñer borradores de mensaxes en"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Poñer mensaxes borradas en"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Poñer mensaxes borradas en"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Non se especificou o nome de conta."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Non se especificou o enderezo de correo."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Non se especificou o servidor SMTP."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Non se especificou o usuario."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Non se especificou o servidor POP3."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Non se especificou o servidor IMAP4."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Non se especificou o servidor NNTP."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/hr.po b/po/hr.po
index 95172179..60197d42 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamatić <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -497,7 +497,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "greška prilikom ovjeravanja\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "neuspjeh pri pisanju konfiguracije u datoteku\n"
@@ -702,14 +702,14 @@ msgstr ""
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -834,7 +834,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresa"
@@ -1011,7 +1011,7 @@ msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Spis"
 
@@ -1024,17 +1024,17 @@ msgstr "E-mail adresa"
 msgid "Search:"
 msgstr "Potraga"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1242,7 +1242,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1638,111 +1638,111 @@ msgstr "/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Prilog"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1750,40 +1750,40 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1791,12 +1791,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1805,15 +1805,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1822,100 +1822,100 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1923,12 +1923,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za vanjski uređivač je pogrešna: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1938,53 +1938,53 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2085,7 +2085,7 @@ msgid " Check File "
 msgstr " Provjeri datoteku "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Datoteka"
 
@@ -2166,7 +2166,7 @@ msgid "Edit JPilot Entry"
 msgstr "Uredite JPilot unos"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2231,7 +2231,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2323,7 +2323,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Odaberite... "
 
@@ -4503,458 +4503,462 @@ msgstr "Datoteka"
 msgid "Description: "
 msgstr "Opis"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Otvaram prozor za postavke računa...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Račun%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Postavke za novi račun"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Postavke računa"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Kreiram prozor za postvake računa...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Kreiraj"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Ime ovog računa"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Postavi kao uobičajeni"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Osobne informacije"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Puno ime"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "E-mail adresa"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Informacije o poslužitelju"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Ništa (lokalno)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Ovaj server zahtijeva autorizaciju"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "News poslužitelj"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Poslužitelj za primanje"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP poslužitelj (slanje)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "ID korisnika"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ovaj server zahtijeva autorizaciju"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 #, fuzzy
 msgid "Remove after"
 msgstr "Ukloni spis"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 #, fuzzy
 msgid "days"
 msgstr "Uvijek"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr ""
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Primi sve poruke sa poslužitelja"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 #, fuzzy
 msgid "Receive size limit"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 #, fuzzy
 msgid "Authentication method"
 msgstr "Autorizacija"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr ""
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksimalni broj članaka za skidanje\n"
 "(0 je za neograničeno)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nije upisan primatelj."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 #, fuzzy
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Primi sve' uzima poštu s ovog računa"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Dodaj polje Datum u zaglavlje"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Generiraj ID poruke"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Dodatna zaglavlja"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Uredi... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Autorizacija"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autorizacija (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Autoriziraj s POP3 prije slanja"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 #, fuzzy
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Odvovori-Na"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Uvijek potpiši poruke"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Uvijek kriptiraj poruke"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 #, fuzzy
 msgid "Use clear text signature"
 msgstr "Unesi potpis"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Ključ potpisa"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Koristi uobičajeni GnuPG ključ"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Odaberi ključ po e-mail adresi"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Neki drugi ključ"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "ID ključa ili korisnika:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Ne koristi SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Koristi SSL za POP3 veze"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Koristi SSL za IMAP4 veze"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 #, fuzzy
 msgid "Use SSL for NNTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Slanje (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Specificirani SMTP port"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Specificirani POP3 port"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Specificirani IMAP4 port"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Specificirani NNTP port"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Specificirano ime domene"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Direktorij IMAP poslužitelja"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Primi sve poruke sa poslužitelja"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 #, fuzzy
 msgid "Put sent messages in"
 msgstr "Spremi poslane poruke u poslano"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 #, fuzzy
 msgid "Put draft messages in"
 msgstr "Sažmi poruke na"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Obriši poruku/e"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 #, fuzzy
 msgid "Put deleted messages in"
 msgstr "Obriši poruku/e"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 #, fuzzy
 msgid "Account name is not entered."
 msgstr "E-mail adresa nije upisana."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "E-mail adresa nije upisana."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "SMTP poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "ID korisnika nije upisan."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "POP3 poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "NNTP poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/hu.po b/po/hu.po
index 6b897f8b..fa2402b1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2010-02-13 14:38+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@uhuklub.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -491,7 +491,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "hiba történt a POP3 kapcsolat közben\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "a beállításokat nem lehetett elmenteni\n"
@@ -693,14 +693,14 @@ msgstr ""
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Név"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -829,7 +829,7 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címjegyzékhez"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Cím"
@@ -1000,7 +1000,7 @@ msgstr "Címjegyzék"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Mappa"
 
@@ -1012,17 +1012,17 @@ msgstr "Email cím"
 msgid "Search:"
 msgstr "Keresés:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Titkos másolat:"
@@ -1227,7 +1227,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1571,107 +1571,107 @@ msgstr "/_Eszközök/_Helyesírásellenőrzés"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Eszközök/Helyesírás _nyelvi beállítások"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Levél válasz/továbbítás formátumhiba."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem határozható meg\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Levél: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Egy több részes levél egy darabja nem hozzáférhető."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Levél írása%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 msgid "Attachment is missing"
 msgstr "Nincs csatolva semmi"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nincs csatolva semmi. Elküldi csatolások nélkül?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "Címzettek ellenőrzése"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 msgid "Really send this mail to the following addresses?"
 msgstr "Tényleg elküldi ezt a levelet a következő címekre?"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tárgy:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 msgid "_Send"
 msgstr "_Küldés"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1679,39 +1679,39 @@ msgstr ""
 "Nincs megadva fiók a levél küldéshez.\n"
 "Válasszon ki egy fiókot küldés előtt!"
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel %s-n{ae}k küldendő levél küldésekor."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "A levél nem menthető a kimenő mappába."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nem található hozzárendelt kulcs ehhez a kiválasztott kulcs azonosítóhoz: `%"
 "s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 msgid "Can't sign the message."
 msgstr "A levelet nem sikerült aláírni."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 msgid "Can't encrypt the message."
 msgstr "A levelet nem sikerült titkosítani."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 msgid "Can't encrypt or sign the message."
 msgstr "A levelet nem sikerült titkosítani vagy aláírni."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1722,11 +1722,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1739,15 +1739,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Titkos másolat(ok) titkosítása"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1762,96 +1762,96 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "a régi levelet nem lehet törölni\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "levél Várakozó sorba rakása...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "A levelet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "A(z) %s fájl nem létezik."
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "A(z) %s fájlt nem lehet megnyitni."
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Message-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Tulajdonságok"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Futtatható fájl megnyitása"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1863,12 +1863,12 @@ msgstr ""
 "Ha futtatni szeretné, mentse el valahová, és győződjön meg róla, hogy nem "
 "egy vírus vagy más kártékony program."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1877,48 +1877,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "A levelet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "A levél megváltozott. Menti a Vázlatok mappába?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -2017,7 +2017,7 @@ msgid " Check File "
 msgstr " Fájl ellenőrzése"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Fájl"
 
@@ -2097,7 +2097,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot bejegyzés szerkesztése"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2162,7 +2162,7 @@ msgstr "Időtúllépés (mp)"
 msgid "Maximum Entries"
 msgstr "Maximális bejegyzések"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Alap"
 
@@ -2248,7 +2248,7 @@ msgid "MH (number only)"
 msgstr "MH (csak szám)"
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Kiválaszt... "
 
@@ -4271,232 +4271,232 @@ msgstr "Fájl: "
 msgid "Description: "
 msgstr "Leírás: "
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Fiók beállítások ablak megnyitása...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Fiók%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Új fiók beállításai"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Fiók beállítások"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Fiók beállítások ablak létrehozása...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Fogadás"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Küldés"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Új levél"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Magánszféra"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Haladó"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Fiók neve"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Alapértelmzésként beállítás"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Személyes információ"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Teljes név"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Email cím"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Szervezet"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Szerver információ"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Hír (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Semmi (helyi)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Ezen a szerveren kötelező az azonosítás"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Hírszerver"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Szerver a fogadáshoz"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP szerver (küldés)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Felhasználói Azonosító"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Jelszó"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Biztonságos hitelesítés használata (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Levelek törlése a szerverről fogadás után"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Eltávolítás utána"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "nap"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 nap: azonnal eltávolítani"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "Minden levél letöltése (beleértve a már letöltötteket is) a szerverről"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Fogadott levél méretkorlát"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Levelek szűrése fogadás közben"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Alapértelmezett bejövő mappa"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "A nem szűrt levelek ebbe a mappába fognak kerülni."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Azonosítási módszer"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Csak a BEJÖVŐ ellenőrzése fogadáskor"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Új levelek szűrése fogadás közben a BEJÖVŐ mappában"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Hír"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "A letölteni kívánt maximális cikkek száma"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Ha 0 van megadva, akkor korlátlan."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Fogadás mindről' ellenőrizze ezt a fiókot is"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Fejléc"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Dátum fejléc mező hozzáadás"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Message-ID létrehozása"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Felhasználó által definiált fejléc hozzáadása"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Szerkesztés... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP azonosítás (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4504,203 +4504,207 @@ msgstr ""
 "Ha ezeket a mezőket üresen hagyja, a levelek fogadásához használt "
 "felhasználói azonosító és jelszó lesz használva."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Azonosítás küldés előtt POP3-mal"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Aláírás"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Közvetlen bemenet"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Parancskimenet"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Az alábbi címek automatikus beállítása"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Másolat"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Titkos másolat"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Válaszcím"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "Levél digitális aláírása alapértelmezésként"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "Levél titkosítsa alapértelmezésként"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Titkosítás, ha titkosított levélre válaszol"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII-páncélozott formátum használata titkosításhoz"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Szöveges aláírás használata"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Digitális aláírás kulcs"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Alapértelmezett GnuPG kulcs használata"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Kulcs választása az email címe alapján"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Kulcs kézi megadása"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Felhasználó vagy kulcs azonosító:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Nem használ SSL-t"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "SSL használata POP3 kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS parancs használata SSL kapcsolat indításához"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL használata IMAP4 kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "SSL használata NNTP kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Küldés (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "SSL használata SMTP kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Nem-blokkolódó SSL használata"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Ezt kapcsolja ki, ha az SSL kapcsolattal probléma van."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "SMTP port megadása"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "POP3 port megadása"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 port megadása"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "NNTP port megadása"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Tartománynév megadása"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP szerver könyvtár"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Csak ezen könyvtár almappái fognak megjelenni."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Kilépéskor töröl minden gyorstárazott levelet"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Elküldött levelek elhelyezése"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Vázlatok elhelyezése"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Várakozó levelek elhelyezése"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Törölt levelek elhelyezése"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "A fiók neve nincs megadva."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Nincs emailcím megadva."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Nincs SMTP szerver megadva."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Nincs felhasználói azonosító megadva."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Nincs POP3 szerver megadva."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Nincs IMAP4 szerver megadva."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Nincs NNTP szerver megadva."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "A megadott mappa nem egy várakozó mappa."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/it.po b/po/it.po
index 839cfa41..b119b0a7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -491,7 +491,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "si è verificato un errore durante la sessione POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "la scrittura della configurazione sul file è fallita\n"
@@ -694,14 +694,14 @@ msgstr ""
 "colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi tutti»."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protocollo"
 
@@ -829,7 +829,7 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Indirizzo"
@@ -1001,7 +1001,7 @@ msgstr "Rubrica"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Cartella"
 
@@ -1013,17 +1013,17 @@ msgstr "Indirizzo e-mail"
 msgid "Search:"
 msgstr "Ricerca:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1230,7 +1230,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1574,110 +1574,110 @@ msgstr "/S_trumenti/_Controllo ortografico"
 msgid "/_Tools/_Set spell language"
 msgstr "/S_trumenti/Impo_sta lingua"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componi%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Allegati"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Invia"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1685,42 +1685,42 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Si è verificato un errore durante l'invio del messaggio a %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Impossibile trovare qualsiasi chiave associata con l'id chiave «%s» "
 "attualmente selezionato."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1732,11 +1732,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1750,15 +1750,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Cifratura con Bcc"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1772,96 +1772,96 @@ msgstr ""
 "\n"
 "Inviarlo comunque?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Il file %s non esiste."
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossibile aprire il file %s."
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Proprietà"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Apertura file eseguibile"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1873,12 +1873,12 @@ msgstr ""
 "Se volete lanciarlo, salvatelo da qualche parte e assicuratevi che non sia "
 "un virus o qualcosa di simile a un programma malizioso."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La riga di comando per l'editor esterno non è valida: «%s»\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1887,48 +1887,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "_Personalizza barra strumenti"
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -2027,7 +2027,7 @@ msgid " Check File "
 msgstr " Controllo file "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "File"
 
@@ -2108,7 +2108,7 @@ msgid "Edit JPilot Entry"
 msgstr "Modifica la voce JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2173,7 +2173,7 @@ msgstr "Timeout (secondi)"
 msgid "Maximum Entries"
 msgstr "Numero massimo di voci"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Essenziale"
 
@@ -2266,7 +2266,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Seleziona... "
 
@@ -4320,233 +4320,233 @@ msgstr "File"
 msgid "Description: "
 msgstr "Descrizione"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Apertura della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Preferenze per il nuovo account"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferenze dell'account"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Creazione della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Ricevi"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Invia"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Componi"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Nome di questo account"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Imposta come predefinito"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Informazioni personali"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Indirizzo di posta"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Informazioni sui server"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 # src/prefs_account.c:634
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Nessuno (locale)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Questo server richiede l'autenticazione"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Server delle news"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Server per la ricezione"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Server SMTP (spedisce)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "User ID"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Password"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Usa l'autenticazione sicura (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Rimuovi i messaggi sul server dopo averli ricevuti"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Rimuovi dopo "
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr " giorni"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 giorni: rimuovi immediatamente"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "Scarica tutti i messaggi (includendo quelli già ricevuti) sul server"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Limite della dimensione da ricevere di"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtra i messaggi in ricezione"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Inbox predefinita"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "I messaggi non filtrati saranno memorizzati in questa cartella."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Controlla solo «In entrata» in ricezione"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtra i nuovi messaggi in ricezione nella cartella «In entrata»"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Numero massimo di articoli da scaricare"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Nessun limite se viene specificato 0."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "«Ricevi tutti» controlla i nuovi messaggi su questo account"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Intestazione"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Aggiungi il campo Data nell'intestazione"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Genera ID messaggio"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Aggiungi un'intestazione definita dall'utente"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Modifica... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticazione SMTP (SMTP AUT)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4554,203 +4554,207 @@ msgstr ""
 "Lasciando vuote queste voci verranno usate la stessa user ID e password "
 "della ricezione."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentica con POP3 prima dell'invio"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Input diretto"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Output del comando"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Rispondi a"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "PGP firma il messaggio per predefinizione"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "PGP cifra il messaggio per predefinizione"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Cifra quando rispondi a un messaggio cifrato"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usa il formato ASCII-armato per la cifratura"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Usa la firma con il testo in chiaro"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Chiave della firma"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Usa la chiave predefinita di GnuPG"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Scegli la chiave per il tuo indirizzo email"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Specifica la chiave manualmente"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "ID user o chiave:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Non usare SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Usa SSL per la connessione POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usa il comando STARTTLS per iniziare la sessione SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usa SSL per la connessione IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Usa SSL per la connessione NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Invio (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Usa SSL per la connessione SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Usa SSL non bloccato"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Disattivare se si hanno problemi nella connessione SSL."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Specifica la porta SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Specifica la porta POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Specifica la porta IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Specifica la porta NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Specifica il nome di dominio"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Directory del server IMAP4"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Verranno visualizzate solo le sottocartelle di questa directory."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Pulisci tutte le cache dei messaggi all'uscita"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Metti i messaggi spediti in"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Metti i messaggi abbozzati in"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Metti i messaggi accodati in"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Metti i messaggi eliminati in"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Non è stato immesso il nome dell'account."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Non è stato immesso l'indirizzo di posta."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Non è stato immesso il server SMTP."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Non è stato immesso lo user ID."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Non è stato immesso il server POP3."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Non è stato immesso il server IMAP4."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Non è stato immesso il server NNTP."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "La cartella specificate non è una cartella «Coda»."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/ja.po b/po/ja.po
index 1fba25c2..a53090c7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -489,7 +489,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "POP3 セッション中にエラーが発生しました\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "設定のファイルへの書き込みに失敗しました\n"
@@ -689,14 +689,14 @@ msgstr ""
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "名前"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "プロトコル"
 
@@ -824,7 +824,7 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "アドレス"
@@ -995,7 +995,7 @@ msgstr "アドレス帳"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "フォルダ"
 
@@ -1007,17 +1007,17 @@ msgstr "電子メール アドレス"
 msgid "Search:"
 msgstr "検索:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1224,7 +1224,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "注意"
 
@@ -1568,107 +1568,107 @@ msgstr "/ツール(_T)/スペルチェック(_C)"
 msgid "/_Tools/_Set spell language"
 msgstr "/ツール(_T)/スペルチェックの言語を指定(_S)"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "テキストパートを取得できません\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 作成%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "空の件名"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 msgid "Attachment is missing"
 msgstr "添付ファイルがありません"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "添付ファイルがありません。添付ファイルなしで送信しますか?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "宛先の確認"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 msgid "Really send this mail to the following addresses?"
 msgstr "このメールを以下のアドレスに送信してもよろしいですか?"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "件名:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 msgid "_Send"
 msgstr "送信(_S)"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1676,37 +1676,37 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 msgid "Can't sign the message."
 msgstr "メッセージに署名できません。"
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 msgid "Can't encrypt the message."
 msgstr "メッセージを暗号化できません。"
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 msgid "Can't encrypt or sign the message."
 msgstr "メッセージを暗号化または署名できません。"
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1717,11 +1717,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1734,15 +1734,15 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Bcc を伴う暗号化"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1756,95 +1756,95 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "ファイル %s は存在しません。"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "ファイル %s を開けません。"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "プロパティ"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 msgid "File not exist."
 msgstr "ファイルが存在しません。"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "実行可能ファイルを開こうとしています"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1856,12 +1856,12 @@ msgstr ""
 "起動したい場合は、ファイルを適当な場所に保存した後、それがウィルスやその他の"
 "悪意のあるプログラムでないことを確認してください。"
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1870,48 +1870,48 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -2010,7 +2010,7 @@ msgid " Check File "
 msgstr " ファイルをチェック "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "ファイル"
 
@@ -2090,7 +2090,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilotエントリを編集"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2155,7 +2155,7 @@ msgstr "タイムアウト(秒)"
 msgid "Maximum Entries"
 msgstr "最大エントリ数"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "基本"
 
@@ -2241,7 +2241,7 @@ msgid "MH (number only)"
 msgstr "MH (番号のみ)"
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " 選択... "
 
@@ -4256,435 +4256,439 @@ msgstr "ファイル: "
 msgid "Description: "
 msgstr "説明: "
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "アカウントプリファレンスウィンドウを開いています...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "新規アカウントの設定"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "アカウントの設定"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "アカウントプリファレンスウィンドウを作成中...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "受信"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "送信"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "作成"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "個人情報"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "高度な設定"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "このアカウントの名称"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "通常使用"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "個人情報"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "名前"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "メールアドレス"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "組織"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "サーバ情報"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "ニュース (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "なし (ローカル)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "このサーバは認証が必要"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "ニュースサーバ"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "受信用サーバ"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTPサーバ (送信)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "ユーザID"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "パスワード"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "安全な認証方式を使用する (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "受信時にサーバ上のメッセージを削除する"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "メッセージを"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "日後に削除"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0日: 即座に削除"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "受信済みも含めてサーバ上のすべてのメッセージを受信する"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "受信サイズ制限"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "受信時にメッセージを振り分ける"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "標準の受信箱"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "振り分けられなかったメッセージはこのフォルダに格納されます。"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "認証方式"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "自動"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "受信時に受信箱(INBOX)のみチェックする"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "受信時に受信箱(INBOX)内の新着メッセージを振り分ける"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "ニュース"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "ダウンロードする記事数の上限"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "0を指定すると無制限になります。"
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "「全受信」でこのアカウントの新着メッセージをチェックする"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "ヘッダ"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Dateヘッダフィールドを付ける"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "メッセージIDを生成する"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "ユーザ定義のヘッダを追加する"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " 編集... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "認証"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP認証 (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 "このエントリが空のときは、受信時と同じユーザIDとパスワードが使用されます。"
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "送信前にPOP3認証を行う"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "署名"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "直接入力"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "コマンドの出力"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr "署名を引用の前に入れる (非推奨)"
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "以下のアドレスを自動指定"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "標準でメッセージにPGP署名する"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "標準でメッセージをPGP暗号化する"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "暗号化されたメッセージに返信した場合は暗号化する"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "暗号化にASCII包装形式を使用する"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "クリアテキスト署名を使用する"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "署名鍵"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "標準のGnuPG鍵を使用する"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "自分の電子メールアドレスで鍵を選択する"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "鍵を手動で指定する"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "ユーザまたは鍵ID:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "SSLを使用しない"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "POP3の接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSLセッションの開始にSTARTTLSコマンドを使用"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4の接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "NNTPの接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "送信 (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "SMTPの接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "非ブロッキングSSLを使用する"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "SSLの接続に問題が生じる場合はオフにしてください。"
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "SMTPポートを指定"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "POP3ポートを指定"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "IMAP4ポートを指定"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "NNTPポートを指定"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "ドメイン名を指定"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAPサーバディレクトリ"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "このディレクトリのサブフォルダのみが表示されます。"
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "終了時にすべてのメッセージのキャッシュをクリアする"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "送信控フォルダの場所"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "草稿フォルダの場所"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "送信待ちフォルダの場所"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "ごみ箱フォルダの場所"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "アカウント名が入力されていません。"
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "メールアドレスが入力されていません。"
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "SMTPサーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "ユーザIDが入力されていません。"
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "POP3サーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4サーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "NNTPサーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "指定したフォルダは送信待ちフォルダではありません。"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/ko.po b/po/ko.po
index 41fa4c6b..518aa77a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -494,7 +494,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "인증 도중 에러 발생\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "파일에 설정을 쓰기가 실패했습니다\n"
@@ -686,14 +686,14 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "이름"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "프로토콜"
 
@@ -821,7 +821,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "주소"
@@ -997,7 +997,7 @@ msgstr "주소록"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "폴더"
 
@@ -1010,17 +1010,17 @@ msgstr "이메일 주소"
 msgid "Search:"
 msgstr "찾기"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "숨은 참조:"
@@ -1228,7 +1228,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "알림"
 
@@ -1614,111 +1614,111 @@ msgstr "/도구(_T)/실행(_x)"
 msgid "/_Tools/_Set spell language"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "첨부"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "제목:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "메일 발송"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1726,40 +1726,40 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1769,12 +1769,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1783,15 +1783,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1800,99 +1800,99 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "%s 파일을 열 수가 없습니다\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1900,12 +1900,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1915,52 +1915,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -2061,7 +2061,7 @@ msgid " Check File "
 msgstr " 파일 확인 "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "파일"
 
@@ -2142,7 +2142,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot 항목 편집"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2207,7 +2207,7 @@ msgstr ""
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "기본"
 
@@ -2299,7 +2299,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "고르기..."
 
@@ -4383,450 +4383,454 @@ msgstr "파일"
 msgid "Description: "
 msgstr "설명"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "계정 설정 창을 엽니다...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "계정%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "새 계정에대한 설정"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "계정 기본 설정"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "계정 설정 창을 생성합니다...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "받기"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "메일 발송"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "작성"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "프라이버시"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "고급"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "이 계정의 이름"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "기본 계정으로 설정"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "신상 정보"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "정식 이름"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "메일 주소"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "기관"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "서버 정보"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "뉴스(NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "로컬"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "이 서버는 인증을 필요로 합니다"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "뉴스 서버"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "받는 서버"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP 서버(발송용)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "사용자 계정"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "암호"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "이 서버는 인증을 필요로 합니다"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "받은 후 서버에서 메시지를 지움"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 #, fuzzy
 msgid "Remove after"
 msgstr "폴더 이름 변경"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 #, fuzzy
 msgid "days"
 msgstr "항상"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 일: 즉시 삭제)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "서버에서 모든 메시지를 받음"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "받을 크기 한도"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "받을때 메시지를 필터링"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "기본 우편함"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니다)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "인증 방법"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "자동"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "받을때 메시지를 필터링"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "뉴스"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "내려받을 최대 기사 수\n"
 "(0인 경우 제한 없음)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "헤더"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Date 헤더 항목을 추가"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Message-ID 생성"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "사용자 정의된 헤더 추가"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " 편집..."
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "인증"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 인증(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "보내기전 POP3와 인증"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "서명"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 #, fuzzy
 msgid "Command output"
 msgstr "명령어"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "참조"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "숨은 참조"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "회신주소"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "기본으로 메시지에 사인을 함"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "기본으로 메시지를 암호화"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "순수한 텍스트 서명 사용"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "기본 GnuPG 키 사용"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "당신의 전자우편 주소로 키 선택"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "수동으로 키 지정"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "사용자 혹은 키 ID:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "SSL을 사용하지 않습니다"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL 세션을 시작하기 위해 STARTTLS 명령을 사용합니다"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "SMTP 포트 번호"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "POP3 포트 번호"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 포트 지정"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "NNTP 포트 지정"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "도메인 이름 지정"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP 서버 디렉토리"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "서버에서 모든 메시지를 받음"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "보낸 메시지 저장"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "임시 메시지 저장"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "삭제된 메시지 저장"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "삭제된 메시지 저장"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "계정 이름이 입력되지 않았습니다."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "메일 주소가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "SMTP 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "사용자 아이디가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "POP3 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "NNTP 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/lt.po b/po/lt.po
index bc50a722..a4c653f1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -490,7 +490,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "klaida POP3 sesijoje\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "nepavyko įrašyti konfigūracijos į failą\n"
@@ -691,14 +691,14 @@ msgstr ""
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Vardas"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokolas"
 
@@ -826,7 +826,7 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresai"
@@ -998,7 +998,7 @@ msgstr "Adresų knyga"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Katalogas"
 
@@ -1010,17 +1010,17 @@ msgstr "El. pašto adresas"
 msgid "Search:"
 msgstr "Ieškoti:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Slapta kopija:"
@@ -1222,7 +1222,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1566,110 +1566,110 @@ msgstr "/Į_rankiai/_Tikrinti rašybą"
 msgid "/_Tools/_Set spell language"
 msgstr "/Į_rankiai/_Nustatyti kalbą"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: failas neegzistuoja\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Negaliu gauti dalies teksto\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Formato klaida."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Atsakymo/persiuntimo formato klaida."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti failo „%s“ dydžio\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Failas %s yra tuščias"
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Negaliu perskaityti %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Laiškas: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priedai"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatiškai nustatyti šiuos adresus"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Siųsti"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1677,40 +1677,40 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti laiško „outbox“."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nerandu rakto susieto su pasirinktu rakto ID „%s“."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1721,11 +1721,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1738,15 +1738,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1755,96 +1755,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Negaliu atidaryti žymų failo.\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Savybės"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: failas neegzistuoja\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Atveriamas vykdomasis failas"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1855,12 +1855,12 @@ msgstr ""
 "Jei norite jį paleisti, išsaugokite jį ir įsitikinkite ar tai ne virusas ar "
 "panaši kenkėjiška programa."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1869,48 +1869,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "_Derinti įrankių juostą..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -2009,7 +2009,7 @@ msgid " Check File "
 msgstr " Patikrinti failą "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Failas"
 
@@ -2089,7 +2089,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redaguoti JPilot įrašą"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2154,7 +2154,7 @@ msgstr "Skirtasis laikas (sek.)"
 msgid "Maximum Entries"
 msgstr "Įrašų maksimumas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Pagrindinis"
 
@@ -2246,7 +2246,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Pasirinkti... "
 
@@ -4292,232 +4292,232 @@ msgstr "Failas"
 msgid "Description: "
 msgstr "Aprašymas"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Atveriamas sąskaitos nustatymų langas...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Sąskaita%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Naujos sąskaitos nustatymai"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Sąskaitos nustatymai"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Sukuriamas sąskaitos nustatymų langas...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Gauti"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Siųsti"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Rašyti"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privatumas"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Papildomi"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Sąskaitos vardas"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Pažymėti kaip įprastą"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Asmeninė informacija"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Pilnas vardas"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "El. pašto adresas"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Severio informacija"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Naujienos (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Vietinis"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Serveris reikalauja patvirtinti autentiškumą"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Naujienų serveris"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Serveris pašto gavimui"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP serveris (siuntimui)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Vartotojo ID"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Naudoti saugų autentiškumo tikrinimą (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Po gavimo pašalinti laiškus iš serverio"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Pašalinti po"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "dienų"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 dienų: pašalinti iš karto"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "Atsisiųsti visus laiškus serveryje (įskaitant jau gautus)"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Dydžio limitas"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtruoti laiškus gaunant"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Gaunamų laiškų dėžutė"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Nefiltruoti laiškai bus laikomos šiame kataloge."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Autentiškumo patikrinimo metodas"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Tikrinti tik INBOX"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtruoti laiškus gaunant"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Naujienos"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Maksimalus parsiunčiamų laiškų skaičius"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Nelimituojama, jei nurodyta „0“."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "„Gauti visus“ tinkrina paštą šioje sąskaitoje"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Antraštė"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Pridėti „Date“ antraštės lauką"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Generuoti „Message-ID“"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Pridėti vartotojo nustatytas antraštes"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Redaguoti... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Autentiškumo patikrinimas"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentiškumo patikrinimas (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4525,203 +4525,207 @@ msgstr ""
 "Jei paliksite šiuos laukus tuščius, bus naudojamas tas pats vartotojo ID ir "
 "slaptažodis kaip ir gaunant."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Prieš siunčiant patikrinti autentiškumą su POP3"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Parašas"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Komandos išvestis"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatiškai nustatyti šiuos adresus"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "Pasirašyti laiškus su PGP"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "Koduoti laiškus su PGP"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Koduoti kai atsakoma į koduotą laišką"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Naudoti „ASCII-armored“ formatą kodavimui"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Naudoti „clear text“ parašą"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Parašo raktas"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Naudoti numatytąjį GnuPG raktą"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Parinkti raktą pagal jūsų el. pašto adresą"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Nurodyti raktą"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Vartotojo arba rakto ID"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Nenaudoti SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Naudoti SSL POP3 prisijungimui"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Naudoti STARTTLS komandą SSL sesijos pradžiai"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Naudoti SSL IMAP4 prisijungimui"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Naudoti SSL NNTP prisijungimui"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Siuntimas (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Naudoti SSL SMTP prisijungimui"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Naudoti „non-blocking SSL“"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Išjunkite, jei turite problemų su SSL prisijungimais."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Nurodykite SMTP prievadą"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Nurodykite POP3 prievadą"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Nurodykite IMAP4 prievadą"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Nurodykite NNTP prievadą"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Nurodykite domeno vardą"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP serverio katalogas"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Bus rodomi tik šio katalogo pakatalogiai."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Išvalyti laiškų laikinas kopijas (cache) išeinant"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Siųstus laiškus dėti į"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Juodraščius dėti į"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Laiškų eilę dėti į"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Ištrintus laiškus dėti į"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Neįvestas sąskaitos pavadinimas."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Neįvestas pašto adresas."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Neįvestas SMTP serveris."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Neįvestas vartotojo ID."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Neįvestas POP3 serveris."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Neįvestas IMAP4 serveris."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Neįvestas NNTP serveris."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "Nurodytas ne eilės katalogas."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/nl.po b/po/nl.po
index 6b6ab2e3..9b948661 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -496,7 +496,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "er is een fout opgetreden tijdens de POP3-sessie\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "opslaan van de configuratie is mislukt\n"
@@ -701,14 +701,14 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Naam"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -836,7 +836,7 @@ msgstr "Gebruikersargumenten voor actie"
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adres"
@@ -1011,7 +1011,7 @@ msgstr "Adresboek"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Accounts"
 
@@ -1023,17 +1023,17 @@ msgstr "E-mail adres"
 msgid "Search:"
 msgstr "Zoeken:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1245,7 +1245,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1593,110 +1593,110 @@ msgstr "/_Gereedschap/_Spellingscontrole"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Gereedschap/_Taal instellen"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Geen onderwerp"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Bijlagen"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Verzenden"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1704,40 +1704,40 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kon gee bijpassende sleutel vinden voor geselecteerde sleutel-id `%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1748,11 +1748,11 @@ msgstr ""
 "\n"
 "Toch versturen als %s?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1765,15 +1765,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1782,96 +1782,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Eigenschappen"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Openen van uitvoerbaar bestand"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1883,12 +1883,12 @@ msgstr ""
 "Als u het wilt uitvoeren, dient u het bestand ergens op te slaan en te "
 "controleren om virussen geen kans te geven."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "De ingegeven opdracht voor de externe editor is onjuist: '%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1897,48 +1897,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -2038,7 +2038,7 @@ msgid " Check File "
 msgstr " Controleer bestand"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Bestand"
 
@@ -2120,7 +2120,7 @@ msgid "Edit JPilot Entry"
 msgstr "Bewerk JPilot veld"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr "Bladeren..."
@@ -2185,7 +2185,7 @@ msgstr "Timeout (sec)"
 msgid "Maximum Entries"
 msgstr "Maximum aantal velden"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Algemeen"
 
@@ -2278,7 +2278,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Selecteer..."
 
@@ -4358,234 +4358,234 @@ msgstr "Bestand"
 msgid "Description: "
 msgstr "Beschrijving"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Accountvoorkeuren"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Naam van dit account"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Instellen als standaard"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organisatie"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Serverinformatie"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Nieuws (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Niets (lokaal)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Deze server vereist authentificatie"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Nieuwsserver"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Server om van te ontvangen"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP server (om te verzenden)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Gebruikersnaam"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Veilige identificatie gebruiken (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Verwijder berichten op de server wanneer ze worden opgehaald"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Verwijderen na"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "dagen"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 dagen: direct verwijderen"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Haal alle berichten op van server"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Limiet ontvangstgrootte"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Standaard inbox"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ongefilterde berichten zullen hier opgeslagen worden"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Identificatiemethode"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Alleen de INBOX op nieuwe e-mail controleren"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Nieuws"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Maximum aantal te downloaden artikelen"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Geen limiet als 0 is ingesteld."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Alles ophalen' haalt de e-mail voor dit account op"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Datum veld toevoegen aan header"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr "Bewerken"
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Identificatie"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP identificatie (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4593,205 +4593,209 @@ msgstr ""
 "Als u deze ingangen niet invult, zal hetzelfde naam/wachtwoord-paar gebruikt "
 "worden als voor het ontvangen."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Identificatie met POP3 voor het verzenden"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Resultaat van opdracht"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Antwoorden naar"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Standaard een identificatiehandtekening toevoegen"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Standaard het bericht coderen"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Versleutelen indien reactie op versleuteld bericht"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII-versterkt formaat gebruiken voor codering"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Teksthandtekening gebruiken"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Signeersleutel"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Gebruik standaard GnuPG sleutel"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Selecteer sleutel naar e-mail adres"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Specificeer sleutel zelf"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Gebruikers- of sleutel-ID:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Geen SSL gebruiken"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "SSL gebruiken voor POP3 verbinding"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Het STARTTLS commando gebruiken om een SSL sessie te starten"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL gebruiken voor IMAP verbinding"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "SSL gebruiken voor NNTP verbinding"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Verzenden (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "SSL gebruiken voor SMTP verbinding"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Niet-blokkerende SSL gebruiken"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Zet dit uit als u problemen met de SSL-verbinding heeft."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "SMTP poort"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "POP3 poort"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 poort"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "SMTP poort"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Specificeer domeinnaam"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP server-map"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Alleen de submappen van deze map zullen weergegeven worden."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Alle buffers legen bij afsluiten"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Verzonden berichten opslaan in"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Kladberichten opslaan in"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Wachtrijberichten opslaan in"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Verwijderde berichten opslaan in"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Accountnaam is niet ingevuld."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "E-mail adres is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "SMTP server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Gebruikersnaam is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "POP3 server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "NNTP server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "Aangegeven map kan niet gebruikt worden als wachtrij."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/pl.po b/po/pl.po
index eb0c9fd4..8b6cedd4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2008-06-17 22:25+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -482,7 +482,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "wystąpił błąd podczas sesji POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "błąd podczas zapisu konfiguracji do pliku\n"
@@ -685,14 +685,14 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokół"
 
@@ -820,7 +820,7 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adres"
@@ -992,7 +992,7 @@ msgstr "Książka adresowa"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Katalog"
 
@@ -1005,17 +1005,17 @@ msgstr "Adres e-mail"
 msgid "Search:"
 msgstr " Szukaj "
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
@@ -1223,7 +1223,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1568,107 +1568,107 @@ msgstr "/_Narzędzia/_Sprawdź pisownię"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Narzędzia/_Zmień język sprawdzania pisowni"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Tworzenie wiadomości%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Pusty temat"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 msgid "Attachment is missing"
 msgstr "Brak załącznika"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nie ma załączników. Wysłać bez załącznika?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "Sprawdź odbiorców"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 msgid "Really send this mail to the following addresses?"
 msgstr "Na pewno wysłać tę wiadomość do następujących odbiorców?"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Temat:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1676,38 +1676,38 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nie można znaleźć klucza związanego z wybranym identyfikatorem klucza \"%s\"."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 msgid "Can't sign the message."
 msgstr "Nie można podpisać wiadomości."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 msgid "Can't encrypt the message."
 msgstr "Nie można zaszyfrować wiadomości."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 msgid "Can't encrypt or sign the message."
 msgstr "Nie można zaszyfrować lub podpisać wiadomości."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1717,11 +1717,11 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to w %s ?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr ""
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1730,16 +1730,16 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Limit długości linii"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 #, fuzzy
 msgid "Encrypting with Bcc"
 msgstr "Szyfrowanie z odbiorcami ukrytej kopii"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 #, fuzzy
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
@@ -1755,96 +1755,96 @@ msgstr ""
 "\n"
 "Wysłać mimo to?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Plik %s nie istnieje."
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nie można otworzyć pliku %s."
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Właściwości"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Otwieranie pliku wykonywalnego"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1856,12 +1856,12 @@ msgstr ""
 "Aby go uruchomić, zapisz go gdzieś i upewnij się, że nie jest to wirus bądź "
 "inny niepożądany program."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1870,48 +1870,48 @@ msgstr ""
 "Zewnętrzny edytor wciąż pracuje.\n"
 "Czy wymusić zakończenie procesu (pid: %d)?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "_Dostosuj pasek narzędzi..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Zapisz wiadomość"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmodyfikowana. Zapisać ją w folderze szkiców?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Zamień"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Wstaw"
 
@@ -2010,7 +2010,7 @@ msgid " Check File "
 msgstr " Sprawdź plik"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Plik"
 
@@ -2090,7 +2090,7 @@ msgid "Edit JPilot Entry"
 msgstr "Edytuj wpis JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2155,7 +2155,7 @@ msgstr "Opóźnienie (sek)"
 msgid "Maximum Entries"
 msgstr "Maksymalna ilość pozycji"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Podstawowe"
 
@@ -2247,7 +2247,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Wybierz... "
 
@@ -4279,241 +4279,241 @@ msgstr "Plik"
 msgid "Description: "
 msgstr "Opis"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Otwieranie okna preferencji konta...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Preferencje nowego konta"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferencje konta"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Tworzenie okna preferencji okna...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Odbieranie"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Utwórz"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Nazwa tego konta"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Ustaw jako domyślne"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Informacje osobiste"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Pełna nazwa"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Adres e-mail"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organizacja"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Informacje o serwerze"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Żaden (lokalnie)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Ten serwer wymaga autoryzacji"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Serwer news"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Serwer dla odbioru"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Serwer SMTP (dla wysyłania)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Hasło"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Użyj bezpiecznej autentykacji (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Usuwanie wiadomości z serwera po odebraniu"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Usuwanie po"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "dniach"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dni: usuwa natychmiast)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Pobieranie wszystkich wiadomości z serwera"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Ograniczenie wielkości pobierania"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtrowanie wiadomości podczas odbierania"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Domyślny inbox"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Tylko przy ręcznym odbieraniu"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrowanie wiadomości podczas odbierania"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksymalna liczba pobieranych artykułów\n"
 "(bez ograniczeń - 0)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Odbierz wszystkie\" sprawdza pocztę dla tego konta"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Nagłówek"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Dodawanie pola Data do nagłówka"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Generowanie identyrikatora wiadomości"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Dodawanie nagłówka zdefiniowanego przez użytkownika"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr "Edycja..."
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Uwierzytelnianie SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4521,208 +4521,212 @@ msgstr ""
 "Jeśli te pola pozostaną puste, użyty zostanie ten sam login i hasło, co przy "
 "odbieraniu."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Uwierzytelnianie POP3 przed wysyłaniem"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Bezpośrednio wprowadzony"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Wyjście polecenia"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatyczne ustawianie następujących adresów"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Kopia"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Ukryta kopia"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Adres zwrotny"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Domyślnie podpisywanie wiadomości"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Domyślnie szyfrowanie wiadomości"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Szyfruj odpowiedzi na szyfrowane wiadomości"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Używanie formatu ASCII-armored dla szyfrowania"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Wstawianie podpisu czystym tekstem"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Klucz"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Używanie standardowego klucza GnuPG"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Wybieranie klucz poprzez swój adres e-mail"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Ręczne określanie klucza"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Użytkownik lub klucz ID:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Nie korzystanie z SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Używanie SSL dla połączeń POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Używanie polecenia STARTTLS by rozpocząć sesję SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Używanie SSL dla połączeń IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Używanie SSL dla połączeń NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Wysyłanie (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Używanie SSL dla połączeń SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Używanie nieblokującego SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Wyłącz to, jeśli masz problemy z połączeniem SSL)"
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Określ port SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Określ port POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Określ port IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Określ port NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Określ nazwę domeny"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Katalog serwera IMAP4."
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Zostaną wyświetlone tylko podkatalogi tego folderu."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Pobieranie wszystkich wiadomości z serwera"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Zapisywanie wysłanych wiadomości do"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Zapisywanie szablonów wiadomości do"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Zapisywanie usuniętych wiadomości do"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Zapisywanie usuniętych wiadomości do"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Nie określono nazwy konta."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Nie określono adresu e-mail."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Nie określono serwera SMTP."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Nie określono ID użytkownika."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Nie określono serwera POP3."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Nie określono serwera IMAP4."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Nie określono serwera NNTP."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "Dany katalog nie jest katalogiem kolejki."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0c50dd27..6c87bf1b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2010-02-22 15:47-0300\n"
 "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n"
 "Language-Team: Portuguese/Brazil <(none)>\n"
@@ -499,7 +499,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "Erro na sessão POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "falha ao gravar a configuração no arquivo\n"
@@ -699,14 +699,14 @@ msgstr ""
 "na coluna \"G\" para habilitar essa caixa no comando \"Receber todas\"."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -834,7 +834,7 @@ msgstr "Argumento de usuário para a ação"
 msgid "Add Address to Book"
 msgstr "Adicionar ao Catálogo de Endereços"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Endereço"
@@ -1005,7 +1005,7 @@ msgstr "Catálogo de endereços"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Pasta"
 
@@ -1017,17 +1017,17 @@ msgstr "Endereço de e-mail"
 msgid "Search:"
 msgstr "Procurar:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Cco:"
@@ -1238,7 +1238,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1582,108 +1582,108 @@ msgstr "/_Ferramentas/_Verificar ortografia"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Definir _idioma do verificador ortográfico"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Não foi possível receber o texto\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível obter o tamanho de %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) desta mensagem."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Editando%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "O assunto está em branco. Enviar mesmo assim?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 msgid "Attachment is missing"
 msgstr "Anexo faltante"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Não há anexos. Enviar assim mesmo?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "Verificar destinatários"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 msgid "Really send this mail to the following addresses?"
 msgstr ""
 "Você realmente deseja enviar este e-mail para os seguintes destinatários?"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "Não foi possível  obter a lista de destinatários."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1691,37 +1691,37 @@ msgstr ""
 "A conta para envio de mensagem não foi especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Não foi possível armazenar a mensagem na caixa de saída."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Não foi possível localizar a chave para \"%s\"."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 msgid "Can't sign the message."
 msgstr "Não foi possível assinar a mensagem."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 msgid "Can't encrypt the message."
 msgstr "Não foi possível cripografar a mensagem."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 msgid "Can't encrypt or sign the message."
 msgstr "Não foi possível assinar ou criptografar a mensagem."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1733,11 +1733,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Erro ao converter a codificação"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1750,15 +1750,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Criptografando com Bcc"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1772,96 +1772,96 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "não foi possível remover a mensagem antiga\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "O arquivo %s não existe."
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Assinar com PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Criptografar com PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Propriedades"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Abrindo arquivo executável"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1873,12 +1873,12 @@ msgstr ""
 "Se você deseja executá-lo, salve-o em algum diretório e certifique-se de que "
 "não seja um vírus ou programa malicioso."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linha de comando do editor externo inválida: \"%s\"\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1887,49 +1887,49 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "_Personalizar a barra de ferramentas..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Esta mensagem foi modificada.  Você deseja salvá-la na pasta de rascunhos?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Você deseja aplicar o modelo \"%s\"?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2028,7 +2028,7 @@ msgid " Check File "
 msgstr " Verificar Arquivo "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Arquivo"
 
@@ -2108,7 +2108,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2173,7 +2173,7 @@ msgstr "Tempo limite (segundos)"
 msgid "Maximum Entries"
 msgstr "Número máximo de registros"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Básicas"
 
@@ -2261,7 +2261,7 @@ msgid "MH (number only)"
 msgstr "MH (somente número)"
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Selecionar..."
 
@@ -4287,232 +4287,232 @@ msgstr "Arquivo: "
 msgid "Description: "
 msgstr "Descrição: "
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo janela de preferências da conta...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Conta%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Preferências para a nova conta"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferências da conta"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Criando janela de preferências da conta...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Enviar"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Avançadas"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Nome desta conta"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Marcar como padrão"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Informações pessoais"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organização"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Informações do servidor"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Notícias (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Nenhuma (local)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Este servidor requer autenticação"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Servidor de notícias"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Servidor de recepção"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (envio)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Usuário"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Senha"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autenticação segura (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Excluir mensagens recebidas do servidor"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Excluir depois de"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "dias"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 dias: exclui imediatamente"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "Receber todas as mensagens (incluindo as já recebidas) no servidor"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Limite de tamanho de recebimento"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Caixa de Entrada Padrão"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Mensagens não filtradas serão guardadas nesta pasta."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Método de Autenticação"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Verificar apenas a Caixa de Entrada ao receber"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrar novas mensagens na Caixa de Entrada ao receber"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Notícias"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos para receber"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Sem limite se 0 for especificado."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Receber todas\" verifica novas mensagens nessa conta"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabeçalho"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Adicionar campo de data"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalhos personalizados"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4520,203 +4520,207 @@ msgstr ""
 "Se você deixar essas opções em branco, o nome de usuário e a senha de "
 "recebimento serão usados."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar com POP3 antes de enviar"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Digitar diretamente"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Saída de comando"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Responder"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "Assinar mensagens com PGP por padrão"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "Criptografar mensagens com PGP por padrão"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Criptografar quando responder a uma mensagem criptografada"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII-armored para criptografia"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Inserir assinatura de texto puro"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Chave de assinatura"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Usar a chave GnuPG padrão"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Selecionar a chave de acordo com seu endereço de e-mail"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Indicar uma chave manualmente"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Nome de usuário ou ID da chave:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Não usar SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para conexão POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar comando STARTTLS para iniciar a sessão SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para conexão IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para conexão NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para conexão SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL não-bloqueante"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Desabilite isso se você tiver problemas na conexão SSL"
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Indicar a porta SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Indicar a porta POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Indicar a porta IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Indicar a porta NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Indicar o nome do domínio"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Servidor de diretório IMAP"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Apenas as subpastas deste diretório serão exibidas."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Limpar todos os caches de mensagens ao sair"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Colocar mensagens enviadas em"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Colocar mensagens de rascunho em"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Colocar mensagens a serem enviadas em"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Colocar mensagens excluídas em"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Nome da conta não definido."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Endereço de e-mail não especificado."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Servidor SMTP não especificado."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Usuário não especificado."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Servidor POP3 não especificado."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Servidor IMAP4 não especificado."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Servidor NNTP não especificado."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "A pasta especificada não é do tipo \"Caixa de Saída\"."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/ro.po b/po/ro.po
index 460ba61c..1b383b59 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2010-05-09 12:41+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: Gnome Romanian Team <gnomero-list@lists.sourceforge.net>\n"
@@ -499,7 +499,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "a apărut o eroare la sesiunea POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "scrierea configurație în fișier a eșuat\n"
@@ -703,14 +703,14 @@ msgstr ""
 "pentru a activa recepționarea mesajelor la comanda „Verifică tot”."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nume"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -847,7 +847,7 @@ msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
 # în meniu la compunere
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Agendă"
@@ -1021,7 +1021,7 @@ msgstr "Agendă"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Dosar"
 
@@ -1033,17 +1033,17 @@ msgstr "Adresă de e-mail"
 msgid "Search:"
 msgstr "Caută:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Către:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1252,7 +1252,7 @@ msgstr "Adrese comune"
 msgid "Personal address"
 msgstr "Adrese personale"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1601,109 +1601,109 @@ msgstr "/_Unelte/Verifi_că ortografia"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Unelte/_Selectați limba ortografiei"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fișier inexistent\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Nu se poate obține partea de text\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citației."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Eroare de format al mesajului de răspuns sau înaintat."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fișierul %s nu există\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nu se poate obține dimensiunea fișierului %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Fișierul %s este gol."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Nu se poate citi %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compune%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu este specificat."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Subiect gol"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Subiectul este gol. Trimiteți mesajul oricum ?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 msgid "Attachment is missing"
 msgstr "Lipsă atașament"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nu este atașat niciun fișier. Trimiteți fără atașamente ?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "Confirmare destinatari"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 msgid "Really send this mail to the following addresses?"
 msgstr "Sigur trimiteți acest mesaj către următoarele adrese ?"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Subiect:"
 
 # butonul de la confirmarea cui se trimite
-#: src/compose.c:3330
+#: src/compose.c:3347
 msgid "_Send"
 msgstr "_Trimite"
 
 # hm ?
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1711,38 +1711,38 @@ msgstr ""
 "Contul pentru trimitere de mesaje nu este specificat.\n"
 "Vă rugăm să selectați un cont înainte de a trimite."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A apărut o eroare în timpul trimiterii mesajului către %s ."
 
 # !!! dependent de traducerea lui Outbox !!!
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Nu se poate salva mesajul în „Trimise”."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nu s-a putut găsi nicio cheie asociată cu ID-ul cheii selectate „%s”."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 msgid "Can't sign the message."
 msgstr "Nu se poate semna mesajul."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 msgid "Can't encrypt the message."
 msgstr "Nu se poate cripta mesajul."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 msgid "Can't encrypt or sign the message."
 msgstr "Nu se poate cripta sau semna mesajul."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fișierului\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1754,11 +1754,11 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ca %s ?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1771,15 +1771,15 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Criptare cu Bcc"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1793,96 +1793,96 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "nu se poate șterge mesajul vechi\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de așteptare...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi dosarul de coadă\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de așteptare\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Fișierul %s nu există."
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nu se poate deschide fișierul %s."
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Creare fereastră de compunere...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Tipul MIME nu este valid."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Proprietăți"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: fișier inexistent\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Deschidere fișier executabil"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1894,12 +1894,12 @@ msgstr ""
 "Dacă vreți să îl lansați în execuție, salvați-l undeva și asigurați-vă că nu "
 "este un virus sau un alt tip de program malițios."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru editor extern nu este validă: „%s”\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1908,49 +1908,49 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Selectați fișierele"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selectați fișierul"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Salvare mesaj"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Îl salvați în dosarul Ciorne ?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vreți să aplicați șablonul „%s” ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -2049,7 +2049,7 @@ msgid " Check File "
 msgstr " Verifică fișierul "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Fișier"
 
@@ -2130,7 +2130,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editare înregistrare JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2196,7 +2196,7 @@ msgstr "Expirare de timp (secunde)"
 msgid "Maximum Entries"
 msgstr "Număr maxim de înregistrări"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "De bază"
 
@@ -2284,7 +2284,7 @@ msgid "MH (number only)"
 msgstr "MH (doar număr)"
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Selectează... "
 
@@ -4341,238 +4341,238 @@ msgstr "Fișier: "
 msgid "Description: "
 msgstr "Descriere: "
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Deschidere fereastră de preferințe cont...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Cont%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Preferințe pentru contul nou"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferințe cont"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Creare fereastră de preferințe cont...\n"
 
 # obs: tab-ul din common preferences și edit accounts
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Primire"
 
 # comun și pentru butonul de pe toolbar și pentru tabul din common preferences și edit accounts
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Trimite"
 
 # comun și pentru butonul de pe toolbar și pentru tabul din common preferences și edit accounts
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Compune"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Confidențialitate"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Avansat"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Numele acestui cont"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Stabilește ca implicit"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Informații personale"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Nume complet"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Adresă de e-mail"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organizație"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Informații despre server"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Știri (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Nimic (local)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Acest server necesită autentificare"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Server de știri"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Server pentru primire"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Server SMTP (trimitere)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "ID utilizator"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Parolă"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Folosește autentificarea securizată (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Șterge mesajele de pe server la primire"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Șterge după"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "zile"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 zile: șterge imediat"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "Descarcă toate mesajele de pe server (inclusiv cele deja primite)"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Limită dimensiune pentru primire"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KiB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtrează mesajele la primire"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Inbox-ul implicit"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Mesajele nefiltrate vor fi stocate în acest dosar."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Metodă de autentificare"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automat"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "La primire verifică doar INBOX"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "La primire filtrează mesajele noi în INBOX"
 
 # hm ? titlu de chenar; ar trebui să includă partea cu NNTP pentru consecvență cu POP3 și IMAP
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Număr maxim de articole pentru descărcare"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Fără limită dacă este specificat 0."
 
 # !!! dependent de traducerea butonului Get all !!!
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 "„Verifică tot” verifică pentru eventuale mesaje noi (și) pentru acest cont"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Antet"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Adaugă câmpul „Date” la antet"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Generează câmpul „Message-ID”"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Adaugă un antet definit de utilizator"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Editare... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificare SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4580,206 +4580,210 @@ msgstr ""
 "Dacă lăsați goale aceste intrări, se va utiliza același nume utilizator și "
 "aceeași parolă ca și pentru primire."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentifică cu POP3 înainte de a trimite"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Semnătură"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Introducere directă"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Rezultat comandă"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Completare automată a următoarelor câmpuri de adrese"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
 # obs: câmpul propriu de întoarcere când se răspunde cuiva, la conturi
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Răspuns către"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "Semnează PGP mesajele în mod implicit"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "Criptează PGP mesajele în mod implicit"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Criptează când se răspunde la un mesaj criptat"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Folosește formatul de criptare ASCII-armored"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Folosește semnătură în text clar"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Cheie pentru semnătură"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Folosește cheia implicită GnuPG"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Selectează cheia după adresa de e-mail"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Specifică cheia manual"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Nume utilizator sau ID cheie:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Nu folosi SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Folosește SSL pentru conexiunea POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Folosește comanda STARTTLS pentru a porni sesiunea SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Folosește SSL pentru conexiunea IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Folosește SSL pentru conexiunea NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Trimitere (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Folosește SSL pentru conexiunea SMTP"
 
 # hm ? sau fără blocare ?
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Folosește SSL non-blocking"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Deselectați aici dacă aveți probleme cu conexiunea SSL."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Specifică portul SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Specifică portul POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Specifică portul IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Specifică portul NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Specifică numele de domeniu"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Director server IMAP"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Vor fi afișate numai subdosarele acestui director."
 
 # hm ?
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Șterge la ieșire toate mesajele din cache"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Pune mesajele trimise în"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Pune ciorna în"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Pune mesajele de la coadă în"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Pune mesajele șterse în"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Nu a fost introdus numele contului."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Nu a fost introdusă adresa de e-mail."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Nu a fost introdus serverul SMTP."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Nu a fost introdus numele utilizator."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Nu a fost introdus serverul POP3."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Nu a fost introdus serverul IMAP4."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Nu a fost introdus serverul NNTP."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "Dosarul specificat nu este dosar de coadă."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/ru.po b/po/ru.po
index df5a4574..d8b60885 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2010-06-15 15:18+0400\n"
 "Last-Translator: \n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -497,7 +497,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "ошибка сеанса POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "ошибка при записи настроек в файл\n"
@@ -698,14 +698,14 @@ msgstr ""
 "по команде \"Получить все\"."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Имя"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -833,7 +833,7 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адрес"
@@ -1005,7 +1005,7 @@ msgstr "Адресная книга"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
@@ -1017,17 +1017,17 @@ msgstr "Адрес E-Mail"
 msgid "Search:"
 msgstr "Поиск:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Скрытно:"
@@ -1235,7 +1235,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1579,107 +1579,107 @@ msgstr "/Инструменты/Проверить орфографию"
 msgid "/_Tools/_Set spell language"
 msgstr "/Инструменты/Язык для проверки орфографии"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Тема не указана"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 msgid "Attachment is missing"
 msgstr "Вложения отсутствуют"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Вложения отсутствуют. Отправить без вложений?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "Проверить получателей"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 msgid "Really send this mail to the following addresses?"
 msgstr "Отправить сообщения по следующим адресам?"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 msgid "_Send"
 msgstr "Отправить"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1687,37 +1687,37 @@ msgstr ""
 "Учётная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите её перед отправкой."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору \"%s\"."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 msgid "Can't sign the message."
 msgstr "Невозможно подписать сообщение."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 msgid "Can't encrypt the message."
 msgstr "Невозможно зашифровать сообщение."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 msgid "Can't encrypt or sign the message."
 msgstr "Невозможно зашифровать или подписать сообщение."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1728,11 +1728,11 @@ msgstr ""
 "\n"
 "Отправить его в кодировке %s?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Ошибка преобразования кодировки"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1745,15 +1745,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Зашифровать с Bcc"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1766,95 +1766,95 @@ msgstr ""
 "\n"
 "Отправлять?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не найден"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "Не удалось открыть файл %s."
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Свойства"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 msgid "File not exist."
 msgstr "Файл не существует."
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Открытие исполняемого файла"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1866,12 +1866,12 @@ msgstr ""
 "Если вы всё же хотите запустить этот файл, сохраните его на диске и "
 "убедитесь, что файл не содержит вирусов и других опасных программ."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1881,48 +1881,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "Настроить панель инструментов"
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -2021,7 +2021,7 @@ msgid " Check File "
 msgstr " Проверить файл "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Файл"
 
@@ -2101,7 +2101,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактирование записи JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2166,7 +2166,7 @@ msgstr "Тайм-аут (сек)"
 msgid "Maximum Entries"
 msgstr "Максимальный размер результата"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Основные"
 
@@ -2253,7 +2253,7 @@ msgid "MH (number only)"
 msgstr "MH (только участник)"
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Выбор... "
 
@@ -4275,232 +4275,232 @@ msgstr "Файл:"
 msgid "Description: "
 msgstr "Описание:"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Открытие окна настроек учётной записи...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Учётная запись %d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Настройки новой учётной записи"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Настройки учётной записи"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Создание окна настроек учётной записи...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Приём"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Отправить"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Написать"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Защита"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Имя учётной записи"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "По умолчанию"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Полное имя"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Организация"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Сведения о серверах"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Новостной (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Нет (локальный)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Этот сервер требует аутентификации"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Сервер новостей"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Сервер для приёма"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Сервер SMTP (для отправки)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Имя пользователя"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Пароль"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Использовать безопасную аутентификацию (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Удалять сообщения с сервера после приёма"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Удалить через"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "дней"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 дней: удалить немедленно"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "Принять все сообщения с сервера (включая ранее принятые)"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Принимать только сообщения размером не более"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "КБ"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Фильтровать сообщения при приёме"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Папка для входящих сообщений"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Неотфильтрованные сообщения будут сохранены в этой папке."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Метод аутентификации"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Проверять только папку входящих сообщений (INBOX) при приёме"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Фильтровать новые сообщения в INBOX при приеме"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Новости"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Наибольшее число статей для загрузки"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Не ограничено, если указан 0."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "Проверять по команде \"Получить все\""
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заголовок"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Добавить в заголовок поле Date"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Создавать Message-ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Добавить дополнительные заголовки"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Определить... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Аутентификация"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Аутентификация SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4508,203 +4508,207 @@ msgstr ""
 "Если оставить эти поля пустыми, будут использоваться имя пользователя и "
 "пароль, заданные для приёма почты."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Проверка пароля через POP3 перед отправкой"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Прямой ввод"
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Автоматически устанавливать адреса"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Копия"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Скрытно"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Адрес для ответов"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "Подписывать сообщения по умолчанию"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "Шифровать сообщения по умолчанию"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Шифровать ответы на зашифрованные сообщения"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Использовать ASCII-кодирование при шифровании"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Использовать открытую текстовую подпись"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Ключ подписи"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Ключ GnuPG по умолчанию"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Ключ для выбранного адреса E-mail"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Другой ключ"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "ID пользователя ключа:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Не использовать SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Использовать SSL для соединения POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Использовать команду STARTTLS для начала сеанса SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Использовать SSL для соединения IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Использовать SSL для соединения NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Отправка (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Использовать SSL для соединения SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Использовать неблокирующий режим SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Выключите эту опцию, если возникают проблемы при использовании SSL."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Порт SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Порт POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Порт IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Порт NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Имя домена"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP4"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Будут отображены только подкаталоги этого каталога."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Очищать кеш сообщений при выходе"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Сохранять отправленные сообщения в"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Сохранять черновики в"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Сохранять сообщения, ожидающие отправки, в"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Сохранять удалённые сообщения в"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Не указано имя учётной записи."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Не указан адрес E-Mail."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Не указан сервер SMTP."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Не указано имя пользователя."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Не указан сервер POP3."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Не указан сервер IMAP4."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Не указан сервер NNTP."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "Указанная папка не является папкой очереди сообщений."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/sk.po b/po/sk.po
index 78eb132e..3f3aeffb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -489,7 +489,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "vyskytla sa chyba pri POP3 spojení\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "nepodarilo sa zapísať nastavenie do súboru\n"
@@ -691,14 +691,14 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Meno"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -828,7 +828,7 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresár"
@@ -1004,7 +1004,7 @@ msgstr "Otvoriť adresár"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Priečinok"
 
@@ -1017,17 +1017,17 @@ msgstr "E-mailová adresa"
 msgid "Search:"
 msgstr "Hľadať"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Slepá kópia:"
@@ -1242,7 +1242,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1627,111 +1627,111 @@ msgstr "/_Nástroje/V_ykonať"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Prílohy"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Odoslať"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1739,40 +1739,40 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nemôžem nájsť žiadny kľúč asociovaný so zvoleným ID kľúča `%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1783,12 +1783,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1797,15 +1797,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1814,98 +1814,98 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Nemôžem otvoriť súbor %s\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Vlastnosti"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1913,12 +1913,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1928,52 +1928,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2074,7 +2074,7 @@ msgid " Check File "
 msgstr "Testovať súbor"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Súbor"
 
@@ -2156,7 +2156,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upraviť záznam JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2221,7 +2221,7 @@ msgstr "Timeout (v sekundách)"
 msgid "Maximum Entries"
 msgstr "Maximum záznamov"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Základné"
 
@@ -2314,7 +2314,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Zvoľte..."
 
@@ -4402,242 +4402,242 @@ msgstr "Súbor"
 msgid "Description: "
 msgstr "Popis"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Otváram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Nastavenie nového konta"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Nastavenie konta"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Vytváram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Nová správa"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Názov tohto konta"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Nastaviť ako východzie"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Osobné informácie"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Celé meno"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "E-mailová adresa"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organizácia"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Informácie o serveri"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Žiadne (lokálne)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizáciu"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Tento server vyžaduje autentizáciu"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na serveri po ich prijatí"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Vymazať po"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "dňoch"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dní: zmazať ihneď)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Prijať všetky správy na serveri"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Obmedzenie veľkosti správy pre príjem"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Východzí inbox"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Metóda autentizácie"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automatická"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Len pri manuálnom prijímaní"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Diskusné skupiny"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maximálny počet príspevkov na stiahnutie\n"
 "(0 pre neobmedzený počet)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nie je určený príjemca."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "Pri voľbe 'Prijať všetko' prijať správy aj pre toto konto"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Hlavička"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Pridať dátum do hlavičky"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Generovať Message-ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Upresniť... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Autentizácia"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentizácia (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4646,208 +4646,212 @@ msgstr ""
 "Ak necháte tieto polia prázdne, bude použité to isté\n"
 "prihlasovacie meno a heslo ako pri prijímaní."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizovať cez POP3 pred odosielaním"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Kópia"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Slepá kópia"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Odpovedať komu"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Implicitne podpísať správu"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Implicitne zašifrovať správu"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Šifrovať do ASCII-armored tvaru"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Podpísať čistým textom"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Kľúč pre podpis"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Použiť východzí kľúč GnuPG"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Zvoliť kľúč podľa vašej emailovej adresy"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Zadať kľúč ručne"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "User alebo key ID:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Nepoužívať SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Použiť SSL pre POP3 spojenie"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použiť príkaz STARTTLS pre nadviazanie SSL spojenia"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použiť SSL pre IMAP4 spojenie"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Použiť SSL pre NNTP spojenie"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Použiť SSL pre SMTP spojenie"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Používať non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Vypnite túto voľbu ak máte problémy pri SSL spojeniach)"
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Určiť SMTP port"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Určiť POP3 port"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Určiť IMAP4 port"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Určiť NNTP port"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Určiť názov domény"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Priečinok serveru IMAP"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Prijať všetky správy na serveri"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov konta."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná e-mailová adresa."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Nebol zadaný user ID."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Nebol zadaný POP3 server."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Nebol zadaný IMAP4 server."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/sl.po b/po/sl.po
index 3da08eae..488549c0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -494,7 +494,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "neuspešen poskus zapisa konfiguracije v datoteko\n"
@@ -699,14 +699,14 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -834,7 +834,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Naslov"
@@ -1010,7 +1010,7 @@ msgstr "Imenik naslovov"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Mapa"
 
@@ -1023,17 +1023,17 @@ msgstr "Elektronski naslov"
 msgid "Search:"
 msgstr "Iskanje"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Skp:"
@@ -1247,7 +1247,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1633,111 +1633,111 @@ msgstr "/_Orodja/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priloge"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Pošlji"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1745,40 +1745,40 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Ne najdem tipke, ki bi bila povezana z identifikatorjem tipke `%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1788,12 +1788,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1802,15 +1802,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1819,99 +1819,99 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne morem odpreti datoteke %s\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1919,12 +1919,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1934,52 +1934,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "To sporočilo je bilo spremenjeno. Naj ga zavržem?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2080,7 +2080,7 @@ msgid " Check File "
 msgstr " Preveri Datoteko "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Datoteka"
 
@@ -2161,7 +2161,7 @@ msgid "Edit JPilot Entry"
 msgstr "Urejanje vnosa JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2226,7 +2226,7 @@ msgstr "Čas izteka (sek.)"
 msgid "Maximum Entries"
 msgstr "Največje št. vnosov"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2318,7 +2318,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Izberi... "
 
@@ -4405,241 +4405,241 @@ msgstr "Datoteka"
 msgid "Description: "
 msgstr "Opis"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Odpiram okno za nastavitve računa...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Račun%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Nastavitve novega računa"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Nastavitve računa"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Ustvarjam okno za nastavitve računa...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Sprejmi"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Zasebnost"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Ime tega računa"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Nastavi kot privzeto"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Osebni podatki"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Polno ime"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Poštni naslov"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Podatki o strežniku"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Novice (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Noben (lokalen)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Ta strežnik zahteva overovitev"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Novičarski strežnik"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Strežnik za sprejemanje"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Strežnik SMTP (pošiljanje)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Uporabniško ime"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Geslo"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ta strežnik zahteva overovitev"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Ob sprejemu odstrani sporočila s strežnika"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Odstrani po"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "dneh"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dnevih: odstrani nemudoma)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Naloži vsa sporočila na strežniku"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Omejitev dolžine pri sprejemanju"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtriranje sporočil ob sprejemu"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Privzeta mapa za prejeto pošto"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Overovitvena metoda"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtriranje sporočil ob sprejemu"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Novice"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Največje število člankov za nalaganje\n"
 "(neomejeno, če podate 0)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Naslovnik ni določen."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Poberi vsa' preveri novo pošto na tem računu"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavje"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Dodaj polje z datumom v zaglavje"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Generiran ID sporočila"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Dodaj uporabniško definirano zaglavje"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Uredi... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Overovitev"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Avtentikacija SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4648,208 +4648,212 @@ msgstr ""
 "Če pustite te vnose prazne, bosta uporabljena\n"
 "isti uporabnški ID in geslo kot pri sprejemu."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Pred pošiljanjem avtenticiraj s POP3"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 #, fuzzy
 msgid "Command output"
 msgstr "Ukaz"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Kp:"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Skp:"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Odgovor za"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Privzeto podpiši sporočilo"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "privzeto zakodiraj sporočio"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Uporabi oklopljen zapis ASCII za enkripcijo"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Uporabi jasen tekstovni podpis"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Ključ za podpisovanje"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Uporabi privzet ključ GnuPG"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Izberi ključ glede na vaš el. naslov"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Ročno določi ključ"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Uporabnik ali ID ključa"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Ne uporabljaj SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Uporabi SSL za povezavo POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Uporabi ukaz STARTTLS za pričetek seje SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Uporabi SSL za povezavo IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Uporabi SSL za povezavo NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Pošlji (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Uporabi SSL za povezavo SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Vnesite vrata SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Vnesite vrata POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Vnesite vrata IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Vnesite vrata NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Vnesite ime domene"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Imenik strežnika IMAP"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Naloži vsa sporočila na strežniku"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Postavi poslana sporočila v"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Postavi osnutke sporočil v"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Postavi izbrisana sporočila v"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Postavi izbrisana sporočila v"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Ime računa ni vnešeno."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Elektronski naslov ni naveden."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Strežnik SMTP ni naveden."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Uporabnikov ID ni vnešen."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Strežnik POP3 ni vnešen."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Strežnik IMAP4 ni naveden."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Strežnik NNTP ni naveden."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/sr.po b/po/sr.po
index bc7f635f..f17ab91f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -495,7 +495,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "greška prilikom provere identiteta\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "neuspeh pri pisanju konfiguracije u datoteku\n"
@@ -699,14 +699,14 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -834,7 +834,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresa"
@@ -1010,7 +1010,7 @@ msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Direktorijum"
 
@@ -1023,17 +1023,17 @@ msgstr "Adresa e-pošte"
 msgid "Search:"
 msgstr "Pretraga"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1241,7 +1241,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1627,111 +1627,111 @@ msgstr "/_Alati/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Dodatak"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1739,41 +1739,41 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Ne mogu pronaći nijedan ključ kome je trenutno dodeljen id ključa `%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1783,12 +1783,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1797,15 +1797,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1814,99 +1814,99 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1914,12 +1914,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1929,52 +1929,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2075,7 +2075,7 @@ msgid " Check File "
 msgstr " Proveri datoteku "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Datoteka"
 
@@ -2156,7 +2156,7 @@ msgid "Edit JPilot Entry"
 msgstr "Izmenite JPilot unos"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2221,7 +2221,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2313,7 +2313,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Odaberite... "
 
@@ -4400,241 +4400,241 @@ msgstr "Datoteka"
 msgid "Description: "
 msgstr "Opis"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Otvaram prozor za svojstva naloga...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Nalog%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Podešavanja za novi nalog"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Podešavanje naloga"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Stvaranje prozora za podešavanje naloga...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Napiši"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Ime ovog naloga"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Postavi kao uobičajeni"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Lične informacije"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Puno ime"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Informacije o serveru"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Ništa (lokalno)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Ovaj server zahteva proveru identiteta"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Server za primanje"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP server (slanje)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "ID korisnika"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ovaj server zahteva proveru identiteta"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Ukloni poruke sa servera nakon primanja"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Ukloni posle"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "dana"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dana: odmah ukloni)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Preuzmi sve poruke sa servera"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Ograničenje u veličini za primanje"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Uobičajeno sanduče"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Način provere identieta"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksimalni broj članaka za preuzimanje\n"
 "(0 je za neograničeno)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Primalac nije upisan."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Primi sve' proverava poruke za ovaj nalog"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Dodaj polje Datum u zaglavlje"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Generiši ID poruke"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Dodaj zaglavlje korisnika"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Izmeni... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Provera identiteta"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP identifikacija (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4643,208 +4643,212 @@ msgstr ""
 "Ako ostaviš ove unose prazne, isti\n"
 "koririsnički ID i lozinka će biti korišćeni."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Proveri identitet sa POP3 pre slanja"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 #, fuzzy
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Odvovori-Na"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Uvek potpiši poruke"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Uvek šifruj poruke"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Koristi ASCII-armored format za šifrovanje"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Koristi prazan tekst za potpis"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Ključ potpisa"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Koristi uobičajeni GnuPG ključ"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Odaberi ključ po adresi e-pošte"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Navedi neki drugi ključ"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "ID ključa ili korisnika:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Ne koristi SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Koristi SSL za POP3 veze"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Koristi SSL za IMAP4 veze"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Koristi SSL za NNTP veze"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Slanje (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Navedi SMTP port"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Navedi POP3 port"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Navedi IMAP4 port"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Navedi NNTP port"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Navedi ime domena"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Direktorijum IMAP servera"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Preuzmi sve poruke sa servera"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Stavi poslate poruke u"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Stavi nedovršene poruke u"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Stavi obrisane poruke u"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Stavi obrisane poruke u"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Ime naloga nije upisano."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Adresa e-pošte nije upisana."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "SMTP server nije upisan."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "ID korisnika nije upisan."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "POP3 server nije upisan."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server nije upisan."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "NNTP server nije upisan."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/sv.po b/po/sv.po
index dcdc2f96..24025d95 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -492,7 +492,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "fel uppstod vid POP3-session\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "misslyckades skriva konfiguration till fil\n"
@@ -696,14 +696,14 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Namn"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -831,7 +831,7 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adress"
@@ -1007,7 +1007,7 @@ msgstr "Adressbok"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Mapp"
 
@@ -1020,17 +1020,17 @@ msgstr "E-postadress"
 msgid "Search:"
 msgstr "Sök"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Dold kopia:"
@@ -1238,7 +1238,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Notera"
 
@@ -1591,110 +1591,110 @@ msgstr "/V_erktyg/Utför _köade åtgärder"
 msgid "/_Tools/_Set spell language"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Skriv%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Tomt ämne"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Bilagor"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Skicka"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1702,41 +1702,41 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Kunde inte hitta någon nyckel associerad med nu aktiva nyckel-ID \"%s\"."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1747,11 +1747,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1764,15 +1764,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1781,96 +1781,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Egenskaper"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Öppnande av körbar fil"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1882,12 +1882,12 @@ msgstr ""
 "Om du vil köra den, spara den någonstans och kolla att det inte är ett virus "
 "eller något illasinnat program."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1897,48 +1897,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -2038,7 +2038,7 @@ msgid " Check File "
 msgstr " Kontrollera fil "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Fil"
 
@@ -2119,7 +2119,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigera JPilot-post"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2184,7 +2184,7 @@ msgstr "Väntetid (sek)"
 msgid "Maximum Entries"
 msgstr "Maximalt antal poster"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Grundläggande"
 
@@ -2276,7 +2276,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Välj... "
 
@@ -4332,236 +4332,236 @@ msgstr "Fil"
 msgid "Description: "
 msgstr "Beskrivning"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Öppnar fönster för kontoinställningar...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Inställningar för nytt konto"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Kontoinställningar"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Skapar fönster för kontoinställningar...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Skicka"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Integritet"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Detta kontos namn"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Använd som förvalt konto"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Fullst. namn"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "E-postadress"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Serverinformation"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Diskussionsgrupper (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Inget (lokalt)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Denna server kräver autentisering"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Diskussionsgruppsserver"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Server för mottagning"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Server att skicka med (SMTP)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Användar-ID"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Använd säker autentisering (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Ta bort meddelanden på server när de mottagits"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Ta bort efter"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "dagar"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dagar: ta bort direkt)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Hämta alla meddelanden från server"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Gräns för mottagningsstorlek"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Förvald inkorg"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ofiltrerade meddelanden kommer att lagras i denna mapp"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Bara vid manuell mottagning"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Maximalt antal inlägg att hämta"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Ingen begränsning om 0 är angivet."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Hämta allt\" hämtar post på detta konto"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Brevhuvud"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Lägg till datumfält i brevhuvud"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Skapa Meddelande-ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr "Redigera..."
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Autentisering (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4569,207 +4569,211 @@ msgstr ""
 "Om du lämnar dessa poster tomma, kommer samma användar-ID och lösenord som "
 "vid hämtning att användas."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentisera med POP3 innan brev skickas"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Kommandoutdata"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Kopia"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Dold kopia"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Signera alla meddelanden"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Kryptera alla meddelanden"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Kryptera vid svar på krypterat meddelande"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Använd ASCII-pansar för kryptering"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Använd klartextsignatur"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Signaturnyckel"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Använd förvald GnuPG-nyckel"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Välj nyckel genom din e-postadress"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Ange nyckel manuellt"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Användar- eller nyckel-ID:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Använd inte SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Använd SSL för POP3-förbindelse"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Använd STARTTLS-kommando för att starta SSL-session"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Använd SSL för IMAP4-förbindelse"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Använd SSL för NNTP-förbindelse"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Skicka (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Använd SSL för SMTP-förbindelse"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Använd icke-blockerande SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Slå av detta om du har problem med SSL-förbindelsen"
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Ange SMTP-port"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Ange POP3-port"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Ange IMAP4-port"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Ange NNTP-port"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Ange domännamn"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP-servermapp"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Hämta alla meddelanden från server"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Lägg skickade meddelanden i"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Lägg utkast i"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Lägg borttagna meddelanden i"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Lägg borttagna meddelanden i"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Kontonamn har inte angivits."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "E-postadress har inte angivits."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "SMTP-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Användar-ID har inte angivits."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "POP3-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "NNTP-server har inte angivits."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/tr.po b/po/tr.po
index eb4de290..22fbc0dc 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2010-02-20 16:54+0200\n"
 "Last-Translator: Doruk Fisek <dfisek@fisek.com.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -496,7 +496,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "POP3 oturumunda hata oluştu\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "Yapılandırma dosyasına kayıt yapılamadı\n"
@@ -697,14 +697,14 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "İsim"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -834,7 +834,7 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adres"
@@ -1010,7 +1010,7 @@ msgstr "Adres defteri"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Dizin"
 
@@ -1023,17 +1023,17 @@ msgstr "İleti adresi"
 msgid "Search:"
 msgstr "Ara"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1246,7 +1246,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Not"
 
@@ -1623,111 +1623,111 @@ msgstr "/A_raçlar/Ç_alıştır"
 msgid "/_Tools/_Set spell language"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 #, fuzzy
 msgid "Empty subject"
 msgstr "Konu"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Ekler"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Hiç ek yok. Yine de eksiz göndermek istiyor musunuz?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "Alıcıları kontrol et"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Konu:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Gönder"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1735,40 +1735,40 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Seçilen `%s' anahtar kimliğiyle bir eşleştirme yapılamadı."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1779,12 +1779,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1797,15 +1797,15 @@ msgstr ""
 "\n"
 "Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Satır uzunlık sınırı"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Bcc ile Şifreleme"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1819,98 +1819,98 @@ msgstr ""
 "\n"
 "Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "işaretli dosya açılamadı.\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Özellikler"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1918,12 +1918,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Harici düzenleyici komut satırı geçersiz: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1933,52 +1933,52 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -2079,7 +2079,7 @@ msgid " Check File "
 msgstr " Dosyayı Denetle "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Dosya"
 
@@ -2161,7 +2161,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot Girdisini Düzenle"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2226,7 +2226,7 @@ msgstr "Zaman aşımı (sn) "
 msgid "Maximum Entries"
 msgstr "Azami Girdi Sayısı"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Temel"
 
@@ -2318,7 +2318,7 @@ msgid "MH (number only)"
 msgstr "MH (yalnız numara)"
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Seç... "
 
@@ -4390,241 +4390,241 @@ msgstr "Dosya"
 msgid "Description: "
 msgstr "Tanım"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Hesap tercihleri penceresi açılıyor...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Hesap%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Yeni hesap için tercihler"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Hesap tercihleri"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Hesap tercihleri penceresi oluşturuluyor...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Al"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Gönder"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Düzenle"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Bu hesabın adı"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Öntanımlı kullan"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Kişisel bilgiler"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Tam adı"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "E-Posta adresi"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Kurum"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Sunucu bilgisi"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Haber grubu (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Hiçbiri (yerel)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Bu sunucu parola istiyor"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Haber grubu sunucusu"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "İletilerin alınacağı sunucu"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Gönderme için SMTP sunucu"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "Kullanıcı adı"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Parola"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Güvenli yetkilendirme kullan (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "İleti alındığı zaman sunucudaki kopyasını sil"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Postayı"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "gün sonra sil"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 gün: hemen sil)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Sunucudaki tüm iletileri indir"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Alınan ileti boyutu sınırı"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "İletileri alırken filtrele"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Öntanımlı gelen kutusu"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Kimlik denetim yöntemi"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Sadece kullanıcı kendi aldığında"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "İletileri alırken filtrele"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Haberler"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Indirilebilecek azami makale sayısı\n"
 "(0 => limitsiz)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Hepsini Al' seçeneği bu hesaptaki yeni postaları da kontrol etsin"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Başlık"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Tarih başlığını ekle"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "İleti Numarası Oluştur"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı başlık ekle"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Düzenle... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Kimlik denetimi"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Kimlik Denetimi (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4633,208 +4633,212 @@ msgstr ""
 "Eğer bu girdileri boş bırakırsanız, aynı\n"
 "kullanıcı adı ve parolası kullanılır."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Göndermeden önce POP3 ile kimlik denetimi yap"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "İmza"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Komut çıktısı"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Yanıtla"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "İletileri öntanımlı olarak imzala"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "İletileri öntanımlı olarak şifrele"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII formatında şifrele"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Metin formatlı imza ekle"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "İmza anahtarı"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Öntanımlı GnuPG anahtarını kullan"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Anahtarı e-posta adresine göre seç"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Anahtarı elle seç"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Kullanıcı ya da anahtar numarası:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "SSL kullanma"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL oturumuna başlamak için STARTSSL komutunu kullan"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Gönder (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Bloklanmamış SSL Kullan"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(SSL bağlantısında sorunlar yaşıyorsanız, bu özelliği kapatın)"
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "SMTP portu belirt"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "POP3 portu belirt"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 portu belirt"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "NNTP portu belirt"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Alan adı belirt"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP sunucu dizini"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Sunucudaki tüm iletileri indir"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Gönderilen iletileri nerede sakla"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Taslak mesajlarını buraya koy"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Silinen mesajları buraya koy"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Silinen mesajları buraya koy"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Hesap adı girilmemiş."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "İleti adresi girilmemiş."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "SMTP sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Kullanıcı numarası girilmemiş."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "POP3 sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "NNTP sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/uk.po b/po/uk.po
index 79ce9b04..0c2c6dc9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2010-03-01 22:30+0300\n"
 "Last-Translator: O.R. Nykyforchyn <oleh.nyk@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -497,7 +497,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "помилка під час сесії POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "не вдалось записати конфігурацію в файл\n"
@@ -696,14 +696,14 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Ім'я"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -831,7 +831,7 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адреса"
@@ -1002,7 +1002,7 @@ msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
@@ -1014,17 +1014,17 @@ msgstr "Адреса e-mail"
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Приховано:"
@@ -1226,7 +1226,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1570,107 +1570,107 @@ msgstr "/Інструменти/Перевірка правопису"
 msgid "/_Tools/_Set spell language"
 msgstr "/Інструменти/Обрати мову для перевірки правопису"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Не вдалось отримати текстову частину\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Порожня тема"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 msgid "Attachment is missing"
 msgstr "Бракує вкладення"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Вкладення немає. Послати без вкладень?"
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr "Перевірити отримувачів"
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 msgid "Really send this mail to the following addresses?"
 msgstr "Дійсно послати цю пошту на наступні адреси?"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 msgid "_Send"
 msgstr "Послати"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1678,37 +1678,37 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 msgid "Can't sign the message."
 msgstr "Не вдалось підписати лист."
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 msgid "Can't encrypt the message."
 msgstr "Не вдалось зашифрувати лист."
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 msgid "Can't encrypt or sign the message."
 msgstr "Не вдалось зашифрувати чи підписати лист."
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1719,11 +1719,11 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати як %s?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1736,15 +1736,15 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr "Шифрувати з прихованими адресатами"
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1758,96 +1758,96 @@ msgstr ""
 "\n"
 "Все ж послати?"
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існує."
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, c-format
 msgid "Can't open file %s."
 msgstr "Не вдалось відкрити файл %s."
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Властивості"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Відкриваємо виконуваний файл"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1859,12 +1859,12 @@ msgstr ""
 "Якщо бажаєте запустити цей файл, збережіть його і переконайтесь, що це не "
 "вірус чи щось шкідливе."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1873,48 +1873,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr "Налаштувати панель інструментів..."
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -2013,7 +2013,7 @@ msgid " Check File "
 msgstr " Перевірити файл "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Файл"
 
@@ -2093,7 +2093,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редагувати запис JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2158,7 +2158,7 @@ msgstr "Таймаут (с)"
 msgid "Maximum Entries"
 msgstr "Максимальний розмір результату"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Основні"
 
@@ -2244,7 +2244,7 @@ msgid "MH (number only)"
 msgstr "MH (тільки номер)"
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Обрати... "
 
@@ -4265,232 +4265,232 @@ msgstr "Файл: "
 msgid "Description: "
 msgstr "Опис: "
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Відкриття вікна опцій account'а...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Запис%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Налаштування для нового запису"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Налаштування запису"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Створення вікна опцій запису...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Отримання"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Послати"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Створення листа"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Advanced"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Назва цього запису"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Встановити як default"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Особиста інформація"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Повне ім'я"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Поштова адреса"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Організація"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Інформація про сервер"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Новини (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Нема (локально)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Цей сервер вимагає автентифікації"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Сервер новин"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Сервер для отримання"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Сервер SMTP (відсилання)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "ID користувача"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Пароль"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Вживати безпечну автентифікацію (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Видаляти листи на сервері після отримання"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Видалити через"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "днів"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 днів - видаляти негайно"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 msgid "Download all messages (including already received) on server"
 msgstr "Завантажити всі листи на сервері (включно з вже отриманими)"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Обмеження розміру отриманих листів"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "Кб"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Фільтрувати листи при отриманні"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Вхідна папка за замовчуванням"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "У цій папці складаємо невідфільтровані листи."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Метод автентифікації"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "При отриманні тільки перевіряти INBOX"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Фільтрувати нові листи у Вхідних при отриманні"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Новини"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Максимальна кількість статей для завантаження"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Без обмежень, якщо вказано 0."
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "Перевіряти за командою `Отримати всі'"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заголовок"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Додати поле дати заголовка"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Генерувати Message-ID"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Вживати заголовок, визначений користувачем"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Редагувати... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Автентифікація"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Автентифікація SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4498,203 +4498,207 @@ msgstr ""
 "Якщо Ви залишите ці поля порожніми, буде вжито ті ж ID користувача та "
 "пароль, що й для отримання."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Автентифікація POP3 перед відсиланням"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Підпис"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr "Прямий ввід "
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Вивід команди"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Автоматично встановлювати наступні адреси"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Копія"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Приховано"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Зворотня адреса"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 msgid "PGP sign message by default"
 msgstr "PGP-Підписування листа за замовчуванням"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 msgid "PGP encrypt message by default"
 msgstr "PGP-шифрування листа за замовчуванням"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Помилка при відповіді на шифрований лист"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Вживати \"ASCII-armored\" формат для шифрування"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Вживати підпис відкритим текстом"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Ключ підпису"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Вживати ключ GnuPG за замовчуванням"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Обрати ключ за Вашою адресою e-mail"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Визначити ключ власноручно"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Користувач або ідентифікатор ключа:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Не вживати SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Вживати SSL для з'єднання POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Вживати команду STARTTLS для початку сесії SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Вживати SSL для з'єднання IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Вживати SSL для з'єднання NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Відсилка (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Вживати SSL для з'єднання SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Вживати неблокуючий SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Вимкніть це, якщо стикаєтесь з проблемами при з'єднанні SSL."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Вказати порт SMTP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Вказати порт POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Вказати порт IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Вказати порт NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Вказати ім'я домена"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Буде показано тільки підпапки цього каталога."
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "При виході очищати всі кеші повідомлень"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Зберігати відіслані листи в"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Зберігати чернетки листів в"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Зберігати видалені листи в"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Зберігати видалені листи в"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Назву запису не вказано."
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Не вказано поштову адресу."
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Не вказано сервер SMTP."
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "Не вказано ID користувача."
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Не вказано сервер POP3."
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Не вказано сервер IMAP4."
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Не вказано сервер NNTP."
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr "Вказана папка не є папкою черги."
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/vi.po b/po/vi.po
index 2e67ce52..97f8a992 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -490,7 +490,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "có lỗi trong phiên làm việc POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "lỗi khi lưu cấu hình vào tập tin\n"
@@ -678,14 +678,14 @@ msgstr ""
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Tên"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "Giao thức"
 
@@ -813,7 +813,7 @@ msgstr "Đối số người dùng của hành động"
 msgid "Add Address to Book"
 msgstr "Thêm địa chỉ vào sổ"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Địa chỉ"
@@ -988,7 +988,7 @@ msgstr "Sổ địa chỉ"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "Thư mục"
 
@@ -1000,17 +1000,17 @@ msgstr "Địa chỉ email"
 msgid "Search:"
 msgstr "Tìm kiếm:"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Người nhận:"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1220,7 +1220,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1568,110 +1568,110 @@ msgstr "/_Công cụ/Kiểm tra _chính tả"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Công cụ/Chọn ngôn ngữ để _kiểm tra chính tả"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "Không thể lấy phần văn bản\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "Lỗi định dạng đánh dấu trích dẫn."
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "Lỗi định dạng trả lời/chuyển tiếp thư."
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Không thể xác định kích tước tập tin của %s\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "Không thể đọc %s."
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "Thư: %s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Viết thư%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "Chưa chỉ định người nhận."
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "Tiêu đề bị bỏ trống"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Đính kèm"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Tự động đặt địa chỉ sau"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tiêu đề:"
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "Gửi"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1679,40 +1679,40 @@ msgstr ""
 "Chưa xác định tài khoản để gửi thư.\n"
 "Hãy chọn một tài khoản trước khi gửi."
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Xảy ra lỗi khi gửi thư đến %s ."
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "Không thể lưu thư vào hộp gửi (outbox)."
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Không tìm thấy khoá liên quan đến khoá đang chọn với id `%s'."
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1723,11 +1723,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1740,15 +1740,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1757,96 +1757,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "Tập tin không tồn tại hoặc rỗng."
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "Thuộc tính"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "Đang mở tập tin chạy"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1857,12 +1857,12 @@ msgstr ""
 "Nếu bạn muốn chạy tập tin, lưu nó vào đâu đó và đảm bảo nó không bị nhiễm vi-"
 "rút hay là chương trình có hại."
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Dòng lệnh cho trình soạn thảo ngoài không hợp lệ: `%s'\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1871,48 +1871,48 @@ msgstr ""
 "Trình soạn thảo ngoài vẫn đang hoạt động.\n"
 "Bắt buộc dừng tiến trình (pid: %d)?\n"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Nội dung đã được thay đổi. Lưu vào thư mục nháp?"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Bạn có muốn dùng mẫu `%s' ?"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -2012,7 +2012,7 @@ msgid " Check File "
 msgstr " Kiểm tra tập tin "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "Tập tin"
 
@@ -2093,7 +2093,7 @@ msgid "Edit JPilot Entry"
 msgstr "Soạn mục JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2158,7 +2158,7 @@ msgstr "Hết hạn (giây)"
 msgid "Maximum Entries"
 msgstr "Số mục tối đa"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "Cơ bản"
 
@@ -2250,7 +2250,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Chọn... "
 
@@ -4321,234 +4321,234 @@ msgstr "Tập tin"
 msgid "Description: "
 msgstr "Miêu tả"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "Đang mở cửa sổ cấu hình tài khoản...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "Tài khoản %d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "Cấu hình cho tài khoản mới"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Cấu hình tài khoản"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "Đang tạo của sổ cấu hình tài khoản...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "Nhận"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Gửi"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Viết thư"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "Riêng tư"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "Tên của tài khoản này"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "Đặt là mặc định"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "Thông tin cá nhân"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "Tên đầy đủ"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "Địa chỉ thư"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "Thông tin máy chủ"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "Tin tức (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "Không (nội bộ)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "Máy chủ này yêu cầu xác thực"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "Máy chủ tin tức"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "Máy chủ nhận"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "Máy chủ SMTP (gửi)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "ID người dùng"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "Dùng xác thực bảo mật (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "Xoá thư khỏi máy chủ sau khi nhận"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "Xoá sau"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "ngày"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 msgid "0 days: remove immediately"
 msgstr "0 ngày: xoá ngay lập tức"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Tải mọi thư trên máy chủ"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "Giới hạn kích thước khi nhận"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "Lọc thư khi nhận"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "Hộp nhận mặc định"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Thư chưa lọc sẽ được lưu vào thư mục này."
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "Phương thức xác thực"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "Tự động"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "Only check INBOX on receiving"
 msgstr "Chỉ kiểm tra Hộp nhận khi nhận"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Lọc thư khi nhận"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "Tin tức"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "Số bài tải về tối đa"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "Không giới hạn nếu ghi là 0"
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Lấy tất' sẽ kiểm tra các thư mới của tài khoản này"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "Thêm trường Ngày tháng cho header"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "Tạo ID của thư"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "Thêm header theo định nghĩa người dùng"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " Soạn... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "Xác thực"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Xác thực SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4556,205 +4556,209 @@ msgstr ""
 "Nếu bạn bỏ trống các mục này, chương trình sẽ dùng ID người dùng và mật khẩu "
 "này khi nhận."
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "Xác thực với POP3 trước khi gửi"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Chữ kí"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "Đầu ra của lệnh"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Tự động đặt địa chỉ sau"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "Hồi âm cho"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Kí tên theo mặc định"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Mã hoá thư theo mặc định"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "Mã hoá khi trả lời thư mã hoá"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "Dùng định dạng ASCII-armored để mã hoá"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "Dùng chữ kí là văn bản thuần tuý"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "Khoá của chữ kí"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "Dùng khoá GnuPG mặc định"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "Chọn khoá theo địa chỉ thư của bạn"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "Chỉ định khoá theo cách thủ công"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "Người dùng hoặc ID của khoá:"
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "Không dùng SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "Dùng SSL cho kết nối POP3"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Dùng lệnh STARTTLS để khởi động phiên SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "Dùng SSL cho kết nối IMAP4"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "Dùng SSL cho kết nối NNTP"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "Gửi (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "Dùng SSL cho kết nối SMTP"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "Dùng SSL dạng không chặn"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Tắt nếu bạn có vấn đề với kết nối SSL."
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "Chỉ định cổng STMP"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "Chỉ định cổng POP3"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "Chỉ định cổng IMAP4"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "Chỉ định cổng NNTP"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "Chỉ định tên miền"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "Thư mục máy chủ IMAP"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 msgid "Clear all message caches on exit"
 msgstr "Xoá mọi thư trên bộ nhớ đệm khi thoát"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "Chuyển thư đã gửi vào"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "Chuyển thư nháp vào"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 msgid "Put queued messages in"
 msgstr "Chuyển thư đang đợi gửi vào"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "Chuyển thư đã xoá vào"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "Tên tài khoản chưa được nhập"
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "Địa chỉ thư chưa được nhập"
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "Máy chủ SMTP chưa được nhập"
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "ID người dùng chưa được nhập"
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "Máy chủ POP3 chưa được nhập"
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "Máy chủ IMAP4 chưa được nhập"
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "Máy chủ NNTP chưa được nhập"
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 18e3c623..2958565d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -488,7 +488,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "POP3 会话发生错误\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "无法写入配置文件\n"
@@ -688,14 +688,14 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "名称"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "协议"
 
@@ -825,7 +825,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "地址"
@@ -1001,7 +1001,7 @@ msgstr "地址簿"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "文件夹"
 
@@ -1014,17 +1014,17 @@ msgstr "电子邮件地址"
 msgid "Search:"
 msgstr "搜索"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "密件抄送："
@@ -1229,7 +1229,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "注意"
 
@@ -1585,111 +1585,111 @@ msgstr "/工具(_T)/执行(_X)"
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "附件"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "自动设置以下地址"
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "标题："
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "发送"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1697,40 +1697,40 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1740,12 +1740,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1754,15 +1754,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1771,98 +1771,98 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "无法打开文件 %s\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "属性"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1870,12 +1870,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1885,51 +1885,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2030,7 +2030,7 @@ msgid " Check File "
 msgstr " 检查文件 "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "文件"
 
@@ -2111,7 +2111,7 @@ msgid "Edit JPilot Entry"
 msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2176,7 +2176,7 @@ msgstr "超时(秒)"
 msgid "Maximum Entries"
 msgstr "最大项数"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "基本"
 
@@ -2268,7 +2268,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " 选择... "
 
@@ -4323,448 +4323,452 @@ msgstr "文件"
 msgid "Description: "
 msgstr "描述"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "正在打开帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "帐号%d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "新帐号的首选项"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "帐号首选项"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "正在创建帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "发送"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "撰写"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "高级"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "帐号名称"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "设置为默认帐号"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "个人资料"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "邮件地址"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "组织"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "服务器资料"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "新闻组 (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "无(本地)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "该服务器需要验证"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "新闻组服务器"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "接收服务器"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP服务器(发送)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "用户名"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "密码"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全验证 (APOP)"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "以后删除"
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "天"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 天：立即删除)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "下载服务器上的所有邮件"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "接收大小限制"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "在接收邮件时进行过滤"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "默认收件箱"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(没有过滤的邮件会保存在该文件夹中)"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "验证方法"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "自动"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "仅在手工接收时"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "在接收邮件时进行过滤"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "新闻"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "下载文章的最大数量\n"
 "(指定 0 表示无限制)"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "没有指定收件人。"
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "“全部接收”时检查该帐号的新邮件"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "邮件头"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "添加日期头域"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "生成邮件标识"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " 编辑... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "验证"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP验证(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "如果您不填这些项，将使用和接收邮件相同的用户名和口令。"
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "发送前用POP3验证"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "签名"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "命令输出"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "自动设置以下地址"
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "抄送"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "密件抄送"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "回复至"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "默认对邮件签名"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "默认对邮件加密"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "使用 ASCII 包裹格式进行加密"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "使用明文签名"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "签名密钥"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "使用默认的GnuPG密钥"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "按照邮件地址选择密钥"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "手工指定密钥"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "用户或者密钥ID："
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "不使用SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "使用SSL连接POP3服务器"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "使用STARTTLS命令开始SSL会话"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "使用SSL连接IMAP4服务器"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "使用SSL连接NNTP服务器"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "发送(SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "使用SSL连接SMTP服务器"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "使用非阻塞式SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(如果您遇到SSL连接问题，请关闭该选项)"
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "指定SMTP端口"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "指定POP3端口"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "指定IMAP4端口"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "指定NNTP端口"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "指定域名"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP4 服务器目录"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "下载服务器上的所有邮件"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "将已发出的邮件保存于"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "将邮件草稿保存于"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "将删除的邮件保存于"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "将删除的邮件保存于"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "没有输入帐号名称。"
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "没有输入邮件地址。"
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "没有输入SMTP服务器。"
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "没有输入用户标识。"
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "没有输入POP3服务器。"
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "没有输入IMAP4服务器。"
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "没有输入NNTP服务器。"
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 78e1b4ee..2f25c19f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 17:28+0900\n"
+"POT-Creation-Date: 2010-07-30 13:04+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -493,7 +493,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "使用 POP3 通訊協定時發生錯誤\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
+#: libsylph/prefs_account.c:222 libsylph/prefs_account.c:236
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "寫入組態設定時失敗。\n"
@@ -693,14 +693,14 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
-#: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5315 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "名稱"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:693
+#: src/account_dialog.c:380 src/prefs_account_dialog.c:696
 msgid "Protocol"
 msgstr "通訊協定"
 
@@ -828,7 +828,7 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將地址加入通訊錄"
 
-#: src/addressadd.c:188 src/compose.c:3325 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3342 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "地址"
@@ -1004,7 +1004,7 @@ msgstr "通訊錄"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
-#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+#: src/prefs_account_dialog.c:1844 src/query_search.c:400
 msgid "Folder"
 msgstr "資料夾"
 
@@ -1017,17 +1017,17 @@ msgstr "E-Mail 地址"
 msgid "Search:"
 msgstr "尋找"
 
-#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/addressbook.c:867 src/compose.c:3287 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/addressbook.c:871 src/compose.c:3304 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/addressbook.c:875 src/compose.c:3321 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "密件副本"
@@ -1234,7 +1234,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
 msgid "Notice"
 msgstr "注意"
 
@@ -1587,110 +1587,110 @@ msgstr "/工具(_T)/執行(_X)"
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:1002
+#: src/compose.c:1019
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:1108 src/compose.c:1185
+#: src/compose.c:1125 src/compose.c:1202
 msgid "Can't get text part\n"
 msgstr "沒有文字部份\n"
 
-#: src/compose.c:1730
+#: src/compose.c:1747
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1742
+#: src/compose.c:1759
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄郵件格式錯誤。"
 
-#: src/compose.c:2252
+#: src/compose.c:2269
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:2256
+#: src/compose.c:2273
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:2260 src/compose.c:4374
+#: src/compose.c:2277 src/compose.c:4391
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:2264
+#: src/compose.c:2281
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:2297
+#: src/compose.c:2314
 #, c-format
 msgid "Message: %s"
 msgstr "郵件：%s"
 
-#: src/compose.c:2357 src/mimeview.c:586
+#: src/compose.c:2374 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
-#: src/compose.c:2850
+#: src/compose.c:2867
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 編寫郵件%s"
 
-#: src/compose.c:2965
+#: src/compose.c:2982
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2973
+#: src/compose.c:2990
 msgid "Empty subject"
 msgstr "主旨空白"
 
-#: src/compose.c:2974
+#: src/compose.c:2991
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:3038
+#: src/compose.c:3055
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "附加檔"
 
-#: src/compose.c:3039
+#: src/compose.c:3056
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3156 src/compose.c:3182
+#: src/compose.c:3173 src/compose.c:3199
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3202
+#: src/compose.c:3219
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/compose.c:3215 src/compose.c:5164 src/headerview.c:54
+#: src/compose.c:3232 src/compose.c:5181 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3254 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "主旨："
 
-#: src/compose.c:3330
+#: src/compose.c:3347
 #, fuzzy
 msgid "_Send"
 msgstr "送出"
 
-#: src/compose.c:3458
+#: src/compose.c:3475
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:3478
+#: src/compose.c:3495
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1698,40 +1698,40 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:3492 src/send_message.c:315
+#: src/compose.c:3509 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:3542
+#: src/compose.c:3559
 msgid "Can't save the message to outbox."
 msgstr "無法將郵件送至寄件夾中。"
 
-#: src/compose.c:3585
+#: src/compose.c:3602
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:3612 src/compose.c:3997
+#: src/compose.c:3629 src/compose.c:4014
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3639 src/compose.c:4040
+#: src/compose.c:3656 src/compose.c:4057
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3674 src/compose.c:4035
+#: src/compose.c:3691 src/compose.c:4052
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3720 src/compose.c:4068 src/compose.c:4131 src/compose.c:4251
+#: src/compose.c:3737 src/compose.c:4085 src/compose.c:4148 src/compose.c:4268
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: src/compose.c:3753
+#: src/compose.c:3770
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1741,11 +1741,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:3759
+#: src/compose.c:3776
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3845
+#: src/compose.c:3862
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1758,15 +1758,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3849
+#: src/compose.c:3866
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:4015
+#: src/compose.c:4032
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4016
+#: src/compose.c:4033
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1775,96 +1775,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4211
+#: src/compose.c:4228
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:4229
+#: src/compose.c:4246
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:4317
+#: src/compose.c:4334
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:4324
+#: src/compose.c:4341
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:4369
+#: src/compose.c:4386
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:4378
+#: src/compose.c:4395
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "無法開啟標記的檔案。\n"
 
-#: src/compose.c:4998
+#: src/compose.c:5015
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:5113
+#: src/compose.c:5130
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:5238
+#: src/compose.c:5255
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:5241
+#: src/compose.c:5258
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:5279 src/compose.c:6479
+#: src/compose.c:5296 src/compose.c:6496
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5266
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6374
+#: src/compose.c:6391
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:6392
+#: src/compose.c:6409
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:6461
+#: src/compose.c:6478
 msgid "Properties"
 msgstr "內容"
 
 #. Encoding
-#: src/compose.c:6481 src/prefs_common_dialog.c:1017
+#: src/compose.c:6498 src/prefs_common_dialog.c:1017
 #: src/prefs_common_dialog.c:1678
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:6504 src/prefs_folder_item.c:202
+#: src/compose.c:6521 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:6505
+#: src/compose.c:6522
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:6594
+#: src/compose.c:6611
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:6604 src/mimeview.c:1220
+#: src/compose.c:6621 src/mimeview.c:1220
 msgid "Opening executable file"
 msgstr "正在開啟可執行的檔案"
 
-#: src/compose.c:6605 src/mimeview.c:1221
+#: src/compose.c:6622 src/mimeview.c:1221
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1875,12 +1875,12 @@ msgstr ""
 "如果您要執行它，請將它存於其他地方並且確定它並非是病毒或者某種心懷不軌的程"
 "式。"
 
-#: src/compose.c:6647
+#: src/compose.c:6664
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:6709
+#: src/compose.c:6726
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1890,48 +1890,48 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:7046 src/mainwindow.c:3030
+#: src/compose.c:7063 src/mainwindow.c:3030
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7180 src/compose.c:7185 src/compose.c:7191
+#: src/compose.c:7197 src/compose.c:7202 src/compose.c:7208
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:7290
+#: src/compose.c:7307
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:7313 src/inputdialog.c:372
+#: src/compose.c:7330 src/inputdialog.c:372
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:7364
+#: src/compose.c:7381
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:7365
+#: src/compose.c:7382
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:7367 src/compose.c:7371
+#: src/compose.c:7384 src/compose.c:7388
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:7418
+#: src/compose.c:7435
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:7420
+#: src/compose.c:7437
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:7421
+#: src/compose.c:7438
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -2031,7 +2031,7 @@ msgid " Check File "
 msgstr " 檢查檔案 "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1284
+#: src/prefs_account_dialog.c:1288
 msgid "File"
 msgstr "檔案"
 
@@ -2112,7 +2112,7 @@ msgid "Edit JPilot Entry"
 msgstr "編輯 JPilot 資料"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1872
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr "..."
@@ -2177,7 +2177,7 @@ msgstr "逾時 (秒)"
 msgid "Maximum Entries"
 msgstr "項目最大值"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:552
+#: src/editldap.c:471 src/prefs_account_dialog.c:555
 msgid "Basic"
 msgstr "基本設定"
 
@@ -2269,7 +2269,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "選擇..."
 
@@ -4315,442 +4315,446 @@ msgstr "檔案"
 msgid "Description: "
 msgstr "描述"
 
-#: src/prefs_account_dialog.c:441
+#: src/prefs_account_dialog.c:444
 msgid "Opening account preferences window...\n"
 msgstr "開啟帳號設定的視窗...\n"
 
-#: src/prefs_account_dialog.c:481
+#: src/prefs_account_dialog.c:484
 #, c-format
 msgid "Account%d"
 msgstr "帳號 %d"
 
-#: src/prefs_account_dialog.c:502
+#: src/prefs_account_dialog.c:505
 msgid "Preferences for new account"
 msgstr "新帳號設定"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:514 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "帳號設定"
 
-#: src/prefs_account_dialog.c:534
+#: src/prefs_account_dialog.c:537
 msgid "Creating account preferences window...\n"
 msgstr "產生帳號設定的視窗...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:756
+#: src/prefs_account_dialog.c:557 src/prefs_common_dialog.c:756
 msgid "Receive"
 msgstr "接收設定"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:758
+#: src/prefs_account_dialog.c:559 src/prefs_common_dialog.c:758
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "送出"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:760
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:760
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "撰寫郵件"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:767
+#: src/prefs_account_dialog.c:564 src/prefs_common_dialog.c:767
 msgid "Privacy"
 msgstr "私人資料"
 
-#: src/prefs_account_dialog.c:565
+#: src/prefs_account_dialog.c:568
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2460
+#: src/prefs_account_dialog.c:571 src/prefs_common_dialog.c:2460
 msgid "Advanced"
 msgstr "進階設定"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Name of this account"
 msgstr "這個帳號的名稱"
 
-#: src/prefs_account_dialog.c:633
+#: src/prefs_account_dialog.c:636
 msgid "Set as default"
 msgstr "設為預設帳號"
 
-#: src/prefs_account_dialog.c:637
+#: src/prefs_account_dialog.c:640
 msgid "Personal information"
 msgstr "個人資訊"
 
-#: src/prefs_account_dialog.c:646
+#: src/prefs_account_dialog.c:649
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account_dialog.c:652
+#: src/prefs_account_dialog.c:655
 msgid "Mail address"
 msgstr "電子郵件地址"
 
-#: src/prefs_account_dialog.c:658
+#: src/prefs_account_dialog.c:661
 msgid "Organization"
 msgstr "服務公司/組織"
 
-#: src/prefs_account_dialog.c:682
+#: src/prefs_account_dialog.c:685
 msgid "Server information"
 msgstr "伺服器資訊"
 
-#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
-#: src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:706 src/prefs_account_dialog.c:863
+#: src/prefs_account_dialog.c:1605
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
-#: src/prefs_account_dialog.c:1616 src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:708 src/prefs_account_dialog.c:971
+#: src/prefs_account_dialog.c:1625 src/prefs_account_dialog.c:1816
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:707
+#: src/prefs_account_dialog.c:710
 msgid "News (NNTP)"
 msgstr "新聞 (NNTP)"
 
-#: src/prefs_account_dialog.c:709
+#: src/prefs_account_dialog.c:712
 msgid "None (local)"
 msgstr "無 (local)"
 
-#: src/prefs_account_dialog.c:722
+#: src/prefs_account_dialog.c:725
 msgid "This server requires authentication"
 msgstr "這個伺服器需要認證"
 
-#: src/prefs_account_dialog.c:761
+#: src/prefs_account_dialog.c:764
 msgid "News server"
 msgstr "新聞伺服器"
 
-#: src/prefs_account_dialog.c:767
+#: src/prefs_account_dialog.c:770
 msgid "Server for receiving"
 msgstr "接收郵件伺服器"
 
-#: src/prefs_account_dialog.c:773
+#: src/prefs_account_dialog.c:776
 msgid "SMTP server (send)"
 msgstr "SMTP 郵件伺服器 (發信)"
 
-#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
+#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1171
 msgid "User ID"
 msgstr "帳號"
 
-#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
+#: src/prefs_account_dialog.c:789 src/prefs_account_dialog.c:1180
 msgid "Password"
 msgstr "密碼"
 
-#: src/prefs_account_dialog.c:868
+#: src/prefs_account_dialog.c:871
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全認證（APOP）"
 
-#: src/prefs_account_dialog.c:871
+#: src/prefs_account_dialog.c:874
 msgid "Remove messages on server when received"
 msgstr "接收郵件時一併從伺服器上移除。"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:885
 msgid "Remove after"
 msgstr "在幾天後移除："
 
-#: src/prefs_account_dialog.c:891
+#: src/prefs_account_dialog.c:894
 msgid "days"
 msgstr "天"
 
-#: src/prefs_account_dialog.c:908
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(設為 0 則為立即移除)"
 
-#: src/prefs_account_dialog.c:918
+#: src/prefs_account_dialog.c:921
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "接收伺服器上所有的郵件。"
 
-#: src/prefs_account_dialog.c:924
+#: src/prefs_account_dialog.c:927
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:592
+#: src/prefs_account_dialog.c:934 src/prefs_filter_edit.c:592
 #: src/prefs_filter_edit.c:1053
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:938
+#: src/prefs_account_dialog.c:941
 msgid "Filter messages on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account_dialog.c:946
+#: src/prefs_account_dialog.c:949
 msgid "Default inbox"
 msgstr "預設的收件夾"
 
-#: src/prefs_account_dialog.c:966
+#: src/prefs_account_dialog.c:969
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "未經過濾的郵件將會被存到這個資料夾中。"
 
-#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:982 src/prefs_account_dialog.c:1141
 msgid "Authentication method"
 msgstr "認證方法"
 
-#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
+#: src/prefs_account_dialog.c:992 src/prefs_account_dialog.c:1151
 #: src/prefs_common_dialog.c:1037 src/prefs_common_dialog.c:2578
 #: src/prefs_common_dialog.c:2943
 msgid "Automatic"
 msgstr "自動"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "只在手動收取郵件時顯示"
 
-#: src/prefs_account_dialog.c:999
+#: src/prefs_account_dialog.c:1002
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1004
 msgid "News"
 msgstr "新聞"
 
-#: src/prefs_account_dialog.c:1013
+#: src/prefs_account_dialog.c:1016
 msgid "Maximum number of articles to download"
 msgstr "一次最多下載文章數量"
 
-#: src/prefs_account_dialog.c:1030
+#: src/prefs_account_dialog.c:1033
 msgid "No limit if 0 is specified."
 msgstr "設為 0 則不限制數量。"
 
-#: src/prefs_account_dialog.c:1034
+#: src/prefs_account_dialog.c:1037
 msgid "`Get all' checks for new messages on this account"
 msgstr "「全部檢查」時檢查這個帳號的新郵件"
 
-#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1091 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "郵件標頭設定"
 
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:1098
 msgid "Add Date header field"
 msgstr "加入日期"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1099
 msgid "Generate Message-ID"
 msgstr "產生郵件識別碼"
 
-#: src/prefs_account_dialog.c:1103
+#: src/prefs_account_dialog.c:1106
 msgid "Add user-defined header"
 msgstr "加入使用者定義的標頭"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1786
+#: src/prefs_account_dialog.c:1108 src/prefs_common_dialog.c:1786
 #: src/prefs_common_dialog.c:1813
 msgid " Edit... "
 msgstr " 編輯... "
 
-#: src/prefs_account_dialog.c:1115
+#: src/prefs_account_dialog.c:1118
 msgid "Authentication"
 msgstr "認證"
 
-#: src/prefs_account_dialog.c:1123
+#: src/prefs_account_dialog.c:1126
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 認證 (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1202
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "若是此欄空白，將使用接收時的帳號與密碼。"
 
-#: src/prefs_account_dialog.c:1212
+#: src/prefs_account_dialog.c:1215
 msgid "Authenticate with POP3 before sending"
 msgstr "送信前先做 POP3 認證"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1154
+#: src/prefs_account_dialog.c:1254 src/prefs_common_dialog.c:1154
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "簽章"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1262
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1292
+#: src/prefs_account_dialog.c:1296
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1308
+msgid "Put signature before quote (not recommended)"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1320 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/prefs_account_dialog.c:1322
+#: src/prefs_account_dialog.c:1329
 msgid "Cc"
 msgstr "複本"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1342
 msgid "Bcc"
 msgstr "密件複本"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1355
 msgid "Reply-To"
 msgstr "回信地址"
 
-#: src/prefs_account_dialog.c:1403
+#: src/prefs_account_dialog.c:1412
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "郵件自動做數位簽章"
 
-#: src/prefs_account_dialog.c:1405
+#: src/prefs_account_dialog.c:1414
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "郵件自動加密"
 
-#: src/prefs_account_dialog.c:1407
+#: src/prefs_account_dialog.c:1416
 msgid "Encrypt when replying to encrypted message"
 msgstr "回覆加密郵件時也進行加密"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1418
 msgid "Use ASCII-armored format for encryption"
 msgstr "使用 ASCII-armored 格式做加密"
 
-#: src/prefs_account_dialog.c:1411
+#: src/prefs_account_dialog.c:1420
 msgid "Use clear text signature"
 msgstr "使用明碼簽章"
 
-#: src/prefs_account_dialog.c:1416
+#: src/prefs_account_dialog.c:1425
 msgid "Sign key"
 msgstr "簽章金鑰"
 
-#: src/prefs_account_dialog.c:1424
+#: src/prefs_account_dialog.c:1433
 msgid "Use default GnuPG key"
 msgstr "使用預設的 GnuPG 金鑰"
 
-#: src/prefs_account_dialog.c:1433
+#: src/prefs_account_dialog.c:1442
 msgid "Select key by your email address"
 msgstr "根據你的電子郵件地址選擇金鑰"
 
-#: src/prefs_account_dialog.c:1442
+#: src/prefs_account_dialog.c:1451
 msgid "Specify key manually"
 msgstr "手動指定金鑰"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1467
 msgid "User or key ID:"
 msgstr "使用者代號或金鑰的識別碼："
 
-#: src/prefs_account_dialog.c:1604 src/prefs_account_dialog.c:1624
-#: src/prefs_account_dialog.c:1643 src/prefs_account_dialog.c:1664
+#: src/prefs_account_dialog.c:1613 src/prefs_account_dialog.c:1633
+#: src/prefs_account_dialog.c:1652 src/prefs_account_dialog.c:1673
 msgid "Don't use SSL"
 msgstr "不使用 SSL"
 
-#: src/prefs_account_dialog.c:1607
+#: src/prefs_account_dialog.c:1616
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1610 src/prefs_account_dialog.c:1630
-#: src/prefs_account_dialog.c:1670
+#: src/prefs_account_dialog.c:1619 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:1679
 msgid "Use STARTTLS command to start SSL session"
 msgstr "用 STARTTLS 命令來啟動 SSL"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1636
+#: src/prefs_account_dialog.c:1645
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:1660
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1656
+#: src/prefs_account_dialog.c:1665
 msgid "Send (SMTP)"
 msgstr "送信設定 (SMTP)"
 
-#: src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:1676
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1681
+#: src/prefs_account_dialog.c:1690
 msgid "Use non-blocking SSL"
 msgstr "使用 non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1684
+#: src/prefs_account_dialog.c:1693
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "若您使用 SSL 連線時發生問題，請關閉此選項。"
 
-#: src/prefs_account_dialog.c:1774
+#: src/prefs_account_dialog.c:1783
 msgid "Specify SMTP port"
 msgstr "指定 SMTP 連接埠"
 
-#: src/prefs_account_dialog.c:1780
+#: src/prefs_account_dialog.c:1789
 msgid "Specify POP3 port"
 msgstr "指定 POP3 連接埠"
 
-#: src/prefs_account_dialog.c:1786
+#: src/prefs_account_dialog.c:1795
 msgid "Specify IMAP4 port"
 msgstr "指定 IMAP4 連接埠"
 
-#: src/prefs_account_dialog.c:1792
+#: src/prefs_account_dialog.c:1801
 msgid "Specify NNTP port"
 msgstr "指定 NNTP 連接埠"
 
-#: src/prefs_account_dialog.c:1797
+#: src/prefs_account_dialog.c:1806
 msgid "Specify domain name"
 msgstr "指定網域"
 
-#: src/prefs_account_dialog.c:1818
+#: src/prefs_account_dialog.c:1827
 msgid "IMAP server directory"
 msgstr "IMAP 伺服器目錄"
 
-#: src/prefs_account_dialog.c:1828
+#: src/prefs_account_dialog.c:1837
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1831
+#: src/prefs_account_dialog.c:1840
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "接收伺服器上所有的郵件。"
 
-#: src/prefs_account_dialog.c:1876
+#: src/prefs_account_dialog.c:1885
 msgid "Put sent messages in"
 msgstr "將已送出之郵件存到"
 
-#: src/prefs_account_dialog.c:1878
+#: src/prefs_account_dialog.c:1887
 msgid "Put draft messages in"
 msgstr "將郵件草稿存到"
 
-#: src/prefs_account_dialog.c:1880
+#: src/prefs_account_dialog.c:1889
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "將刪除郵件存到"
 
-#: src/prefs_account_dialog.c:1882
+#: src/prefs_account_dialog.c:1891
 msgid "Put deleted messages in"
 msgstr "將刪除郵件存到"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:1960
 msgid "Account name is not entered."
 msgstr "未輸入帳號名稱。"
 
-#: src/prefs_account_dialog.c:1955
+#: src/prefs_account_dialog.c:1964
 msgid "Mail address is not entered."
 msgstr "未輸入電子郵件信箱。"
 
-#: src/prefs_account_dialog.c:1960
+#: src/prefs_account_dialog.c:1969
 msgid "SMTP server is not entered."
 msgstr "未輸入發送郵件伺服器。"
 
-#: src/prefs_account_dialog.c:1965
+#: src/prefs_account_dialog.c:1974
 msgid "User ID is not entered."
 msgstr "未輸入使用者帳號。"
 
-#: src/prefs_account_dialog.c:1970
+#: src/prefs_account_dialog.c:1979
 msgid "POP3 server is not entered."
 msgstr "未輸入接收郵件伺服器。"
 
-#: src/prefs_account_dialog.c:1975
+#: src/prefs_account_dialog.c:1984
 msgid "IMAP4 server is not entered."
 msgstr "未輸入接收郵件伺服器。"
 
-#: src/prefs_account_dialog.c:1980
+#: src/prefs_account_dialog.c:1989
 msgid "NNTP server is not entered."
 msgstr "未輸入新聞伺服器。"
 
-#: src/prefs_account_dialog.c:2006
+#: src/prefs_account_dialog.c:2015
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2125
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/src/compose.c b/src/compose.c
index c132ff96..771adb4d 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -881,6 +881,16 @@ void compose_reply(MsgInfo *msginfo, FolderItem *item, ComposeMode mode,
 	if (item)
 		compose_entries_set_from_item(compose, item, COMPOSE_REPLY);
 
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
+
+	if (account->sig_before_quote && prefs_common.auto_sig) {
+		GtkTextMark *mark;
+		compose_insert_sig(compose, TRUE, FALSE, FALSE);
+		mark = gtk_text_buffer_get_insert(buffer);
+		gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+		gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+	}
+
 	if (quote) {
 		gchar *qmark;
 		gchar *quote_str;
@@ -895,13 +905,12 @@ void compose_reply(MsgInfo *msginfo, FolderItem *item, ComposeMode mode,
 					      qmark, body);
 	}
 
-	if (prefs_common.auto_sig)
+	if (!account->sig_before_quote && prefs_common.auto_sig)
 		compose_insert_sig(compose, TRUE, FALSE, FALSE);
 
 	if (quote && prefs_common.linewrap_quote)
 		compose_wrap_all(compose);
 
-	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
 	gtk_text_buffer_get_start_iter(buffer, &iter);
 	gtk_text_buffer_place_cursor(buffer, &iter);
 
@@ -991,6 +1000,14 @@ void compose_forward(GSList *mlist, FolderItem *item, gboolean as_attach,
 	text = GTK_TEXT_VIEW(compose->text);
 	buffer = gtk_text_view_get_buffer(text);
 
+	if (account->sig_before_quote && prefs_common.auto_sig) {
+		GtkTextMark *mark;
+		compose_insert_sig(compose, TRUE, FALSE, FALSE);
+		mark = gtk_text_buffer_get_insert(buffer);
+		gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+		gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+	}
+
 	for (cur = mlist; cur != NULL; cur = cur->next) {
 		msginfo = (MsgInfo *)cur->data;
 
@@ -1040,7 +1057,7 @@ void compose_forward(GSList *mlist, FolderItem *item, gboolean as_attach,
 		}
 	}
 
-	if (prefs_common.auto_sig)
+	if (!account->sig_before_quote && prefs_common.auto_sig)
 		compose_insert_sig(compose, TRUE, FALSE, FALSE);
 
 	if (prefs_common.linewrap_quote)
diff --git a/src/prefs_account_dialog.c b/src/prefs_account_dialog.c
index a9d9dac1..1358bf8f 100644
--- a/src/prefs_account_dialog.c
+++ b/src/prefs_account_dialog.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2010 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -124,6 +124,7 @@ static struct Compose {
 	GtkWidget *sig_text;
 	GtkTextBuffer *sig_buffer;
 	GtkWidget *sigpath_entry;
+	GtkWidget *sig_before_quote_chkbtn;
 
 	GtkWidget *autocc_chkbtn;
 	GtkWidget *autocc_entry;
@@ -306,6 +307,8 @@ static PrefsUIData ui_data[] = {
 	 prefs_set_data_from_entry, prefs_set_entry},
 	{"signature_text", &compose.sig_text,
 	 prefs_set_data_from_text, prefs_set_text},
+	{"signature_before_quote", &compose.sig_before_quote_chkbtn,
+	 prefs_set_data_from_toggle, prefs_set_toggle},
 	{"set_autocc", &compose.autocc_chkbtn,
 	 prefs_set_data_from_toggle, prefs_set_toggle},
 	{"auto_cc", &compose.autocc_entry,
@@ -1233,6 +1236,7 @@ static void prefs_account_compose_create(void)
 	GtkWidget *sigfile_radiobtn;
 	GtkWidget *sigcmd_radiobtn;
 	GtkWidget *sigpath_entry;
+	GtkWidget *sig_before_quote_chkbtn;
 	GtkWidget *frame;
 	GtkWidget *table;
 	GtkWidget *autocc_chkbtn;
@@ -1300,6 +1304,9 @@ static void prefs_account_compose_create(void)
 	gtk_widget_show (sigpath_entry);
 	gtk_box_pack_start (GTK_BOX (sig_vbox), sigpath_entry, TRUE, TRUE, 0);
 
+	PACK_CHECK_BUTTON (sig_vbox, sig_before_quote_chkbtn,
+			   _("Put signature before quote (not recommended)"));
+
 	SET_TOGGLE_SENSITIVITY (sig_radiobtn, sig_text);
 	SET_TOGGLE_SENSITIVITY (sigfile_radiobtn, sigpath_entry);
 	SET_TOGGLE_SENSITIVITY (sigcmd_radiobtn, sigpath_entry);
@@ -1364,6 +1371,8 @@ static void prefs_account_compose_create(void)
 
 	compose.sig_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(sig_text));
 
+	compose.sig_before_quote_chkbtn = sig_before_quote_chkbtn;
+
 	compose.autocc_chkbtn      = autocc_chkbtn;
 	compose.autocc_entry       = autocc_entry;
 	compose.autobcc_chkbtn     = autobcc_chkbtn;