made 1.9.3 release.

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

27 files changed, 2025 insertions, 2025 deletions

diff --git a/po/bg.po b/po/bg.po
index 1d296e2f..3fff56ad 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+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"
@@ -97,7 +97,7 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Изтриване на акаунт"
 msgid "Do you really want to delete this account?"
 msgstr "Желаете ли да изтриете този акаунт?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Да"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,7 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
@@ -401,7 +401,7 @@ msgstr "/_Изтриване"
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -605,7 +605,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Забележка"
 
@@ -613,7 +613,7 @@ msgstr "Забележка"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Грешка"
 
@@ -901,67 +901,67 @@ msgstr "Грешка в формата на цитат."
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Редактирано]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Съставяне на съобщение%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Изпращане"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -969,26 +969,26 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -999,140 +999,140 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "Не може да се запишат хедърите\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Изпращане по-късно"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Поставяне в папката за опашка и изпращане по-късно"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Чернови"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Вмъкване"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Вмъкване на файл"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Прикрепване"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Прикрепване на файл"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Сигнатура"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Вмъкване на сигнатура"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Редакция с външен редактор"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Свиванен на редовете"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Свиване на всички дълги редове"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1143,67 +1143,67 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Прекратен process group id: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Временен файл: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Съставяне: вход от наблюдаващ процес\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Не може да се стартира външен редактор\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Не може да се запише във файл\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Четене на pipe провалено\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Изоставяне на съобщение"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Изоставяне"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "при Чернови"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Заменяне"
 
diff --git a/po/cs.po b/po/cs.po
index bed13d58..ab2018fe 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
 "Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -96,7 +96,7 @@ msgstr ""
 "kontrolován při volbě 'Stáhnout vše, zaškrtněte políčko ve sloupci 'G'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -149,13 +149,13 @@ msgstr "Smazat účet"
 msgid "Do you really want to delete this account?"
 msgstr "Opravdu chcete tento účet smazat?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ano"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -260,7 +260,7 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do databáze"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -400,7 +400,7 @@ msgstr "/_Smazat"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Databáze adres"
 
@@ -602,7 +602,7 @@ msgstr "Společná adresa"
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -610,7 +610,7 @@ msgstr "Poznámka"
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Chyba"
 
@@ -898,67 +898,67 @@ msgstr "Chyba v uvozovkách."
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/přeposlání."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nemohu zjistit délku souboru %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Nemohu získat část z mnohačásťové zprávy."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Upraveno]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Psaní zprávy%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto mám zprávu odeslat?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "Nelze načíst seznam příjemců."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -966,26 +966,26 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nemohu najít žádný klíč asociovaný s aktuálně vybraným id klíče '%s'."
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "nelze změnit mód souboru\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -996,140 +996,140 @@ msgstr ""
 "%s na %s.\n"
 "Přesto poslat?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "nelze zapsat záhlaví\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "nelze smazat staré zprávy\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "zařazuji zprávu...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "nelze najít složku s frontou zpráv\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "Zprávu nelze zařadit\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytvářím číslo zprávy: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Vytvářím okno pro psaní...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Zařadí do výstupní fronty a odešle později"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Uloží koncept do složky"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Vloží soubor"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Příloha"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Připojí soubor"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Vloží podpis"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Úprava externím editorem"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Zarovnání"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Zarovnání dlouhých řádků"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Špatný příkaz v externím editoru: '%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1140,67 +1140,67 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Přerušen proces číslo: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Dočasný soubor: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Psaní: vstup z externího procesu\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Nelze spustit externí editor\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Nelze zapisovat do souboru\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Nelze číst\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Obsah zprávy se změnil. Chcete ji stornovat?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Stornovat"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "Uložit jako koncept"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu '%s' ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Nahradit"
 
diff --git a/po/da.po b/po/da.po
index e08ae251..b216e1a8 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -95,7 +95,7 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -148,13 +148,13 @@ msgstr "Slet konto"
 msgid "Do you really want to delete this account?"
 msgstr "Vil du virkelig slette denne konto?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -259,7 +259,7 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -399,7 +399,7 @@ msgstr "/_Slet"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Adressebog"
 
@@ -597,7 +597,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Note"
 
@@ -605,7 +605,7 @@ msgstr "Note"
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Fejl"
 
@@ -893,67 +893,67 @@ msgstr "Citat markérings format fejl."
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Redigéret]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Ny meddelelse%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Send"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -961,26 +961,26 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -991,140 +991,140 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "kan ikke skrive hoved\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Læg i kø og send senere"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Gem i Kladde"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Indæst"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Insæt fil"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Vedhæft"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Underskrift"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Indsæt underskrift"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Redigér med ekstern Editor"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Linie deling"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1135,67 +1135,67 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Afbrudt proces gruppe ID: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Midlertidig fil: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Instast: fra monitor process\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Kunne ikke starte ekstern editor\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Kunne ikke gemme fil\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Fejl i læsning fra Pipe\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Slet meddelelse"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Slet"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "til Kladde"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Erstat"
 
diff --git a/po/de.po b/po/de.po
index a586af52..f04033d1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2005-02-08 22:49+0100\n"
 "Last-Translator: Manfred Usselmann <usselmann.m@icg-online.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "in der `G'-Spalte, um den Nachrichten-Empfang bei `Hole alle' einzuschalten."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -153,13 +153,13 @@ msgstr "Account löschen"
 msgid "Do you really want to delete this account?"
 msgstr "Wollen Sie diesen Account wirklich löschen?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -264,7 +264,7 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -404,7 +404,7 @@ msgstr "/_Löschen"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -609,7 +609,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Notiz"
 
@@ -617,7 +617,7 @@ msgstr "Notiz"
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Fehler"
 
@@ -897,67 +897,67 @@ msgstr "Zitatzeichen Formatfehler."
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [in Bearbeitung]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Verfasse Nachricht%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Verfasse Nachricht%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -965,26 +965,26 @@ 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:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -995,140 +995,140 @@ msgstr ""
 "(von %s zu %s).\n"
 "Trotzdem senden?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "kann Kopfzeilen nicht schreiben\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Sende Nachricht"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und später senden"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Datei einfügen"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Anhängen"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, 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:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1139,67 +1139,67 @@ msgstr ""
 "Prozess terminieren?\n"
 "Prozessgruppen ID: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Gruppen ID: %d des terminierten Prozesses"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Temporäre Datei: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Verfassen: Eingabe vom Überwachungsprozess\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Kann externen Editor nicht ausführen\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Kann nicht in Datei schreiben\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Lesen von Pipe fehlgeschlagen\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Verwerfen"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "zum Entwurf"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone `%s' übernehmen ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Ersetzen"
 
diff --git a/po/el.po b/po/el.po
index bf56afca..1a887dca 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2001-10-08\n"
 "Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -98,7 +98,7 @@ msgid ""
 msgstr ""
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -151,13 +151,13 @@ msgstr "Διαγραφή λογαριασμού"
 msgid "Do you really want to delete this account?"
 msgstr "Θέλετε πράγματι να διαγράψετε αυτό το λογαριασμό;"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ναι"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -257,7 +257,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο βιβλίο"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Διεύθυνση"
@@ -401,7 +401,7 @@ msgstr "/Διαγραφή"
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
@@ -600,7 +600,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -608,7 +608,7 @@ msgstr "Σημείωση"
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -910,67 +910,67 @@ msgstr ""
 msgid "Message reply/forward format error."
 msgstr ""
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν μπορώ να βρω το μέγεθος του αρχείου %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι άδειο\n"
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Δεν μπορώ να λάβω το τμήμα του πολυτμηματικού μηνύματος"
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Τροποποιημένο]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Ο παραλήπτης δεν έχει οριστεί."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "δεν μπορώ να πάρω την λίστα παραληπτών"
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -978,26 +978,26 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Δεν μπορώ να αποθηκεύσω το μήνυμα στα εξερχόμενα."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "δεν μπορώ να αλλάξω το mode του αρχείου\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1005,147 +1005,147 @@ msgid ""
 "Send it anyway?"
 msgstr "Δεν μπορώ να αλλάξω το κωδικοσύνολο του μηνύματος."
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "δεν μπορώ να γράψω την κεφαλίδα\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "δεν μπορώ να αφαιρέσω το παλιό μήνυμα\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "βάζω το μήνυμα στην ουρά...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "δεν μπορώ να βάλω το μήνυμα στην ουρά\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generated Message-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Δημιουργώ το παράθυρο σύνθεσης...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr ""
 "Αποστολή\n"
 "αργότερα"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Τοποθέτηση στον κατάλογο ουράς και αποστολή αργότερα"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Πρόχειρα"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Εισαγωγή"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Εισαγωγή αρχείου"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Προσάρτηση αρχείου"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Yπογραφή"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Εισαγωγή υπογραφής"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Συνθέτης"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr ""
 "Τύλιξη\n"
 "γραμμής"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει, ή είναι άδειο."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 #, fuzzy
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Διάδρομος"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Η εντολή για το εξωτερικό πρόγραμμα δεν είναι έγκυρη: `%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1156,68 +1156,68 @@ msgstr ""
 "Να επιβάλλω τερματισμό της διεργασίας;\n"
 "process group id:  %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Τερματίστηκε process group id: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Προσωρινό αρχείο: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Σύνθεση: εισαγωγή από παρακολουθούμενη διεργασία\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Δεν μπόρεσα να καλέσω το εξωτερικό πρόγραμμα επεξεργασίας\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Δεν μπόρεσα να γράψω στο αρχείο\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Αποτυχία ανάγνωσης από το pipe\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Δεν μπορώ να βάλω στην ουρά το μήνυμα."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Απόρριψη μηνύματος"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Αυτό το μήνυμα έχει τροποποιηθεί, να απορριφθεί;"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Απόρριψη"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "στα πρόχειρα"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 #, fuzzy
 msgid "Apply template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 #, fuzzy
 msgid "Replace"
 msgstr "Απάντηση"
diff --git a/po/es.po b/po/es.po
index bec1955a..88395c75 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2004-12-21 11:18+0100\n"
 "Last-Translator: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
@@ -97,7 +97,7 @@ msgstr ""
 "en la columna `G' para habilitar la descarga mediante `Traer todo'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Borrar cuenta"
 msgid "Do you really want to delete this account?"
 msgstr "¿Esta seguro de que quiere borrar esta cuenta?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Si"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,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:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Dirección"
@@ -401,7 +401,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
@@ -605,7 +605,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Notificación"
 
@@ -613,7 +613,7 @@ msgstr "Notificación"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Error"
 
@@ -893,67 +893,67 @@ msgstr "Error en el formato de la marca de cita."
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, 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:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Componer mensaje%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -961,28 +961,28 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "No se encontró ninguna clave asociada al ID-clave seleccionado actualmente `%"
 "s'."
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -993,140 +993,140 @@ msgstr ""
 "de %s a %s.\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "no se pueden escribir las cabeceras\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Insertar firma"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, 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:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1137,67 +1137,67 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de grupo de proceso: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado grupo de proceso id.: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fichero temporal: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Componer: entrada desde proceso monitor\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "No se pudo ejecutar el editor externo\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "No se pudo escribir en el fichero\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Fallo leyendo tubería\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "a Borradores"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla `%s' ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Reemplazar"
 
diff --git a/po/et.po b/po/et.po
index 45f97088..2ca18afe 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+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"
@@ -95,7 +95,7 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -148,13 +148,13 @@ msgstr "Kustuta konto"
 msgid "Do you really want to delete this account?"
 msgstr "Kas te tõesti soovite kustutada kontot?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Jah"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -257,7 +257,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Aadress"
@@ -397,7 +397,7 @@ msgstr "/Kustuta"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Aadressiraamat"
 
@@ -600,7 +600,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Märkus"
 
@@ -608,7 +608,7 @@ msgstr "Märkus"
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Viga"
 
@@ -897,67 +897,67 @@ msgstr "*Tsitaadimärgi formaadi viga."
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Redigeeritud]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Kirjuta kiri%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Saada"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -965,27 +965,27 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -995,141 +995,141 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "Ei suuda kirjutada päist\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Saada kiri"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Hiljem"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Pane järjekorda ja saada hiljem"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Mustand"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Salvesta mustandite kausta"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Lisa fail"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Manusta"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Manusta fail"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Allkiri"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Lisa allkiri"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Redaktor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Redigeeri välise redaktoriga"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Reaäär"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Murra kõik pikad read"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1140,67 +1140,67 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Hävitatud protsessi grupi id: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ajutine fail: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Kirjutaja: sisend monitoorprotsessilt\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Ei suutnud välist redaktorit käivitada\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Ei suutnud faili salvestada\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Torust lugemine ebaõnnestus\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Kaota kiri"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Kaota"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "Mustanditesse"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Asenda"
 
diff --git a/po/fr.po b/po/fr.po
index 28be102a..61f1dead 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2004-12-09 20:16+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -105,7 +105,7 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -158,13 +158,13 @@ msgstr "Supprimer le compte"
 msgid "Do you really want to delete this account?"
 msgstr "Voulez-vous vraiment supprimer ce compte ?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Oui"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -269,7 +269,7 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -409,7 +409,7 @@ msgstr "/_Supprimer"
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
@@ -616,7 +616,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Information"
 
@@ -624,7 +624,7 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Erreur"
 
@@ -906,67 +906,67 @@ msgstr ""
 "Erreur du format de citation d'un message lors d'une réponse ou d'un "
 "transfert."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [modifié]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Composition d'un message%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -974,26 +974,26 @@ 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:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, 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:2339
+#: src/compose.c:2392
 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:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1003,140 +1003,140 @@ msgstr ""
 "Impossible de convertir le jeu de caractères du message\n"
 "de %s vers %s. Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "impossible d'écrire les en-têtes\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Envoyer le message"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Envoi différé"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Insertion"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Insérer un fichier"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Joindre"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Signature"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Insérer la signature"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Éditeur de texte"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur externe"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Justifier"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, 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:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1147,69 +1147,69 @@ msgstr ""
 "Forcer sa fermeture ?\n"
 "id de traitement de groupe: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Id de traitement de groupe terminé : %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fichier temporaire : %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose : entrée à partir d'une surveillance de traitement\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Impossible de lancer l'éditeur externe\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Impossible d'écrire dans le fichier\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Échec de lecture de pipe\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr ""
 "Ce message a été modifié mais pas envoyé. Voulez-vous interrompre la "
 "composition ?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Interrompre"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "vers brouillon"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Remplacer"
 
diff --git a/po/gl.po b/po/gl.po
index b4008e33..5f756741 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -97,7 +97,7 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Borrar conta"
 msgid "Do you really want to delete this account?"
 msgstr "¿Realmente quere borrar esta conta?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Si"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -259,7 +259,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Enderezo"
@@ -399,7 +399,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
@@ -603,7 +603,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Notificación"
 
@@ -611,7 +611,7 @@ msgstr "Notificación"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Erro"
 
@@ -900,67 +900,67 @@ msgstr "Marca de cita para erro."
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, 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:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Compoñer mensaxe%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -968,26 +968,26 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -998,140 +998,140 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "non se poden escribir as cabeceiras\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Poñer na cola e enviar mais tarde"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Gardar como borrador"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Inserir ficheiro"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Sinatura"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Inserir sinatura"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Cortar todas as líneas longas"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, 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:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1142,67 +1142,67 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado proceso id.: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ficheiro temporal: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Compoñer: entrada dende proceso monitor\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Non se puido executar o editor externo\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Non se puido escribir no ficheiro\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Fallo lendo tubería\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Descartar Mensaxe"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "a Borrador"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Substituír"
 
diff --git a/po/hr.po b/po/hr.po
index d6b11ce1..9b1e5a86 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+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"
@@ -96,7 +96,7 @@ msgstr ""
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -149,13 +149,13 @@ msgstr "Obriši račun"
 msgid "Do you really want to delete this account?"
 msgstr "Želite li usitinu obrisati ovaj račun?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -255,7 +255,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -396,7 +396,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Adresar"
 
@@ -593,7 +593,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -601,7 +601,7 @@ msgstr "Obavijest"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Greška"
 
@@ -903,67 +903,67 @@ msgstr "Greška formata citata."
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Uređeno]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Pisanje poruke%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -971,26 +971,26 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, 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:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -998,143 +998,143 @@ msgid ""
 "Send it anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "ne mogu pisati zaglavlje\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Odloži u spis odloženo i pošalji kasnije"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Spremi u spis nedovršeno"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Priloži"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Uređivač"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Uredi s vanjskim uređivačem"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, 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:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1145,68 +1145,68 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Ugašena grupa procesa: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Privremena datoteka: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Napiši: unos iz procesa motrenja\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Ne mogu pokrenuti vanjski uređivač\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Ne mogu pisati u datoteku\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Čitanje pipe-a nije uspjelo\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Odbaci poruku"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Odbaci"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "u Nedovršeno"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 #, fuzzy
 msgid "Replace"
 msgstr "Obrazac"
diff --git a/po/hu.po b/po/hu.po
index ce19b4ce..a6c1c2f9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2003-07-26 22:58-0100\n"
 "Last-Translator: Zahemszky Gábor <Gabor@Zahemszky.HU>\n"
 "Language-Team: Hungarian <gnome-hu@gnome.org>\n"
@@ -99,7 +99,7 @@ msgstr ""
 "funkció bekapcsolásához válaszd ki a 'G' oszlopban a jelölődobozt!"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -152,13 +152,13 @@ msgstr "Hozzáférés törlése"
 msgid "Do you really want to delete this account?"
 msgstr "Tényleg töröljem ezt a hozzáférést?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Igen"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -264,7 +264,7 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címlistához"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Cím"
@@ -404,7 +404,7 @@ msgstr "/_Törlés"
 msgid "E-Mail address"
 msgstr "E-Mail cím"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Címjegyzék"
 
@@ -604,7 +604,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -612,7 +612,7 @@ msgstr "Megjegyzés"
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Hiba"
 
@@ -900,67 +900,67 @@ msgstr "Idézet jelölés formátum hiba."
 msgid "Message reply/forward format error."
 msgstr "Üzenet válasz/továbbítás formátum hiba."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem meghatározható\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "A %s fájl üres."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Üzenet: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Egy több részes üzenet egy darabja nem hozzáférhető."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Szerkesztett]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Üzenet írása%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Üzenet írása%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Nincs címzett."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Küldés"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldöd?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -968,27 +968,27 @@ msgstr ""
 "Nincs megadva hozzáférés a levél küldéshez.\n"
 "Kérek válassz ki egy hozzáférést küldés előtt!"
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel a %s-nak küldendő üzenet küldése közben."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Az üzenet nem menthető a kimenő mappába."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nem találtam hozzárendelt kulcsot a kiválasztott kulcs azonosítóhoz `%s'."
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -999,140 +999,140 @@ msgstr ""
 "%s-ról %s-ra.\n"
 "Elküldjem ennek ellenére?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "fejléc nem írható\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "a régi üzenetet nem tudom eltávolítani\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "üzenet a Várakozó sorba...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "nem találom a Várakozó sor mappáját\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Üzenet-azonosító: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Üzenet küldése"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Küldés később"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Üzenet a Várakozó sorba, küldés később"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Vázlat"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Mentés a vázlat mappába"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Fájl beszúrása"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Csatolás"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Fájl csatolása"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Aláírás"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Aláírás beillesztése"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Szerkesztő"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Szerkesztés külső programmal"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Sortörés"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Az összes hosszú sor törése"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1143,67 +1143,67 @@ msgstr ""
 "Processz kilövése?\n"
 "processz csoport azonosító: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "A leállított processz csoport azonosítója: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ideiglenes fájl: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Szerkesztés: bemenet a monitorozó processzből\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Külső szerkesztő nem indítható\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Nem tudok a fájlba írni\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Hiba történt a csővezeték olvasása közben\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Üzenet elvetése"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Az üzenet megváltozott. Eldobjam?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Elvet"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "vázlatok közé"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni akarod a `%s' sablont?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Helyettesít"
 
diff --git a/po/it.po b/po/it.po
index 9471f732..61784a27 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 1.0.0beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2004-11-13 11:30+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "tutti»."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -153,13 +153,13 @@ msgstr "Elimina account"
 msgid "Do you really want to delete this account?"
 msgstr "Eliminare questo account?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Sì"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -264,7 +264,7 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Indirizzo"
@@ -404,7 +404,7 @@ msgstr "/Eli_mina"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Rubrica"
 
@@ -609,7 +609,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Avviso"
 
@@ -617,7 +617,7 @@ msgstr "Avviso"
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Errore"
 
@@ -897,67 +897,67 @@ msgstr "Errore del formato del segno di citazione."
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Modificato]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composizione messaggio %s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Composizione messaggio %s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Invia"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -965,28 +965,28 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, 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:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -997,140 +997,140 @@ msgstr ""
 "%s a %s.\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "impossibile scrivere le intestazioni\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Invia il messaggio"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Invia più tardi"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Mette nella cartella «Coda» e invia più tardi"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Bozze"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Inserisce il file"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Allega"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Allega il file"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Inserisce la firma"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Modifica con l'editor esterno"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "A capo riga"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, 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:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1141,67 +1141,67 @@ msgstr ""
 "Forzare la conclusione del processo?\n"
 "group id del processo: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Group id del processo terminato: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "File temporaneo: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Composizione: input da un processo di controllo\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Impossibile eseguire l'editor esterno\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Impossibile scrivere sul file\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Lettura dalla pipe fallita\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Scarta il messaggio"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Questo messaggio è stato modificato. Scartarlo?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Scarta"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "nella cartella «Bozze»"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Sostituisci"
 
diff --git a/po/ja.po b/po/ja.po
index fb85b650..1abceb02 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+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"
@@ -97,7 +97,7 @@ msgstr ""
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "アカウントの削除"
 msgid "Do you really want to delete this account?"
 msgstr "本当にこのアカウントを削除してもいいですか?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "はい"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,7 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "アドレス"
@@ -401,7 +401,7 @@ msgstr "/削除(_D)"
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "アドレス帳"
 
@@ -603,7 +603,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "注意"
 
@@ -611,7 +611,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "エラー"
 
@@ -891,67 +891,67 @@ msgstr "引用符の書式が不正です。"
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [更新]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - メッセージの作成%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "メッセージの作成%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "送信"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -959,26 +959,26 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -989,140 +989,140 @@ msgstr ""
 "%s から %s に変換できません。\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "ヘッダを書き込めません。\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "メッセージを送信"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "後で送信"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "送信待ちフォルダに入れて後で送信"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "草稿フォルダに保存"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "挿入"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "ファイルを挿入"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "添付"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "ファイルを添付"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "署名"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "署名を挿入"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "エディタ"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "外部エディタで編集"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "整形"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "すべての長い行を折り返す"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1133,67 +1133,67 @@ msgstr ""
 "プロセスを強制終了しますか?\n"
 "プロセスグループID: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "終了したプロセスグループID: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "一時ファイル: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose: 監視プロセスからの入力\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "外部エディタを実行できません\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "ファイルに書き込めません\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "パイプの読み込みに失敗\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "メッセージの破棄"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "このメッセージは変更されています。破棄しますか?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "破棄"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "草稿へ"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "置換"
 
diff --git a/po/ko.po b/po/ko.po
index 22411db4..5d347015 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+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"
@@ -84,7 +84,7 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -137,13 +137,13 @@ msgstr "계정 삭제"
 msgid "Do you really want to delete this account?"
 msgstr "정말로 이 계정을 삭제하시겠습니까?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "확인"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "주소"
@@ -386,7 +386,7 @@ msgstr "/삭제(_D)"
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "주소록"
 
@@ -583,7 +583,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "알림"
 
@@ -591,7 +591,7 @@ msgstr "알림"
 msgid "Warning"
 msgstr "경고"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "에러"
 
@@ -880,67 +880,67 @@ msgstr "인용 부호 형식 에러."
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [수정됨]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "메시지%s 편집"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "메일 발송"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -948,26 +948,26 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -977,141 +977,141 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "헤더를 쓸 수가 없습니다\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "나중에 보내기"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "보낼 편지함에 넣어서 나중에 보내기"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "임시 보관함"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "삽입"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "파일을 삽입합니다"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "첨부"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "파일 첨부"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "서명"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "서명 파일을 끼워넣습니다"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "편집기"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "외부 편집기로 편집"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "줄바꿈"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1122,67 +1122,67 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "프로세스 그룹 id: %d를 종료시킴"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "임시 파일: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "편집: 모니터링하는 프로세스로부터 입력이 있었습니다\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "외부 편집기를 실행할 수가 없습니다\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "파일로 쓸 수가 없습니다\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "파이프 읽기 실패\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "메시지 버리기"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "버리기"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "임시 보관함으로"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "대체"
 
diff --git a/po/nl.po b/po/nl.po
index 042a2a88..68d8d7e2 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2003-02-18 13:03--100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -99,7 +99,7 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -152,13 +152,13 @@ msgstr "Account verwijderen"
 msgid "Do you really want to delete this account?"
 msgstr "Wilt u dit account werkelijk verwijderen?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -401,7 +401,7 @@ msgstr "/Ver_wijderen"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Adresboek"
 
@@ -604,7 +604,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Bericht"
 
@@ -612,7 +612,7 @@ msgstr "Bericht"
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Fout"
 
@@ -900,67 +900,67 @@ msgstr "Citeerteken opmaakfout."
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - bericht opstellen%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Bericht opstellen%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -968,26 +968,26 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, 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:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -998,140 +998,140 @@ msgstr ""
 "%s naar %s.\n"
 "Toch versturen?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "kan geen headers schrijven\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Klad"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Bijvoegen"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Handtekening (signature) invoegen"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Bewerken met ander (extern) programma"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Terugloop"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, 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:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1142,67 +1142,67 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Programma (id: %d) afgebroken."
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Tijdelijk bestand: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Opstellen: invoer van \"monitoring process\"\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Kon het externe programma voor bewerken van e-mail niet aanroepen\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Kon niet naar bestand schrijven\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Inlezen van pijp mislukt\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Gooi bericht weg"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Dit bericht is aangepast. weggooien?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Gooi weg"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "opslaan als klad"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Vervangen"
 
diff --git a/po/pl.po b/po/pl.po
index 9285ee55..bf17941d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 0.9.9 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2003-12-26 11:25+0200\n"
 "Last-Translator: Przemysław Sułek <pbs@linux.net.pl>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -98,7 +98,7 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -151,13 +151,13 @@ msgstr "Usuń konto"
 msgid "Do you really want to delete this account?"
 msgstr "Czy naprawdę chcesz usunąć to konto?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Tak"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -262,7 +262,7 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -402,7 +402,7 @@ msgstr "/_Usuń"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Książka adresowa"
 
@@ -607,7 +607,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Notatka"
 
@@ -615,7 +615,7 @@ msgstr "Notatka"
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Błąd"
 
@@ -903,67 +903,67 @@ msgstr "Błąd formatu znacznika cytatu."
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Edytowany]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Utwórz wiadomość%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Utwórz wiadomość%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -971,27 +971,27 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1002,140 +1002,140 @@ msgstr ""
 "%s na %s.\n"
 "Czy mimo to wysłać wiadomość?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "nie można zapisać nagłówków\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Wyślij później"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Umieść w katalogu kolejki i wyślij później"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Draft"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Wstaw plik"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Dołącz"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Dołącz plik"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Wstaw podpis"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Edytuj w zewnętrznym edytorze"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Zawijanie linii"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1146,67 +1146,67 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Identyfikator zakończonej grupy procesów: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Plik tymczasowy: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Edycja: wejście z procesu monitorującego\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Nie można uruchomić zewnętrznego edytora\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Nie można zapisać do pliku\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Błędny odczyt z potoku\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Porzuć wiadomość"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Porzuć"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "do Draft"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Zamień"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 84a3d1ff..680237d1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2002-07-15 13:06-0300\n"
 "Last-Translator: André Casteliano <digitalcoder@users.sourceforge.net>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -98,7 +98,7 @@ msgstr ""
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -151,13 +151,13 @@ msgstr "Apagar conta"
 msgid "Do you really want to delete this account?"
 msgstr "Você realmente deseja apagar esta conta?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Sim"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -260,7 +260,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adicionar ao Livro de endereços"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Endereço"
@@ -400,7 +400,7 @@ msgstr "/_Apagar"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Livro de endereços"
 
@@ -604,7 +604,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Notificação"
 
@@ -612,7 +612,7 @@ msgstr "Notificação"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Erro"
 
@@ -901,67 +901,67 @@ msgstr "Erro no formato de marca de citação."
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível especificar o tamanho de %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) dessa mensagem."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compondo mensagem%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Compondo mensagem%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto vazio. Enviar assim mesmo?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -969,26 +969,26 @@ msgstr ""
 "Conta para envio de mensagem não está especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocorreu um erro enquanto tentava postar a mensagem para %s ."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 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:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Não foi possível obter nenhuma chave associada ao ID Selecionado '%s'."
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "Não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -998,141 +998,141 @@ msgstr ""
 "Não foi possível converter o código de caracteres da mensagem.\n"
 "Enviar assim mesmo?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "não foi possível escrever o cabeçalho\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "colocando mensagem na fila...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "Não foi possível por a mensagem na fila\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Enviar depois"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Por na 'fila de saída' e enviar depois"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Rascunho"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Inserir arquivo"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Anexar"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Inserir assinatura"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Editar com um editor externo"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Quebra de linha"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas grandes"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 #, fuzzy
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, 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:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1143,67 +1143,67 @@ msgstr ""
 "Deseja matar o processo?\n"
 "Id. do grupo do processo : %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado grupo de processo id.: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Arquivo temporário: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Compositor: entrada para monitorar processo\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Não foi possível executar o editor externo\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Não foi possível gravar o arquivo\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Fallhou ao ler o pipe\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Não foi possível por a mensagem na fila."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Descartar mensagem"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Esta mensagem foi modificada. Deseja descartá-la ?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "como rascunho"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Substituir"
 
diff --git a/po/ro.po b/po/ro.po
index 3e88e66a..491533ce 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2000-08-28\n"
 "Last-Translator: Little Dragon <littledragon@altern.org>\n"
 "Language-Team: Little Dragon <littledragon@altern.org>\n"
@@ -101,7 +101,7 @@ msgstr ""
 "mesajelor de comanda `Ia tot'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -155,13 +155,13 @@ msgstr "Ştergere cont"
 msgid "Do you really want to delete this account?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont ?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresă"
@@ -406,7 +406,7 @@ msgstr "/Ş_tergere"
 msgid "E-Mail address"
 msgstr "Adresă E-Mail"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Agendă"
 
@@ -611,7 +611,7 @@ msgstr "Adresse comună:"
 msgid "Personal address"
 msgstr "Adresse personală:"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Informaţie"
 
@@ -619,7 +619,7 @@ msgstr "Informaţie"
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Eroare"
 
@@ -916,67 +916,67 @@ msgstr "Eroare de formatare a citaţiei."
 msgid "Message reply/forward format error."
 msgstr "Eroare de formatare a răspunsului/mesajului înaintat."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fişierul %s nu există\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Obţinerea dimensiunii fişierului %s este imposibilă\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Fişierul %s este gol\n"
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "nu poate fi creat %s\n"
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Citirea unei parţi din mesajul multipart este imposibilă."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Editat] "
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compunere mesaj%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Compunere mesaj%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu a fost specificat."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Trimitere"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "nu pot obţine lista destinatarilor."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -984,26 +984,26 @@ msgstr ""
 "Nu a fost specificat contul de pe care se doreşte trimiterea de mail.\n"
 "Vă rugăm să selectaţi un cont înainte de a trimite."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A avut loc o eroare la încercarea de a posta mesajul pe %s ."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Salvarea mesajului în outbox este imposibilă."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "schimbarea permisiunilor fişierului este imposibilă\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1011,142 +1011,142 @@ msgid ""
 "Send it anyway?"
 msgstr "Convertirea codificării mesajului este imposibilă."
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "scrierea antetelor este imposibilă\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "ştergerea mesajului vechi a eşuat\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "punere mesaj în lista de aşteptare...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "directorul nu a putut fi selectat: %s\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "punerea mesajului în lista de aşteptare este imposibilă\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Creare fereastra de compunere...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Trimitere mesaj"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Mai târziu"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Punere în lista de aşteptare şi trimitere mai târziu"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Salvare"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Salvare"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Inserare"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Isertion fişier"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Ataşament"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Ataşare fişier"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Semnătură"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Inserare semnătură"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Editare cu editor extern"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Tăiere linii"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Tăiere toate liniile lungi"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Fişierul nu există sau este gol."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 #, fuzzy
 msgid "Properties"
 msgstr "Proprietate"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Numele fişierului"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1157,68 +1157,68 @@ msgstr ""
 "Doriţi terminarea forţată a procesului ?\n"
 "process group id: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Procesul a fost terminat: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fişier temporar: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Compunere: introducere din proces monitorizat\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Editorul extern nu poate fi executat\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Scrierea în fişier este imposibilă\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Citirea din pipe a eşuat\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Este imposibilă punerea mesajului în lista de aşteptare."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Selectare fişier"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Anulare mesaj"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Acest mesaj a fost modificat. Doriţi sa anulaţi schimbările ?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Anulare schimbări"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "Salvare"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 #, fuzzy
 msgid "Apply template"
 msgstr "Ştergere mesaj"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 #, fuzzy
 msgid "Replace"
 msgstr "/_Utilitare/_Modele"
diff --git a/po/ru.po b/po/ru.po
index de03ef82..e8c3d940 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2004-12-05 17:16+0300\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -99,7 +99,7 @@ msgstr ""
 "по команде 'Получить все'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -152,13 +152,13 @@ msgstr "Удалить учетную запись"
 msgid "Do you really want to delete this account?"
 msgstr "Вы действительно хотите удалить эту запись?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Да"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -263,7 +263,7 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
@@ -403,7 +403,7 @@ msgstr "/Удалить"
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Адресная книга"
 
@@ -606,7 +606,7 @@ msgstr "Адреса организаций"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -614,7 +614,7 @@ msgstr "Уведомление"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Ошибка"
 
@@ -894,67 +894,67 @@ msgstr "Неверный формат метки цитирования."
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Изменено]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Подготовка сообщения%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Отправить"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -962,26 +962,26 @@ msgstr ""
 "Учетная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите ее перед отправкой."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору '%s'."
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -992,140 +992,140 @@ msgstr ""
 "из %s в %s.\n"
 "Все равно послать его?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "ошибка записи заголовков\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Поместить в очередь и отправить позже"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Черновики"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Вставить"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Вставить файл"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Вложение"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Вложить файл"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Добавить подпись"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Править внешним редактором"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Перенос строк"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Отформатировать все сообщение"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: '%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1136,67 +1136,67 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Завершен процесс группы: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Временный файл: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Подготовка сообщения: ввод из процесса слежения\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Не удалось запустить внешний редактор\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Ошибка записи в файл\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Ошибка чтения из канала\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Отказ от сообщения"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Это сообщение изменено. Отказаться от него?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Отказаться"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "В черновики"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон '%s'?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Заменить"
 
diff --git a/po/sk.po b/po/sk.po
index 1c0c7958..deba2a9d 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+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"
@@ -97,7 +97,7 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Zmazať konto"
 msgid "Do you really want to delete this account?"
 msgstr "Naozaj chcete zmazať toto konto?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Áno"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,7 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresár"
@@ -401,7 +401,7 @@ msgstr "/Z_mazať"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
@@ -605,7 +605,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -613,7 +613,7 @@ msgstr "Upozornenie"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Chyba"
 
@@ -901,67 +901,67 @@ msgstr "Chyba v úvodzovkách."
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr "[Upravené]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Písanie správy%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -969,26 +969,26 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -999,140 +999,140 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "nedá sa zapísať hlavička\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Odoslať neskôr"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Pripojiť"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Vložiť podpis"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Riadkovanie"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1143,67 +1143,67 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Ukončená skupina procesov s ID: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Dočasný súbor: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Písanie: vstup z externého procesu\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Nedá sa spustiť externý editor\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Nedá sa zapisovať do súboru\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Nedá sa čítať z potrubia\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Zrušiť správu"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Zahodiť"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "medzi Koncepty"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Nahradiť"
 
diff --git a/po/sl.po b/po/sl.po
index 38db7f81..60a19a6a 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+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"
@@ -97,7 +97,7 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Brisanje računa"
 msgid "Do you really want to delete this account?"
 msgstr "Ali resnično želite izbrisati ta račun?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -259,7 +259,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Naslov"
@@ -399,7 +399,7 @@ msgstr "/_Brisanje"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Imenik naslovov"
 
@@ -602,7 +602,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Opomba"
 
@@ -610,7 +610,7 @@ msgstr "Opomba"
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Napaka"
 
@@ -899,67 +899,67 @@ msgstr "Napaka pri oblikovanju znaka za citiranje."
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [V urejanju]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Sestavi sporočilo%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -967,26 +967,26 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, 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:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -996,141 +996,141 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "Ne morem zapisati zaglavij\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Pošlji kasneje"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Postavi v mapo Čakajoče in pošlji kasneje"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Osnutek"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Vstavi"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Vstavi datoteko"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Pripni"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Vstavi podpis"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Urejanje z zunanjim urejevalnikom"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Prelom vrstic"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1141,67 +1141,67 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Št. prekinjene skupine procesov: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Začasna datoteka: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Sestavljanje: vhod iz opazovanega procesa\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Ne morem pognati zunanjega urejevalnika\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Ne morem pisati v datoteko\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Branje preko cevi ni uspelo\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Zavrzi sporočilo"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "To sporočilo je bilo spremenjeno. Naj ga zavržem?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Zavrži"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "v Draft"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Zamenjaj"
 
diff --git a/po/sr.po b/po/sr.po
index 040ab8d9..3c5ea17e 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -97,7 +97,7 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Obriši nalog"
 msgid "Do you really want to delete this account?"
 msgstr "Želite li zaista obrisati ovaj nalog?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -259,7 +259,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -399,7 +399,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Adresar"
 
@@ -596,7 +596,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -604,7 +604,7 @@ msgstr "Obaveštenje"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Greška"
 
@@ -893,67 +893,67 @@ msgstr "Greška u formatu citata."
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Izmenjeno]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Pisanje poruke%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -961,27 +961,27 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, 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:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -991,141 +991,141 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "ne mogu upisati zaglavlje\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Odloži u direktotijum odloženo i pošalji kasnije"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Sačuvaj u direktorijum nedovršeno"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Prikači"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Prikači datoteku"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Izmeni sa nezavisnim ediorom"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Sažmi sve duge linije"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1136,67 +1136,67 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Prekinuta grupa procesa: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Privremena datoteka: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Napiši: unos iz procesa praćenja\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Ne mogu pokrenuti nezavisni editor\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Ne mogu snimiti u datoteku\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Čitanje pipe-a nije uspelo\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Odbaci poruku"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Odbaci"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "u Nedovršeno"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Zameni"
 
diff --git a/po/sv.po b/po/sv.po
index fc00292d..66afce11 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Mattias Ostergren <spikboll@gmx.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -99,7 +99,7 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -152,13 +152,13 @@ msgstr "Ta bort konto"
 msgid "Do you really want to delete this account?"
 msgstr "Vill du verkligen ta bort detta konto?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -263,7 +263,7 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adress"
@@ -403,7 +403,7 @@ msgstr "/_Ta bort"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Adressbok"
 
@@ -602,7 +602,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Notera"
 
@@ -610,7 +610,7 @@ msgstr "Notera"
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Fel"
 
@@ -890,67 +890,67 @@ msgstr "Citationsteckensformatfel."
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Redigerat]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Skriv meddelande%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Skriv meddelande%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -958,27 +958,27 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -989,140 +989,140 @@ msgstr ""
 "%s till %s.\n"
 "Skicka ändå?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "kan inte skriva brevhuvud\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Placera i kömapp och skicka senare"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Bifoga fil"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Infoga signatur"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Radbrytning"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Radbryt långa rader"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1133,67 +1133,67 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Avslutade processgrupps-id: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Temporär fil: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Skriv: indata från bevakad process\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Kunde inte köra extern redigerare\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Kunde inte skriva till fil\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Kunde inte läsa från rör\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Kasta meddelande"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Detta meddelande har ändrats. Kasta det?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Kasta"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "till Utkast"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Ersätt"
 
diff --git a/po/tr.po b/po/tr.po
index 89c947df..7f4b62f1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -153,13 +153,13 @@ msgstr "Hesabı sil"
 msgid "Do you really want to delete this account?"
 msgstr "Bu hesabı silmek istiyor musunuz?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Evet"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -264,7 +264,7 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -404,7 +404,7 @@ msgstr "/_Sil"
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Adres defteri"
 
@@ -606,7 +606,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Not"
 
@@ -614,7 +614,7 @@ msgstr "Not"
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Hata"
 
@@ -894,67 +894,67 @@ msgstr "Alıntı formatı hatası."
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Düzenlendi]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "İleti düzenle (%s)"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Gönder"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -962,26 +962,26 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, 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:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -992,140 +992,140 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "başlıklar yazılamadı\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "İletiyi kuyruğa aktar ve sonra gönder"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Taslak"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "İçer"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Dosya içer"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Ekle"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Dosya ekle"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "İmza"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "İmza ekle"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Düzenleyici"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Harici bir düzenleyici kullan"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Satır kaydır"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Tüm uzun satırları kaydır"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, 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:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1136,67 +1136,67 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Grup numarası %d olan süreç sonlandırıldı"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Geçici dosya: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Düzenle: süreç görüntüsünü içer\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Harici düzenleyici çalıştırılamadı\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Dosyaya yazılamadı\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Boru okumada hata\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "İletiyi sil"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Sil"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "Taslağa Gönder"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Değiştir"
 
diff --git a/po/uk.po b/po/uk.po
index babb71ce..3c3c642e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 1.0.0beta1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: Sun 31 Oct 2004 23:17:57\n"
 "Last-Translator: O. Nykyforchyn <nick@pu.if,ua>, 2004.\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -153,13 +153,13 @@ msgstr "Видалити обліковий запис"
 msgid "Do you really want to delete this account?"
 msgstr "Ви дійсно бажаєте видалити цей запис?"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Авжеж"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -264,7 +264,7 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адреса"
@@ -404,7 +404,7 @@ msgstr "/Видалити"
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -601,7 +601,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "Примітка"
 
@@ -609,7 +609,7 @@ msgstr "Примітка"
 msgid "Warning"
 msgstr "Попередження"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "Помилка"
 
@@ -889,67 +889,67 @@ msgstr "Помилка у форматі цитування."
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [Редагований]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "Створити лист%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "Послати"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -957,26 +957,26 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -987,140 +987,140 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати?"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "не вдалось записати заголовки\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "Послати лист"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "Послати пізніше"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "Покласти в папку черги і послати пізніше"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "Чорновик"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "Зберегти в папці чорновиків"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "Вставити"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "Вставити файл"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "Приєднати"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "Приєднати файл"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "Підпис"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "Вставити підпис"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "Редагувати зовнішнім редактором"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "Згортання рядків"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "Згорнути всі довгі рядки"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1131,67 +1131,67 @@ msgstr ""
 "Примусово обірвати процес?\n"
 "group id процесу: %d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Обірвано процес з group id: %d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Тимчасовий файл: %s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "Створення: ввід від спостерігаючого процесу\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "Не вдалось запустити зовнішній редактор\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "Не вдалось записати в файл\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Не вдалось прочитати з каналу\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "Відмовитись від листа"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "Цей лист було змінено. Відмовитись від нього?"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "Відмовитись"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "В чорновики"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "Замінити"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b688af9e..323dbdb7 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: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2005-02-02 09:02+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -95,7 +95,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -148,13 +148,13 @@ msgstr "删除帐号"
 msgid "Do you really want to delete this account?"
 msgstr "您真的要删除该帐号吗？"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "是"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -259,7 +259,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
@@ -399,7 +399,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "地址簿"
 
@@ -593,7 +593,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "注意"
 
@@ -601,7 +601,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "错误"
 
@@ -881,67 +881,67 @@ msgstr "引文标记格式错误。"
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [已编辑]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "撰写邮件%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -949,26 +949,26 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -979,140 +979,140 @@ msgstr ""
 "从 %s 转换到 %s。\n"
 "仍然发送吗？"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "无法写邮件头\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "插入签名"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1123,67 +1123,67 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "已结束程序组标识号：%d"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "临时文件：%s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr "撰写：从监听进程中输入\n"
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "无法执行外部编辑器\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "无法写入文件\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "管道读取失败\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "丢弃邮件"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "丢弃"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "放入草稿箱"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "替换"
 
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 458a4c22..da50aa23 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-18 19:50+0900\n"
+"POT-Creation-Date: 2005-02-21 18:36+0900\n"
 "PO-Revision-Date: 2004-12-04 08:24+0800\n"
 "Last-Translator: Frank J. J. Weng <franklin@goodhorse.idv.tw>\n"
 "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
@@ -82,7 +82,7 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3548 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3601 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -135,13 +135,13 @@ msgstr "刪除帳號"
 msgid "Do you really want to delete this account?"
 msgstr "您確定要刪除這個帳號嗎？"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "是的"
 
-#: src/account.c:758 src/compose.c:2473 src/compose.c:4705
+#: src/account.c:758 src/compose.c:2526 src/compose.c:4758
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -246,7 +246,7 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將位址加入位址簿"
 
-#: src/addressadd.c:196 src/compose.c:4089 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4142 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "位址"
@@ -386,7 +386,7 @@ msgstr "/刪除(_D)"
 msgid "E-Mail address"
 msgstr "E-Mail位址"
 
-#: src/addressbook.c:493 src/compose.c:4090 src/prefs_common.c:2183
+#: src/addressbook.c:493 src/compose.c:4143 src/prefs_common.c:2183
 msgid "Address book"
 msgstr "位址簿"
 
@@ -584,7 +584,7 @@ msgstr "共用位址紀錄"
 msgid "Personal address"
 msgstr "私人位址紀錄"
 
-#: src/alertpanel.c:123 src/compose.c:4705 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4758 src/main.c:464
 msgid "Notice"
 msgstr "注意"
 
@@ -592,7 +592,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:149 src/compose.c:2473 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2526 src/inc.c:557
 msgid "Error"
 msgstr "錯誤"
 
@@ -872,67 +872,67 @@ msgstr "引言格式錯誤。"
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄信件格式錯誤。"
 
-#: src/compose.c:1641
+#: src/compose.c:1649
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在 \n"
 
-#: src/compose.c:1645
+#: src/compose.c:1653
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小 \n"
 
-#: src/compose.c:1649
+#: src/compose.c:1657
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:1653
+#: src/compose.c:1661
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:1688
+#: src/compose.c:1696
 #, c-format
 msgid "Message: %s"
 msgstr "信件：%s"
 
-#: src/compose.c:1759 src/mimeview.c:482
+#: src/compose.c:1767 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2106
+#: src/compose.c:2159
 msgid " [Edited]"
 msgstr " [已修改]"
 
-#: src/compose.c:2108
+#: src/compose.c:2161
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新郵件%s"
 
-#: src/compose.c:2111
+#: src/compose.c:2164
 #, c-format
 msgid "Compose message%s"
 msgstr "新郵件%s"
 
-#: src/compose.c:2222
+#: src/compose.c:2275
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2230 src/compose.c:4010 src/mainwindow.c:2133
+#: src/compose.c:2283 src/compose.c:4063 src/mainwindow.c:2133
 #: src/prefs_account.c:703 src/prefs_common.c:847
 msgid "Send"
 msgstr "送出"
 
-#: src/compose.c:2231
+#: src/compose.c:2284
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有標題。確定要送出？"
 
-#: src/compose.c:2282
+#: src/compose.c:2335
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:2302
+#: src/compose.c:2355
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -940,26 +940,26 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:2316 src/send_message.c:261
+#: src/compose.c:2369 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:2339
+#: src/compose.c:2392
 msgid "Can't save the message to outbox."
 msgstr "無法將信件送至寄件夾中。"
 
-#: src/compose.c:2375
+#: src/compose.c:2428
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到所指定的 key id '%s'"
 
-#: src/compose.c:2436 src/compose.c:2651 src/compose.c:2714 src/compose.c:2833
+#: src/compose.c:2489 src/compose.c:2704 src/compose.c:2767 src/compose.c:2886
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態 \n"
 
-#: src/compose.c:2469
+#: src/compose.c:2522
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -969,140 +969,140 @@ msgstr ""
 "無法轉換將信件的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要傳送嗎？"
 
-#: src/compose.c:2522
+#: src/compose.c:2575
 msgid "can't write headers\n"
 msgstr "無法寫入標頭\n"
 
-#: src/compose.c:2793
+#: src/compose.c:2846
 msgid "can't remove the old message\n"
 msgstr "無法刪除原有的舊信件。\n"
 
-#: src/compose.c:2811
+#: src/compose.c:2864
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:2893
+#: src/compose.c:2946
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾。\n"
 
-#: src/compose.c:2900
+#: src/compose.c:2953
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾。\n"
 
-#: src/compose.c:3446
+#: src/compose.c:3499
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生信件的編號：%s\n"
 
-#: src/compose.c:3543
+#: src/compose.c:3596
 msgid "Creating compose window...\n"
 msgstr "產生新郵件...\n"
 
-#: src/compose.c:3546 src/compose.c:4496
+#: src/compose.c:3599 src/compose.c:4549
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:3547 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/compose.c:3600 src/mimeview.c:148 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:3598 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3651 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "來自："
 
-#: src/compose.c:4011
+#: src/compose.c:4064
 msgid "Send message"
 msgstr "送出信件"
 
-#: src/compose.c:4019
+#: src/compose.c:4072
 msgid "Send later"
 msgstr "待會再送出"
 
-#: src/compose.c:4020
+#: src/compose.c:4073
 msgid "Put into queue folder and send later"
 msgstr "放到寄件夾中待會再送出"
 
-#: src/compose.c:4028
+#: src/compose.c:4081
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4029
+#: src/compose.c:4082
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/compose.c:4039 src/compose.c:5271
+#: src/compose.c:4092 src/compose.c:5324
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4040
+#: src/compose.c:4093
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/compose.c:4048
+#: src/compose.c:4101
 msgid "Attach"
 msgstr "附加"
 
-#: src/compose.c:4049
+#: src/compose.c:4102
 msgid "Attach file"
 msgstr "附加檔案"
 
 #. signature
-#: src/compose.c:4059 src/prefs_account.c:1338 src/prefs_common.c:1258
+#: src/compose.c:4112 src/prefs_account.c:1338 src/prefs_common.c:1258
 msgid "Signature"
 msgstr "簽名"
 
-#: src/compose.c:4060
+#: src/compose.c:4113
 msgid "Insert signature"
 msgstr "插入簽名"
 
-#: src/compose.c:4069 src/prefs_common.c:1280 src/prefs_common.c:2162
+#: src/compose.c:4122 src/prefs_common.c:1280 src/prefs_common.c:2162
 msgid "Editor"
 msgstr "編輯器"
 
-#: src/compose.c:4070
+#: src/compose.c:4123
 msgid "Edit with external editor"
 msgstr "使用其他的編輯器"
 
-#: src/compose.c:4078
+#: src/compose.c:4131
 msgid "Linewrap"
 msgstr "切割"
 
-#: src/compose.c:4079
+#: src/compose.c:4132
 msgid "Wrap all long lines"
 msgstr "切割所有過長的文字行"
 
-#: src/compose.c:4390
+#: src/compose.c:4443
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態"
 
-#: src/compose.c:4409
+#: src/compose.c:4462
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在, 或檔案是空的"
 
-#: src/compose.c:4478
+#: src/compose.c:4531
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:4498
+#: src/compose.c:4551
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:4521 src/prefs_folder_item.c:183
+#: src/compose.c:4574 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:4522
+#: src/compose.c:4575
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:4676
+#: src/compose.c:4729
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外用編輯器的命令是錯誤的：`%s'\n"
 
-#: src/compose.c:4702
+#: src/compose.c:4755
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1113,67 +1113,67 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:4715
+#: src/compose.c:4768
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "結束群組代碼為 %d 的行程"
 
-#: src/compose.c:4716
+#: src/compose.c:4769
 #, c-format
 msgid "Temporary file: %s"
 msgstr "暫存檔案：%s"
 
-#: src/compose.c:4740
+#: src/compose.c:4793
 msgid "Compose: input from monitoring process\n"
 msgstr ""
 
 #. failed
-#: src/compose.c:4773
+#: src/compose.c:4826
 msgid "Couldn't exec external editor\n"
 msgstr "無法執行外部編輯器。\n"
 
-#: src/compose.c:4777
+#: src/compose.c:4830
 msgid "Couldn't write to file\n"
 msgstr "無法寫入檔案。\n"
 
-#: src/compose.c:4779
+#: src/compose.c:4832
 msgid "Pipe read failed\n"
 msgstr "Pipe 讀取失敗。\n"
 
-#: src/compose.c:5081 src/compose.c:5089 src/compose.c:5095
+#: src/compose.c:5134 src/compose.c:5142 src/compose.c:5148
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:5186 src/compose.c:5201
+#: src/compose.c:5239 src/compose.c:5254
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:5233
+#: src/compose.c:5286
 msgid "Discard message"
 msgstr "放棄信件"
 
-#: src/compose.c:5234
+#: src/compose.c:5287
 msgid "This message has been modified. discard it?"
 msgstr "信件已被修改過。要放棄它嗎？"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "Discard"
 msgstr "放棄"
 
-#: src/compose.c:5235
+#: src/compose.c:5288
 msgid "to Draft"
 msgstr "放入草稿資料夾"
 
-#: src/compose.c:5268
+#: src/compose.c:5321
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用 '%s' 這個信件樣板嗎？"
 
-#: src/compose.c:5270
+#: src/compose.c:5323
 msgid "Apply template"
 msgstr "套用信件樣板"
 
-#: src/compose.c:5271
+#: src/compose.c:5324
 msgid "Replace"
 msgstr "置換"