exclude quote lines when notifying missing attachments.

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

30 files changed, 1802 insertions, 1801 deletions

diff --git a/po/be.po b/po/be.po
index d411acf8..b13ab8f4 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2007-07-31 21:33+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -679,7 +679,7 @@ msgstr ""
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -814,7 +814,7 @@ msgstr "Карыстальніцкі аргумент дзеяння"
 msgid "Add Address to Book"
 msgstr "Дадаць Адрас у Кнігу"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Адрас"
@@ -988,17 +988,17 @@ msgstr "Адрасная кніга"
 msgid "Name:"
 msgstr "Імя:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Да:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Скр.копія:"
@@ -1200,7 +1200,7 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабісты адрас"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Заўвага"
 
@@ -1563,7 +1563,7 @@ msgstr "Файл %s не існуе\n"
 msgid "Can't get file size of %s\n"
 msgstr "Нельга атрымаць памер файлу %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пусты."
@@ -1604,42 +1604,42 @@ msgstr "Пустая тэма"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тэма не азначана. Выслаць як ёсць?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Дадаткі"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Аўтаматычна ўстаўляць наступныя адрасы"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Ад:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Тэма:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Адпраўка"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1647,26 +1647,26 @@ msgstr ""
 "Не указаны уліковы рахунак для адпраўкі пошты.\n"
 "Калі ласка, выберыце акаунт перад адпраўкай."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Памылка падчас адпраўкі паведамлення да %s."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Нельга запісаць паведамленне ў `дасланыя'."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Не знойдзена аніводнага ключа, асацыяванага з выбраным ідэнтыфікатарам `%s'."
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "нельга змяніць рэжым файла\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1677,11 +1677,11 @@ msgstr ""
 "\n"
 "Выслаць у %s, як ёсць?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Памылка канверсіі коду"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1694,15 +1694,15 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Ліміт даўжыні радка"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Шыфраваць з `Bcc'"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1716,89 +1716,89 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "нельга выдаліць старое паведамленне\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "змяшчаю паведамленне ў чаргу...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "не знойдзены каталог чаргі\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "нельга змясціць паведамленне ў чаргу\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існуе\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Нельга адкрыць файл пазнак.\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "сгенераваны Message-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Ствараю вакно напісання...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Подпіс PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Шыфр PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "тып MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Памер"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Няправільны тып MIME."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існуе ці пусты."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Кадаванне"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Імя файла"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Няправільны радок загаду для знешняга рэдактара: `%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1807,48 +1807,48 @@ msgstr ""
 "Знешні рэдактар яшчэ працуе.\n"
 "Завершыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Наставіць _стужку прылад..."
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Нельга змясціць паведамленне ў чаргу."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Выбраць файлы"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Выбраць файл"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Запісаць паведамленне"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Гэта паведамленне было зменена. Запісаць у каталог чарнавікоў?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Закры_ць без запісу"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Жадаеце ужыць шаблон `%s'?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Ужыць шаблон"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Уставіць"
 
@@ -4711,8 +4711,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/bg.po b/po/bg.po
index 7b5da552..18c87061 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+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"
@@ -679,7 +679,7 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -816,7 +816,7 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Адрес"
@@ -994,17 +994,17 @@ msgstr "Адресна книга"
 msgid "Name:"
 msgstr "Име:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1216,7 +1216,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1620,7 +1620,7 @@ msgstr "Файлът %s не съществува\n"
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
@@ -1662,42 +1662,42 @@ msgstr "Тема"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Притурки"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Изпращане"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1705,25 +1705,25 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1734,12 +1734,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1748,15 +1748,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1765,91 +1765,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не може да се отвори файл %s\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1859,52 +1859,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -4832,8 +4832,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/cs.po b/po/cs.po
index 8025d161..6c11a349 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2008-01-19 00:11+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -686,7 +686,7 @@ msgstr ""
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -821,7 +821,7 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do adresáře"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresa"
@@ -995,17 +995,17 @@ msgstr "Adresář"
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Příjemce:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
@@ -1203,7 +1203,7 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1566,7 +1566,7 @@ msgstr "Soubor %s neexistuje\n"
 msgid "Can't get file size of %s\n"
 msgstr "Nelze zjistit velikost souboru %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
@@ -1607,42 +1607,42 @@ msgstr "Není uveden předmět"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto odeslat?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Přílohy"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automaticky nastavovat následující adresy"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Odeslat"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "nelze načíst seznam příjemců."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1650,26 +1650,26 @@ msgstr ""
 "Není zadán účet k odesílání e-mailů.\n"
 "Před odesláním prosím vyberte nějaký účet."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Při posílání zprávy na %s se vyskytla chyba."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nelze vyhledat žádný klíč asociovaný s aktuálně vybraným ID klíče \"%s\"."
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "nelze změnit práva souboru\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1680,11 +1680,11 @@ msgstr ""
 "\n"
 "Přesto odeslat jako %s?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Chyba při konverzi kódu"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1697,15 +1697,15 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Maximální délka řádku"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Šifrování s příjemci skryté kopie"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1719,89 +1719,89 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "nelze odstranit starou zprávu\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "zařazování zprávy...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "nelze vyhledat složku pozdržených zpráv\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "zprávu nelze zařadit\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Soubor %s neexistuje."
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nelze otevřít soubor %s."
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytváří se ID zprávy: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Vytváří se okno psaní zprávy...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Podepsat PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Šifrovat PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "Typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Chybný příkaz pro externí editor: \"%s\"\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1810,48 +1810,48 @@ msgstr ""
 "Externí editor stále pracuje.\n"
 "Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Vybrat soubory"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Uložit zprávu"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah zprávy se změnil. Uložit do složky konceptů?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "Na_hradit"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "V_ložit"
 
@@ -4718,8 +4718,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/da.po b/po/da.po
index 7d07ac16..d5381914 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -683,7 +683,7 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -820,7 +820,7 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresse"
@@ -998,17 +998,17 @@ msgstr "Adressebog"
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1214,7 +1214,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Note"
 
@@ -1618,7 +1618,7 @@ msgstr "Filen %s findes ikke\n"
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
@@ -1660,42 +1660,42 @@ msgstr "Emne"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Vedhæftet"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Emne:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Send"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1703,25 +1703,25 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1732,12 +1732,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1746,15 +1746,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1763,91 +1763,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan ikke åbne filen %s\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1857,52 +1857,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -4832,8 +4832,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/de.po b/po/de.po
index e9c11f1d..21b1528a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -684,7 +684,7 @@ msgstr ""
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -819,7 +819,7 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresse"
@@ -993,17 +993,17 @@ msgstr "Adressbuch"
 msgid "Name:"
 msgstr "Name:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1208,7 +1208,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1571,7 +1571,7 @@ msgstr "Datei %s existiert nicht\n"
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
@@ -1612,42 +1612,42 @@ msgstr "Leerer Betreff"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Anhänge"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Setze folgende Adressen automatisch"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Senden"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1655,25 +1655,25 @@ 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:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1684,11 +1684,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1701,15 +1701,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Mit Bcc verschlüsseln"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1723,89 +1723,89 @@ msgstr ""
 "\n"
 " Dennoch versenden? "
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Datei %s existiert nicht."
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, c-format
 msgid "Can't open file %s."
 msgstr "Kann Datei %s nicht öffnen."
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, 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:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1814,48 +1814,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Werkzeugleiste anpassen"
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -4723,8 +4723,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/el.po b/po/el.po
index 86d515ad..01923d9f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -696,7 +696,7 @@ msgstr ""
 "όλων'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -832,7 +832,7 @@ msgstr "Παράμετρος ενέργειας χρήστη"
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο ευρετήριο"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Διεύθυνση"
@@ -1007,17 +1007,17 @@ msgstr "Κατάλογος διευθύνσεων"
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
@@ -1235,7 +1235,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1601,7 +1601,7 @@ msgstr "Το αρχείο %s δεν υπάρχει\n"
 msgid "Can't get file size of %s\n"
 msgstr "Δεν είναι δυνατή η λήψη του μεγέθους του %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι κενό."
@@ -1642,42 +1642,42 @@ msgstr "Κενό θέμα"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Το θέμα είναι κενό. Να γίνει η αποστολή;"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Συνημμένα"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1685,28 +1685,28 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Δημιουργήθηκε σφάλμα κατά την αποστολή του μηνύματος στο %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Δεν είναι δυνατή η αποθήκεύσή του μηνύματος στα εξερχόμενα."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Δεν ήταν δυνατή η εύρεση του κλειδιού που σχετίζεται με το επιλεγμένο "
 "αναγνωριστικό `%s'."
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "Η αλλαγή της κατάστασης του `%s' απέτυχε"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1717,11 +1717,11 @@ msgstr ""
 "του μηνύματος στο προσδιορισμένο σύνολο %s.\n"
 "Να αποσταλεί ως %s;"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής κώδικα"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1734,15 +1734,15 @@ msgstr ""
 "\n"
 "Να γίνει αποστολή;"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Όριο μήκους γραμμής"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Κρυπτογράφηση στους κρυφούς παραλήπτες"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1756,92 +1756,92 @@ msgstr ""
 "\n"
 "Να γίνει η αποστολή;"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του παλιού μηνύματος\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "προσθήκη στην ουρά...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "Δεν είναι δυνατή η εύρεση του πηγαίου φακέλου."
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr ""
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Δημιουργία παραθύρου σύνθεσης...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Υπογραφή PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Κρυπτογράφηση PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, fuzzy, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 "Η εντολή εκτύπωσης είναι άκυρη:\n"
 "'%s'"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1851,49 +1851,49 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Επιλογή αρχείων"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Αποθήκευση μηνύματος"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Αυτό το μήνυμα έχει τροποποιηθεί. Θέλετε να το αποθηκεύσετε στα πρόχειρα;"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε να εφαρμόσετε το πρότυπο '%s' ;"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -4790,8 +4790,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/es.po b/po/es.po
index 221d86dc..eb3e2052 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2007-06-28 00:47+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -682,7 +682,7 @@ msgstr ""
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -817,7 +817,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:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Dirección"
@@ -991,17 +991,17 @@ msgstr "Agenda de direcciones"
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1205,7 +1205,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1568,7 +1568,7 @@ msgstr "El fichero %s no existe\n"
 msgid "Can't get file size of %s\n"
 msgstr "No se puede obtener el tamaño de %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
@@ -1609,42 +1609,42 @@ msgstr "Asunto vacío"
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Adjuntos"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Enviar"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1652,27 +1652,27 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta de correo antes de enviar."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "No se encontró ninguna clave asociada al ID de clave seleccionado "
 "actualmente «%s»."
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1683,11 +1683,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1700,15 +1700,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Cifrando con copia oculta"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1722,89 +1722,89 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "No se puede abrir el fichero de marcas.\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, 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:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1813,48 +1813,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Configurar barra de herramientas..."
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Este mensaje ha sido modificado. ¿Guardarlo en la carpeta Borradores?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -4726,8 +4726,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/et.po b/po/et.po
index 4d8f6ca0..5989a696 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+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"
@@ -687,7 +687,7 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -822,7 +822,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Aadress"
@@ -1000,17 +1000,17 @@ msgstr "Aadressiraamat"
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Pimekoopia:"
@@ -1221,7 +1221,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1626,7 +1626,7 @@ msgstr "Faili %s ei leidu\n"
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
@@ -1668,42 +1668,42 @@ msgstr "Pealkiri"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Manused"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Pealkiri:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Saada"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1711,26 +1711,26 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1740,12 +1740,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1754,15 +1754,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1771,92 +1771,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ei suuda avada faili %s\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1866,52 +1866,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -4834,8 +4834,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/fr.po b/po/fr.po
index eef28a0a..7178e29d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2007-04-19 16:12+0200\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -697,7 +697,7 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -832,7 +832,7 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresses"
@@ -1006,17 +1006,17 @@ msgstr "Carnet d'adresses"
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Copie discrète :"
@@ -1222,7 +1222,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Information"
 
@@ -1587,7 +1587,7 @@ msgstr "Le fichier %s n'existe pas\n"
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
@@ -1628,42 +1628,42 @@ msgstr "Sujet absent"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Pièces jointes"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Définition automatique des adresses suivantes"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Envoyer"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1671,25 +1671,25 @@ 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:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 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:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1700,11 +1700,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1717,15 +1717,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Chiffrement avec « Copie discrète »"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1739,89 +1739,89 @@ msgstr ""
 "\n"
 "Envoyer quand même?"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Impossible d'ouvrir le fichier des marques.\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, 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:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1830,50 +1830,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Ce message a été modifié. Voulez-vous l'enregistrer dans le dossier des "
 "brouillons ?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -4766,8 +4766,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/gl.po b/po/gl.po
index eb55b323..bc570e1e 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -685,7 +685,7 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -820,7 +820,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Enderezo"
@@ -998,17 +998,17 @@ msgstr "Axenda de enderezos"
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1220,7 +1220,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1625,7 +1625,7 @@ msgstr "o ficheiro %s non existe\n"
 msgid "Can't get file size of %s\n"
 msgstr "Non se pode obter o tamaño de %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
@@ -1667,42 +1667,42 @@ msgstr "Asunto"
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Adxuntos"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Enviar"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1710,25 +1710,25 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1739,12 +1739,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1753,15 +1753,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1770,91 +1770,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Non poido abrir %s\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, 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:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1864,52 +1864,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -4834,8 +4834,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/hr.po b/po/hr.po
index 43e7f5da..1b918a46 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+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"
@@ -692,7 +692,7 @@ msgstr ""
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresa"
@@ -1003,17 +1003,17 @@ msgstr "Adresar"
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1218,7 +1218,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1633,7 +1633,7 @@ msgstr "Datoteka %s ne postoji\n"
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
@@ -1675,42 +1675,42 @@ msgstr "Tema"
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Prilog"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1718,25 +1718,25 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1744,12 +1744,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1758,15 +1758,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1775,93 +1775,93 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, 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:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1871,53 +1871,53 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -4925,8 +4925,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/hu.po b/po/hu.po
index 03db65c2..b9a82773 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2007-09-19 15:18+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: HUNGARIAN <NONE>\n"
@@ -685,7 +685,7 @@ msgstr ""
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -821,7 +821,7 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címjegyzékhez"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Cím"
@@ -995,17 +995,17 @@ msgstr "Címjegyzék"
 msgid "Name:"
 msgstr "Név:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Titkos másolat:"
@@ -1205,7 +1205,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1568,7 +1568,7 @@ msgstr "%s fájl nem létezik\n"
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem határozható meg\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
@@ -1609,42 +1609,42 @@ msgstr "Nincs tárgy"
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Csatolások"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Az alábbi címek automatikus beállítása"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tárgy:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Küldés"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1652,26 +1652,26 @@ msgstr ""
 "Nincs megadva hozzáférés a levél küldéshez.\n"
 "Válasszon ki egy hozzáférést küldés előtt!"
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel a %s-nak/nek küldendő levél küldésekor."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "A levél nem menthető a kimenő mappába."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1682,11 +1682,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1699,15 +1699,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Titkos másolat(ok) titkosítása"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1722,89 +1722,89 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "a régi levelet nem lehet törölni\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "levél Várakozó sorba rakása...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "A levelet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "A(z) %s fájl nem létezik."
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, c-format
 msgid "Can't open file %s."
 msgstr "A(z) %s fájlt nem lehet megnyitni."
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Message-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1813,48 +1813,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "A levelet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "A levél megváltozott. Menti a Vázlatok mappába?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -4722,8 +4722,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/it.po b/po/it.po
index 145424de..f78ebc3a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -685,7 +685,7 @@ msgstr ""
 "tutti»."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -820,7 +820,7 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Indirizzo"
@@ -994,17 +994,17 @@ msgstr "Rubrica"
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1209,7 +1209,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1572,7 +1572,7 @@ msgstr "Il file %s non esiste\n"
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
@@ -1613,42 +1613,42 @@ msgstr "Oggetto vuoto"
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Allegati"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Invia"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1656,27 +1656,27 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Si è verificato un errore durante l'invio del messaggio a %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1688,11 +1688,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1706,15 +1706,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Cifratura con Bcc"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1728,89 +1728,89 @@ msgstr ""
 "\n"
 "Inviarlo comunque?"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Il file %s non esiste."
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossibile aprire il file %s."
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, 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:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1819,48 +1819,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Personalizza barra strumenti"
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -4734,8 +4734,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/ja.po b/po/ja.po
index e03c56e4..1e8df0ff 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+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"
@@ -682,7 +682,7 @@ msgstr ""
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -817,7 +817,7 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "アドレス"
@@ -991,17 +991,17 @@ msgstr "アドレス帳"
 msgid "Name:"
 msgstr "名前:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1203,7 +1203,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "注意"
 
@@ -1566,7 +1566,7 @@ msgstr "ファイル %s は存在しません\n"
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
@@ -1607,39 +1607,39 @@ msgstr "空の件名"
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 msgid "Attachment is missing"
 msgstr "添付ファイルがありません"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr "添付ファイルがありません。添付ファイルなしで送信しますか?"
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr "宛先の確認"
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 msgid "Really send this mail to the following addresses?"
 msgstr "このメールを以下のアドレスに送信してもよろしいですか?"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "件名:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 msgid "_Send"
 msgstr "送信(_S)"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1647,25 +1647,25 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1676,11 +1676,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1693,15 +1693,15 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Bcc を伴う暗号化"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1715,89 +1715,89 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "ファイル %s は存在しません。"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, c-format
 msgid "Can't open file %s."
 msgstr "ファイル %s を開けません。"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1806,48 +1806,48 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -4706,9 +4706,10 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
-msgstr "次の文字列(カンマ区切り)がメッセージ本文に含まれる場合は添付を確認する"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
+msgstr ""
+"次の文字列(カンマ区切り)がメッセージ本文に含まれる場合は添付忘れを確認する"
 
 #: src/prefs_common_dialog.c:976
 msgid "(Ex: attach)"
diff --git a/po/ko.po b/po/ko.po
index 112f9c50..095a2a44 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+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"
@@ -676,7 +676,7 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -811,7 +811,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "주소"
@@ -989,17 +989,17 @@ msgstr "주소록"
 msgid "Name:"
 msgstr "이름:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "숨은 참조:"
@@ -1204,7 +1204,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "알림"
 
@@ -1609,7 +1609,7 @@ msgstr "%s파일이 없습니다\n"
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
@@ -1651,42 +1651,42 @@ msgstr "제목"
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "첨부"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "제목:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "메일 발송"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1694,25 +1694,25 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1722,12 +1722,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1736,15 +1736,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1753,92 +1753,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "%s 파일을 열 수가 없습니다\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1848,52 +1848,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -4790,8 +4790,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/lt.po b/po/lt.po
index e28442d2..cf02d5d4 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -681,7 +681,7 @@ msgstr ""
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -816,7 +816,7 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresai"
@@ -990,17 +990,17 @@ msgstr "Adresų knyga"
 msgid "Name:"
 msgstr "Vardas:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slapta kopija:"
@@ -1200,7 +1200,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1563,7 +1563,7 @@ msgstr "Failas %s neegzistuoja\n"
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti failo „%s“ dydžio\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Failas %s yra tuščias"
@@ -1604,42 +1604,42 @@ msgstr "Nėra temos"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priedai"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatiškai nustatyti šiuos adresus"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Siųsti"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1647,25 +1647,25 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti laiško „outbox“."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nerandu rakto susieto su pasirinktu rakto ID „%s“."
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1676,11 +1676,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1693,15 +1693,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1710,89 +1710,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Negaliu atidaryti žymų failo.\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1801,48 +1801,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Derinti įrankių juostą..."
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -4703,8 +4703,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/nl.po b/po/nl.po
index 84f27bb9..42c08591 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -691,7 +691,7 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -826,7 +826,7 @@ msgstr "Gebruikersargumenten voor actie"
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adres"
@@ -1003,17 +1003,17 @@ msgstr "Adresboek"
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1222,7 +1222,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1589,7 +1589,7 @@ msgstr "Bestand %s bestaat niet\n"
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
@@ -1630,42 +1630,42 @@ msgstr "Geen onderwerp"
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Bijlagen"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Verzenden"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1673,25 +1673,25 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1702,11 +1702,11 @@ msgstr ""
 "\n"
 "Toch versturen als %s?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1719,15 +1719,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1736,89 +1736,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, 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:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1827,48 +1827,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -4772,8 +4772,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/pl.po b/po/pl.po
index 46e76c9e..561e7d7e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2005-03-05 18:57+0100\n"
 "Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -680,7 +680,7 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -816,7 +816,7 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adres"
@@ -994,17 +994,17 @@ msgstr "Książka adresowa"
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
@@ -1217,7 +1217,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1589,7 +1589,7 @@ msgstr "Plik %s nie istnieje\n"
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
@@ -1631,42 +1631,42 @@ msgstr "Temat"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Załączniki"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatyczne ustawianie następujących adresów"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Temat:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Wyślij"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1674,26 +1674,26 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1703,12 +1703,12 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to %s ?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1717,15 +1717,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1734,89 +1734,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Nie można otworzyć pliku zaznaczeń.\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1826,51 +1826,51 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -4754,8 +4754,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6c897178..36398b99 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2007-07-20 09:44-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -689,7 +689,7 @@ msgstr ""
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -824,7 +824,7 @@ msgstr "Argumento do usuário para a ação"
 msgid "Add Address to Book"
 msgstr "Adicionar ao Catálogo de Endereços"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Endereço"
@@ -998,17 +998,17 @@ msgstr "Catálogo de endereços"
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Cco:"
@@ -1213,7 +1213,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1576,7 +1576,7 @@ msgstr "O arquivo %s não existe\n"
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível especificar o tamanho de %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
@@ -1617,42 +1617,42 @@ msgstr "Sem assunto"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto em branco. Enviar assim mesmo?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Anexos"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Estabelecer os seguintes endereços automaticamente"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Enviar"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1660,25 +1660,25 @@ msgstr ""
 "Conta para envio de mensagem não foi especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 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:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1690,11 +1690,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Erro convertendo codificação"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1707,15 +1707,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Encriptando com Bcc"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1729,89 +1729,89 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "O arquivo %s não existe."
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, c-format
 msgid "Can't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, 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:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1820,48 +1820,48 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Customizar barra de ferramentas..."
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensagem foi modificada. Salvá-la na pasta de rascunhos?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -4732,8 +4732,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/ro.po b/po/ro.po
index 0b079e23..e3611d92 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2008-03-21 00:52+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: \n"
@@ -694,7 +694,7 @@ msgstr ""
 "pentru a activa recepționarea mesajelor la comanda 'Verifică tot'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -838,7 +838,7 @@ msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
 # (în meniu la compunere)
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Agendă"
@@ -1014,17 +1014,17 @@ msgstr "Agendă"
 msgid "Name:"
 msgstr " Nume:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Către:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1228,7 +1228,7 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1596,7 +1596,7 @@ msgstr "Fișierul %s nu există\n"
 msgid "Can't get file size of %s\n"
 msgstr "Nu se poate obține dimensiunea fișierului %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Fișierul %s este gol."
@@ -1637,44 +1637,44 @@ msgstr "Subiect gol"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Subiectul este gol. Trimiteți mesajul oricum ?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Atașamente"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Completare automată a următoarelor câmpuri de adrese"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Subiect:"
 
 # obs: comun și pentru butonul de pe toolbar și pentru tabul din common preferences și edit accounts
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Trimite"
 
 # hm ?
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1682,26 +1682,26 @@ msgstr ""
 "Contul pentru trimitere de mesaje nu este specificat.\n"
 "Vă rugăm să selectați un cont înainte de a trimite."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A apărut o eroare în timpul trimiterii mesajului către %s ."
 
 # !!! depinde de traducerea lui Outbox !!!
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Nu se poate salva mesajul în 'Trimise'."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nu s-a putut găsi nicio cheie asociată cu ID-ul cheii selectate '%s'."
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fișierului\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1713,11 +1713,11 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ca %s ?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1730,15 +1730,15 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Criptare cu Bcc"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1752,89 +1752,89 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "nu se poate șterge mesajul vechi\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de așteptare...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi folderul de coadă\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de așteptare\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Fișierul %s nu există."
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nu se poate deschide fișierul %s."
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Creare fereastră de compunere...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Tipul MIME nu este valid."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru editor extern nu este validă: '%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1843,49 +1843,49 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Selectați fișierele"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Selectați fișierul"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Salvare mesaj"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Îl salvați în folderul Ciorne ?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vreți să aplicați șablonul '%s' ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -4792,8 +4792,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/ru.po b/po/ru.po
index 99c3083d..77e242b2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2007-07-22 12:53+0400\n"
 "Last-Translator: Andrey Markelov <andrey@markelov.net>\n"
 "Language-Team: Russian <Project-Id-Version: gtranslato>\n"
@@ -686,7 +686,7 @@ msgstr ""
 "по команде \"Получить все\"."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -821,7 +821,7 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Адрес"
@@ -995,17 +995,17 @@ msgstr "Адресная книга"
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Скрытно:"
@@ -1208,7 +1208,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1571,7 +1571,7 @@ msgstr "Файл %s не найден\n"
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
@@ -1612,42 +1612,42 @@ msgstr "Тема не указана"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Вложения"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Автоматически устанавливать адреса"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Отправить"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1655,25 +1655,25 @@ msgstr ""
 "Учётная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите её перед отправкой."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору \"%s\"."
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1684,11 +1684,11 @@ msgstr ""
 "\n"
 "Отправить его в кодировке %s?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Ошибка преобразования кодировки"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1701,15 +1701,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Зашифровать с Bcc"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1722,89 +1722,89 @@ msgstr ""
 "\n"
 "Отправлять?"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не удалось открыть файл пометок.\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1814,48 +1814,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Настроить панель инструментов"
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -4723,8 +4723,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/sk.po b/po/sk.po
index 47cc02ad..ac11a8c8 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+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"
@@ -681,7 +681,7 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -818,7 +818,7 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresár"
@@ -996,17 +996,17 @@ msgstr "Otvoriť adresár"
 msgid "Name:"
 msgstr "Meno:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slepá kópia:"
@@ -1218,7 +1218,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1622,7 +1622,7 @@ msgstr "Súbor %s neexistuje\n"
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
@@ -1664,42 +1664,42 @@ msgstr "Predmet"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Prílohy"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Odoslať"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1707,25 +1707,25 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1736,12 +1736,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1750,15 +1750,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1767,91 +1767,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Nemôžem otvoriť súbor %s\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1861,52 +1861,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -4832,8 +4832,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/sl.po b/po/sl.po
index e2a12c76..36a05e50 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+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"
@@ -689,7 +689,7 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Naslov"
@@ -1002,17 +1002,17 @@ msgstr "Imenik naslovov"
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Skp:"
@@ -1223,7 +1223,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1628,7 +1628,7 @@ msgstr "Datoteka %s ne obstaja\n"
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
@@ -1670,42 +1670,42 @@ msgstr "Zadeva"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priloge"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Pošlji"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1713,25 +1713,25 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1741,12 +1741,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1755,15 +1755,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1772,92 +1772,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne morem odpreti datoteke %s\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1867,52 +1867,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "To sporočilo je bilo spremenjeno. Naj ga zavržem?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -4830,8 +4830,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/sr.po b/po/sr.po
index 00bb83ed..8293be7b 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -689,7 +689,7 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresa"
@@ -1002,17 +1002,17 @@ msgstr "Adresar"
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1217,7 +1217,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1622,7 +1622,7 @@ msgstr "Datoteka %s ne postoji\n"
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
@@ -1664,42 +1664,42 @@ msgstr "Tema"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Dodatak"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1707,26 +1707,26 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1736,12 +1736,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1750,15 +1750,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1767,92 +1767,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1862,52 +1862,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -4826,8 +4826,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/sv.po b/po/sv.po
index b1120522..554b4d01 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -686,7 +686,7 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -821,7 +821,7 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adress"
@@ -999,17 +999,17 @@ msgstr "Adressbok"
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Dold kopia:"
@@ -1214,7 +1214,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Notera"
 
@@ -1586,7 +1586,7 @@ msgstr "Filen %s finns inte\n"
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
@@ -1627,42 +1627,42 @@ msgstr "Tomt ämne"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Bilagor"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Skicka"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1670,26 +1670,26 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1700,11 +1700,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1717,15 +1717,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1734,89 +1734,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1826,48 +1826,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -4749,8 +4749,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/tr.po b/po/tr.po
index 25d9f524..26bba532 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+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"
@@ -684,7 +684,7 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -821,7 +821,7 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adres"
@@ -999,17 +999,17 @@ msgstr "Adres defteri"
 msgid "Name:"
 msgstr "İsim:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1219,7 +1219,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Not"
 
@@ -1615,7 +1615,7 @@ msgstr "%s dosyası bulunamadı\n"
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
@@ -1657,42 +1657,42 @@ msgstr "Konu"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Ekler"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Konu:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Gönder"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1700,25 +1700,25 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, 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:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1729,12 +1729,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1743,15 +1743,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1760,91 +1760,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "işaretli dosya açılamadı.\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, 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:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1854,52 +1854,52 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -4804,8 +4804,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/uk.po b/po/uk.po
index 7f3ab364..7a22e59f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2008-01-18 19:07+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -689,7 +689,7 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -824,7 +824,7 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Адреса"
@@ -998,17 +998,17 @@ msgstr "Адресна книга"
 msgid "Name:"
 msgstr "Ім'я:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Приховано:"
@@ -1205,7 +1205,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1568,7 +1568,7 @@ msgstr "Файл %s не існує\n"
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
@@ -1609,42 +1609,42 @@ msgstr "Порожня тема"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Вкладення"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Автоматично встановлювати наступні адреси"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Послати"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1652,25 +1652,25 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1681,11 +1681,11 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати як %s?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1698,15 +1698,15 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr "Шифрувати з прихованими адресатами"
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1720,89 +1720,89 @@ msgstr ""
 "\n"
 "Все ж послати?"
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існує."
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, c-format
 msgid "Can't open file %s."
 msgstr "Не вдалось відкрити файл %s."
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1811,48 +1811,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Налаштувати панель інструментів..."
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -4716,8 +4716,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/vi.po b/po/vi.po
index 9bc407fa..13081cae 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -668,7 +668,7 @@ msgstr ""
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -803,7 +803,7 @@ msgstr "Đối số người dùng của hành động"
 msgid "Add Address to Book"
 msgstr "Thêm địa chỉ vào sổ"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Địa chỉ"
@@ -980,17 +980,17 @@ msgstr "Sổ địa chỉ"
 msgid "Name:"
 msgstr "Tên:"
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Người nhận:"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1197,7 +1197,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1564,7 +1564,7 @@ msgstr "Tập tin %s không tồn tại\n"
 msgid "Can't get file size of %s\n"
 msgstr "Không thể xác định kích tước tập tin của %s\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
@@ -1605,42 +1605,42 @@ msgstr "Tiêu đề bị bỏ trống"
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Đính kèm"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Tự động đặt địa chỉ sau"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tiêu đề:"
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "Gửi"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1648,25 +1648,25 @@ msgstr ""
 "Chưa xác định tài khoản để gửi thư.\n"
 "Hãy chọn một tài khoản trước khi gửi."
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Xảy ra lỗi khi gửi thư đến %s ."
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "Không thể lưu thư vào hộp gửi (outbox)."
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Không tìm thấy khoá liên quan đến khoá đang chọn với id `%s'."
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1677,11 +1677,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1694,15 +1694,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1711,89 +1711,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "Tập tin không tồn tại hoặc rỗng."
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Dòng lệnh cho trình soạn thảo ngoài không hợp lệ: `%s'\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1802,48 +1802,48 @@ msgstr ""
 "Trình soạn thảo ngoài vẫn đang hoạt động.\n"
 "Bắt buộc dừng tiến trình (pid: %d)?\n"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Nội dung đã được thay đổi. Lưu vào thư mục nháp?"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Bạn có muốn dùng mẫu `%s' ?"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -4731,8 +4731,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0c650b22..8d8e12c3 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: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -678,7 +678,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -815,7 +815,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "地址"
@@ -993,17 +993,17 @@ msgstr "地址簿"
 msgid "Name:"
 msgstr "姓名："
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件抄送："
@@ -1205,7 +1205,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "注意"
 
@@ -1580,7 +1580,7 @@ msgstr "文件 %s 不存在\n"
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
@@ -1622,42 +1622,42 @@ msgstr "主题"
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "附件"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "自动设置以下地址"
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "标题："
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "发送"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1665,25 +1665,25 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1693,12 +1693,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1707,15 +1707,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1724,91 +1724,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "无法打开文件 %s\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1818,51 +1818,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -4746,8 +4746,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 72a66be4..fb8a0f67 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 17:45+0900\n"
+"POT-Creation-Date: 2008-04-24 13:44+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -683,7 +683,7 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5040 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -818,7 +818,7 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將地址加入通訊錄"
 
-#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3154 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "地址"
@@ -996,17 +996,17 @@ msgstr "通訊錄"
 msgid "Name:"
 msgstr "姓名："
 
-#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3099 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3116 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3133 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件副本"
@@ -1210,7 +1210,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6316 src/main.c:742
 msgid "Notice"
 msgstr "注意"
 
@@ -1582,7 +1582,7 @@ msgstr "檔案 %s 不存在\n"
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:2135 src/compose.c:4118
+#: src/compose.c:2135 src/compose.c:4134
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
@@ -1623,42 +1623,42 @@ msgstr "主旨空白"
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:2897
+#: src/compose.c:2913
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "附加檔"
 
-#: src/compose.c:2898
+#: src/compose.c:2914
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2969 src/compose.c:2995
+#: src/compose.c:2985 src/compose.c:3011
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3015
+#: src/compose.c:3031
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
+#: src/compose.c:3044 src/compose.c:4906 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3066 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "主旨："
 
-#: src/compose.c:3143
+#: src/compose.c:3159
 #, fuzzy
 msgid "_Send"
 msgstr "送出"
 
-#: src/compose.c:3228
+#: src/compose.c:3244
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:3248
+#: src/compose.c:3264
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1666,25 +1666,25 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:3262 src/send_message.c:315
+#: src/compose.c:3278 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:3312
+#: src/compose.c:3328
 msgid "Can't save the message to outbox."
 msgstr "無法將郵件送至寄件夾中。"
 
-#: src/compose.c:3350
+#: src/compose.c:3366
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
+#: src/compose.c:3494 src/compose.c:3833 src/compose.c:3896 src/compose.c:4016
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: src/compose.c:3511
+#: src/compose.c:3527
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1694,11 +1694,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:3517
+#: src/compose.c:3533
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3603
+#: src/compose.c:3619
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1711,15 +1711,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3607
+#: src/compose.c:3623
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:3769
+#: src/compose.c:3785
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3770
+#: src/compose.c:3786
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1728,89 +1728,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3960
+#: src/compose.c:3976
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:3978
+#: src/compose.c:3994
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:4066
+#: src/compose.c:4082
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:4073
+#: src/compose.c:4089
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:4113
+#: src/compose.c:4129
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:4122
+#: src/compose.c:4138
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "無法開啟標記的檔案。\n"
 
-#: src/compose.c:4722
+#: src/compose.c:4738
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:4837
+#: src/compose.c:4853
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:4964
+#: src/compose.c:4980
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:4967
+#: src/compose.c:4983
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:5005 src/compose.c:6119
+#: src/compose.c:5021 src/compose.c:6135
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5030 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6014
+#: src/compose.c:6030
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:6032
+#: src/compose.c:6048
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:6101
+#: src/compose.c:6117
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:6121 src/prefs_common_dialog.c:1551
+#: src/compose.c:6137 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:6144 src/prefs_folder_item.c:202
+#: src/compose.c:6160 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:6145
+#: src/compose.c:6161
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:6235
+#: src/compose.c:6251
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:6297
+#: src/compose.c:6313
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1820,48 +1820,48 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:6634 src/mainwindow.c:2977
+#: src/compose.c:6650 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
+#: src/compose.c:6770 src/compose.c:6775 src/compose.c:6781
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:6856
+#: src/compose.c:6872
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:6879
+#: src/compose.c:6895
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6914
+#: src/compose.c:6930
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6915
+#: src/compose.c:6931
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6917
+#: src/compose.c:6933
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:6959
+#: src/compose.c:6975
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:6961
+#: src/compose.c:6977
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6962
+#: src/compose.c:6978
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -4723,8 +4723,8 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:965
 msgid ""
-"Confirm attachments when the following strings (comma-separated) are found "
-"in the message body"
+"Notify for missing attachments when the following strings (comma-separated) "
+"are found in the message body"
 msgstr ""
 
 #: src/prefs_common_dialog.c:976