fixed a memory leak, and made 2.4.4 release.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1874 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2007-07-20 06:52:59 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2007-07-20 06:52:59 +0000
commit: 08b6c427a1c7f206927d66a49bb5860287c9b672 (patch)
tree: 35894cf9f5ad33becbb5719e5f26240a73fbf416 /po
parent: 9fff27c6dd65ad4995fa08bce2ff8daf268e5d62 (diff)
30 files changed, 3216 insertions, 3040 deletions
diff --git a/po/be.po b/po/be.po
index 2226e40e..6572335d 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+0900\n"
 "PO-Revision-Date: 2007-02-27 22:43+0200\n"
 "Last-Translator: Mikalai Udodau <crom dash a at tut dot by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -681,7 +681,7 @@ msgstr ""
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1046,7 +1046,7 @@ msgstr ""
 "Ці сапраўды жадаеце выдаліць каталог І ўсе адрасы ў `%s' ?\n"
 "Пры выдаленні толькі каталога, адрасы будуць перанесены ў каталог-продак."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Выдаліць каталог"
 
@@ -1207,7 +1207,7 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабісты адрас"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Нататак"
 
@@ -1545,79 +1545,79 @@ msgstr "/_Прылады/_Праверыць правапіс"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Прылады/_Наставіць мову правапісу"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існуе\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Нельга атрымаць частку тэксту\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Памылка фармату пазнакі цытаты."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Памылка фармату адказу/перасылкі паведамлення."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існуе\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Нельга атрымаць памер файлу %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пусты."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Нельга прачытаць %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Паведамленне: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку састаўнога паведамлення."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Напісанне%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Не указаны атрымальнік."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Пустая тэма"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тэма не азначана. Выслаць як ёсць?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1625,26 +1625,26 @@ msgstr ""
 "Не указаны уліковы рахунак для адпраўкі пошты.\n"
 "Калі ласка, выберыце акаунт перад адпраўкай."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Памылка падчас адпраўкі паведамлення да %s."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Нельга захаваць паведамленне ў `дасланых'."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Не знойдзена аніводнага ключа, асацыяванага з выбраным ідэнтыфікатарам `%s'."
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "нельга змяніць рэжым файла\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1655,11 +1655,11 @@ msgstr ""
 "\n"
 "Выслаць у %s, як ёсць?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Памылка канверсіі кода"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1672,15 +1672,15 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Ліміт даўжыні радка"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Шыфраваць з `Bcc'"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1694,83 +1694,83 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "нельга выдаліць старое паведамленне\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "змяшчаю паведамленне ў чаргу...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "не знойдзены каталог чаргі\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "нельга змясціць паведамленне ў чаргу\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "сгенераваны Message-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Ствараю вакно напісання...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Ад:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Подпіс PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Шыфр PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "тып MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Памер"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Няправільны тып MIME."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існуе ці пусты."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кадаванне"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Імя файла"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Няправільны радок загаду для знешняга рэдактара: `%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1779,48 +1779,48 @@ msgstr ""
 "Знешні рэдактар яшчэ працуе.\n"
 "Завершыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "Наставіць _стужку прылад..."
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Нельга змясціць паведамленне ў чаргу."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Выбраць файлы"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Выбраць файл"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Захаваць паведамленне"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Гэта паведамленне было зменена. Захаваць у каталогу чарнавікоў?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Закрыць без захавання"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Жадаеце ужыць шаблон `%s'?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Ужыць шаблон"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Уставіць"
 
@@ -2357,12 +2357,12 @@ msgstr "Пераіменаваць каталог"
 msgid "Can't rename the folder '%s'."
 msgstr "Нельга пераіменаваць каталог '%s'."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Нельга перанесці каталог `%s'."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2371,11 +2371,11 @@ msgstr ""
 "Выдаліць каталог пошуку `%s' ?\n"
 "Самі паведамленні не будуць выдалены."
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Выдаліць каталог пошуку"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2388,20 +2388,20 @@ msgstr ""
 "\n"
 "Сапраўды жадаеце выдаліць?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Нельга выдаліць каталог '%s'."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Ачысціць сметніцу"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Выдаліць усе лісты ў каталогу-сметніцы?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2410,34 +2410,34 @@ msgstr ""
 "Сапраўды выдаліць паштовую скрыню `%s' ?\n"
 "(Паведамленні НЕ будуць выдалены з дыска)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Выдаліць скрыню"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Сапраўды выдаліць IMAP4-акаунт `%s'?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Выдаліць IMAP4-акаунт"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Сапраўды выдаліць групу навін `%s'?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Выдаліць групу навін"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Сапраўды выдаліць акаунт навін `%s'?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Выдаліць акаунт навін"
 
@@ -2730,7 +2730,7 @@ msgstr "Злучаюся з POP3 серверам: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Нельга злучыцца з серверам POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Аўтэнтыфікацыя..."
 
@@ -2760,7 +2760,7 @@ msgstr "Атрымліваю памер паведамленняў (LIST)..."
 msgid "Deleting message %d"
 msgstr "Выдаляю паведамленне %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Выходжу"
 
@@ -2810,7 +2810,7 @@ msgid "Socket error."
 msgstr "Памылка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Злучэнне закрытае аддаленым серверам."
 
@@ -2827,11 +2827,11 @@ msgstr ""
 "Паштовая скрыня замкнута:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Аўтэнтыфікацыя схібіла."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2840,7 +2840,7 @@ msgstr ""
 "Аўтэнтыфікацыя схібіла:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Таймаут сесіі."
 
@@ -6240,84 +6240,90 @@ msgstr ""
 "не будзеце ведаць напэўна, што яно пойдзе да персоны, якую вы\n"
 "мелі на ўвазе. Вы давяраеце дастаткова, каб ужываць яго?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Загаловак ліста ў чарзе пашкоджаны.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Адпраўляю паведамленне, ўжываючы загад: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Не можна выканаць загаду: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Памылка падчас выканання загаду: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Злучэнне"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Злучаюся з SMTP серверам: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Памылка здарылася падчас адпраўкі загаду\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Адпраўляю HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Аўтэнтыфікацыя"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Адпраўляю паведамленне..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Адпраўляю EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Адпраўляю MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Адпраўка"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Адпраўляю RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Адпраўляю DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Выходжу..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Адпраўляю паведамленне (%d / %d байт)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Адпраўляю паведамленне"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Памылка падчас высылання паведамлення."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/bg.po b/po/bg.po
index 15a89ab6..4bf8edb2 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1050,7 +1050,7 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
@@ -1214,7 +1214,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1591,80 +1591,80 @@ msgstr "/_Инструменти/_Изпълнение"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1672,25 +1672,25 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1701,12 +1701,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1715,15 +1715,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1732,85 +1732,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1820,52 +1820,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2409,12 +2409,12 @@ msgstr "Преименуване на папка"
 msgid "Can't rename the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2423,12 +2423,12 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Изтриване на папка"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2439,21 +2439,21 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2462,34 +2462,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -2784,7 +2784,7 @@ msgstr "Свързване с POP3 сървър: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
 
@@ -2814,7 +2814,7 @@ msgstr "Взимане на размерът на съобщенията (LIST).
 msgid "Deleting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Прекъсване"
 
@@ -2864,7 +2864,7 @@ msgid "Socket error."
 msgstr "Грешка в сокет."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Връзката е прекратена от отдалечения хост."
 
@@ -2881,11 +2881,11 @@ msgstr ""
 "Пощенската кутия е заключена:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Удостоверяването се провали."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2894,7 +2894,7 @@ msgstr ""
 "Удостоверяването се провали:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 #, fuzzy
 msgid "Session timed out."
 msgstr "сесията е просрочена\n"
@@ -6415,84 +6415,90 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Повредена заглавна част на съобщение в опашката.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Изпълняване"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Появи се грешка изпращане на съобщението."
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Свързване"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Свързване с SMTP сървър: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Появи се грешка изпращане на съобщението."
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Изпращане на HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Удостоверяване"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Изпращане на съобшение..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Изпращане на EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Изпращане на MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Изпращане"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Изпращане на RCPT ДО..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Изпращане на DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Прекъсване..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Изпращане на съобшение"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Появи се грешка изпращане на съобщението."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/cs.po b/po/cs.po
index c86b73e2..4f6ee98f 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+0900\n"
 "PO-Revision-Date: 2007-05-30 20:12+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1049,7 +1049,7 @@ msgstr ""
 "Chcete smazat složku A všechny adresy v \"%s\"?\n"
 "Pokud smažete pouze složku, adresy budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Smazat složku"
 
@@ -1201,7 +1201,7 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1537,79 +1537,79 @@ msgstr "/_Nástroje/Kontrolovat pravopi_s"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/_Nastavit jazyk pro kontrolu pravopisu"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Nelze získat textovou část\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Chyba ve formátu uvozovek."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/předání."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nelze zjistit délku souboru %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Nelze načíst %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Nelze získat část ze zprávy s více částmi."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Není uveden předmět"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto odeslat?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "nelze načíst seznam příjemců."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1617,26 +1617,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:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "nelze změnit práva souboru\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1647,11 +1647,11 @@ msgstr ""
 "\n"
 "Přesto odeslat jako %s?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Chyba při konverzi kódu"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1664,15 +1664,15 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Maximální délka řádku"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Šifrování s příjemci skryté kopie"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1686,83 +1686,83 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "nelze smazat staré zprávy\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "zařazování zprávy...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "nelze vyhledat složku pozdržených zpráv\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "zprávu nelze zařadit\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytváří se ID zprávy: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Vytváří se okno psaní zprávy...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Podepsat PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Šifrovat PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "Typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Chybný příkaz pro externí editor: \"%s\"\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1771,48 +1771,48 @@ msgstr ""
 "Externí editor stále pracuje.\n"
 "Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Vybrat soubory"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Uložit zprávu"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 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:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "Nahradit"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "Vložit"
 
@@ -2346,12 +2346,12 @@ msgstr "Přejmenovat složku"
 msgid "Can't rename the folder '%s'."
 msgstr "Nelze přejmenovat složku \"%s\"."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nelze přesunout složku \"%s\"."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2360,11 +2360,11 @@ msgstr ""
 "Opravdu odebrat složku hledání \"%s\"?\n"
 "Skutečné zprávy nebudou smazány."
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Smazat složku hledání"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2377,20 +2377,20 @@ msgstr ""
 "\n"
 "Chcete je opravdu vymazat?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nelze odstranit složku \"%s\"."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Smazat všechny zprávy v koši?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2399,34 +2399,34 @@ msgstr ""
 "Opravdu odebrat poštovní schránku \"%s\"?\n"
 "(Zprávy NEBUDOU smazány z disku.)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat účet IMAP4 \"%s\"?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Smazat účet IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusní skupinu \"%s\"?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet diskusních skupin \"%s\"?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Smazat účet diskusních skupin"
 
@@ -2711,7 +2711,7 @@ msgstr "Připojování k serveru POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nelze se spojit se serverem POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Autentizace..."
 
@@ -2741,7 +2741,7 @@ msgstr "Zjišťuje se počet zpráv (LIST)..."
 msgid "Deleting message %d"
 msgstr "Vymazávání zprávy %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Ukončování"
 
@@ -2793,7 +2793,7 @@ msgid "Socket error."
 msgstr "Chyba zásuvky."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Spojení ukončeno vzdáleným hostitelem."
 
@@ -2810,11 +2810,11 @@ msgstr ""
 "Poštovní schránka je zamčena:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Autentizace selhala."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2823,7 +2823,7 @@ msgstr ""
 "Autentizace selhala:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Vypršel čas relace."
 
@@ -6221,84 +6221,90 @@ msgstr ""
 "příjemce bude tou osobou, která zprávu skutečně dostane.\n"
 "Důvěřujete klíči natolik, aby mohl být i přesto použit?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Hlavička pozdržené zprávy je poškozená.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Posílá se zpráva příkazem: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Nelze vykonat příkaz: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Během vykonávání příkazu se vyskytla chyba: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Připojování"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Připojování k serveru SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Vyskytla se chyba během posílání příkazu\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Posílá se HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Autentizace"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Posílá se zpráva..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Posílá se EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Posílá se MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Odesílání"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Posílá se RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Posílá se DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Ukončování..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Posílá se zpráva (bajtů %d / %d)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Posílá se zpráva"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Při posílání zprávy nastala chyba."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/da.po b/po/da.po
index 6c2572c5..f6fd1c7d 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1053,7 +1053,7 @@ msgstr ""
 "Vil du virkeligt slette mappen OG alla adresser i `%s' ? \n"
 "Hvis kun mappen slettes, vil adresserne blive flyttet til hoved mappen."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Slet mappe"
 
@@ -1212,7 +1212,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Note"
 
@@ -1589,80 +1589,80 @@ msgstr "/_Funktioner/_Udfør"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1670,25 +1670,25 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1699,12 +1699,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1713,15 +1713,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1730,85 +1730,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1818,52 +1818,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2408,12 +2408,12 @@ msgstr "Omdøb mappe"
 msgid "Can't rename the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2422,12 +2422,12 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2438,21 +2438,21 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2461,34 +2461,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -2783,7 +2783,7 @@ msgstr "Forbinder til POP3 server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Godkender..."
 
@@ -2813,7 +2813,7 @@ msgstr "Modtager antal nye meddelelser (LIST)..."
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Afslutter"
 
@@ -2867,7 +2867,7 @@ msgid "Socket error."
 msgstr "Sokkel fejl."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2885,11 +2885,11 @@ msgstr ""
 "Mailbox er låst:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2898,7 +2898,7 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udløbet\n"
@@ -6413,87 +6413,93 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Hoved ugyldigt på meddelelse i kø.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Kan ikke udføre ekstern kommando: %s\n"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fejl ved afsendelse af e-post."
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Forbinder"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Forbindelse med SMTP server: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Fejl ved afsendelse af e-post."
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Sender HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Sende meddelelse..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Sender EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Sender MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Sender"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Sender RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Sender DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Afslutter..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Sende Meddelelse"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 #, fuzzy
 msgid "Error occurred while sending the message."
 msgstr ""
 "Fejl ved afsendelse meddelelse:\n"
 "%s"
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/de.po b/po/de.po
index fdb1d46d..379add39 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+0900\n"
 "PO-Revision-Date: 2007-05-01 12:28+0200\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: de <sylpheed@sraoss.jp>\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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1048,7 +1048,7 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
@@ -1206,7 +1206,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1542,79 +1542,79 @@ msgstr "/_Werkzeuge/_Rechtschreibprüfung"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Werkzeug/_Sprache einstellen"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Verfassen%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Leerer Betreff"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1622,25 +1622,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:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1651,11 +1651,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1668,15 +1668,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Mit Bcc verschlüsseln"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1690,83 +1690,83 @@ msgstr ""
 "\n"
 " Dennoch versenden? "
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, 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:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1775,48 +1775,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Werkzeugleiste anpassen"
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -2350,12 +2350,12 @@ msgstr "Ablage umbenennen"
 msgid "Can't rename the folder '%s'."
 msgstr "Kann Ablage '%s' nicht umbenennen."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2364,11 +2364,11 @@ msgstr ""
 "Suchablage '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Suchablage löschen"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2381,20 +2381,20 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2403,34 +2403,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich löschen?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -2716,7 +2716,7 @@ msgstr "Verbinde mit POP3-Server: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
@@ -2746,7 +2746,7 @@ msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Beenden"
 
@@ -2798,7 +2798,7 @@ msgid "Socket error."
 msgstr "Socket-Fehler."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
@@ -2815,11 +2815,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2828,7 +2828,7 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
@@ -6240,84 +6240,90 @@ msgstr ""
 "sicher sein, dass sie an die von Ihnen vorgesehene Person geht.\n"
 "Vertrauen Sie ihm genug, um ihn trotzdem zu verwenden?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Kopfzeilen wartender Nachricht ist defekt.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Sende Nachricht mit dem Befehl %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Kann den Befehl %s nicht ausführen"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fehler aufgetreten beim Senden des Befehls %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Verbinde"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Verbindung mit SMTP-Server: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Fehler aufgetreten beim Senden eines Befehls\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Sende HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Beglaubigen"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Sende Nachricht..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Sende EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Sende MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Sende"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Sende RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Sende DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Beende..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sende Nachricht (%d / %d bytes)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Sende Nachricht"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Fehler aufgetreten beim Senden der Nachricht."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/el.po b/po/el.po
index 0b58fd68..ad9cabb3 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1061,7 +1061,7 @@ msgstr ""
 "Θέλετε να διαγράψετε το '%s' ; Αν διαγράψετε μόνο το φάκελο, οι διευθύνσεις "
 "που περιέχει θα μετακινηθούν στον γονικό φάκελο."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Διαγραφή φακέλου"
 
@@ -1233,7 +1233,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1572,79 +1572,79 @@ msgstr "/_Εργαλεία/Ορθογραφικός έλε_γχος"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Εργαλεία/Ορισμός _γλώσσας ορθογραφίας"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Δεν είναι δυνατή η λήψη του κειμένου\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Σφάλμα μορφοποίησης σημείωσης παράθεσης."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Σφάλμα στην απάντηση/προώθηση του μηνύματος."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν είναι δυνατή η λήψη του μεγέθους του %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι κενό."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Δεν είναι δυνατή η ανάγνωση του %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Δεν έχει οριστεί παραλήπτης."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Κενό θέμα"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Το θέμα είναι κενό. Να γίνει η αποστολή;"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1652,28 +1652,28 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Δημιουργήθηκε σφάλμα κατά την αποστολή του μηνύματος στο %s ."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Δεν είναι δυνατή η αποθήκεύσή του μηνύματος στα εξερχόμενα."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Δεν ήταν δυνατή η εύρεση του κλειδιού που σχετίζεται με το επιλεγμένο "
 "αναγνωριστικό `%s'."
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "Η αλλαγή της κατάστασης του `%s' απέτυχε"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1684,11 +1684,11 @@ msgstr ""
 "του μηνύματος στο προσδιορισμένο σύνολο %s.\n"
 "Να αποσταλεί ως %s;"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής κώδικα"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1701,15 +1701,15 @@ msgstr ""
 "\n"
 "Να γίνει αποστολή;"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Όριο μήκους γραμμής"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Κρυπτογράφηση στους κρυφούς παραλήπτες"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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,86 +1723,86 @@ msgstr ""
 "\n"
 "Να γίνει η αποστολή;"
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του παλιού μηνύματος\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "προσθήκη στην ουρά...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "Δεν είναι δυνατή η εύρεση του πηγαίου φακέλου."
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr ""
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Δημιουργία παραθύρου σύνθεσης...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Υπογραφή PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Κρυπτογράφηση PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, fuzzy, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 "Η εντολή εκτύπωσης είναι άκυρη:\n"
 "'%s'"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1812,49 +1812,49 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Επιλογή αρχείων"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Αποθήκευση μηνύματος"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Αυτό το μήνυμα έχει τροποποιηθεί. Θέλετε να το αποθηκεύσετε στα πρόχειρα;"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε να εφαρμόσετε το πρότυπο '%s' ;"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -2395,12 +2395,12 @@ msgstr "Μετονομασία φακέλου"
 msgid "Can't rename the folder '%s'."
 msgstr "Δεν είναι δυνατή η μετονομασία του φακέλου '%s'."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Δεν είναι δυνατή η μετακίνηση του φακέλου '%s'."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2409,11 +2409,11 @@ msgstr ""
 "Σίγουρα να διαγραφεί ο φάκελος αναζήτησης '%s' ;\n"
 "(Τα μηνύματα δε διαγράφονται από τον δίσκο)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Διαγραφή φακέλου αναζήτησης"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2426,20 +2426,20 @@ msgstr ""
 "\n"
 "Θέλετε πράγματι να τα διαγράψετε;"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Δεν είναι δυνατή η διαγραφή του φακέλου '%s'."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Άδειασμα απορριμμάτων"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Διαγραφή όλων των μηνυμάτων στο φάκελο απορριμμάτων;"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2448,34 +2448,34 @@ msgstr ""
 "Σίγουρα να διαγραφεί το γραμματοκιβώτιο `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Αφαίρεση γραμματοκιβωτίου"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Να διαγραφεί ο λογαριασμός IMAP4 `%s';"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Να διαγραφεί η ομάδα νέων `%s';"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Διαγραφή ομάδας νέων"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Να διαγραφεί ο λογαριασμός νέων `%s';"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού νέων"
 
@@ -2771,7 +2771,7 @@ msgstr "Σύνδεση με το διακομιστή POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Πιστοποίηση..."
 
@@ -2801,7 +2801,7 @@ msgstr "Λήψη μεγέθους μηνυμάτων (LIST)..."
 msgid "Deleting message %d"
 msgstr "Διαγραφή μηνύματος %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Κλείνω τη σύνδεση"
 
@@ -2851,7 +2851,7 @@ msgid "Socket error."
 msgstr "Σφάλμα σύνδεσης."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Η σύνδεση έκλεισε από τον απομακρυσμένο υπολογιστή."
 
@@ -2868,11 +2868,11 @@ msgstr ""
 "Το γραμματοκιβώτιο είναι κλειδωμένο:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2881,7 +2881,7 @@ msgstr ""
 "Η πιστοποίηση απέτυχε:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Λήξη χρόνου σύνδεσης."
 
@@ -6300,84 +6300,90 @@ msgstr ""
 "δεν ξέρετε σίγουρα ότι θα καταλήξει στο άτομο που επιδιώκετε.\n"
 "Το εμπιστεύεστε αρκετά ώστε να το χρησιμοποιήσετε έτσι κι αλλιώς;"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Η κεφαλίδα του μηνύματος στην ουρά είναι κακοσχηματισμένη.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Αποστολή μηνύματος με την εντολή: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Δεν είναι δυνατή η εκτέλεση της εντολής: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Προέκυψε ένα σφάλμα κατά την εκτέλεση της επιλεγμένης εντολής.: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Συνδέομαι"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Σύνδεση στην εξυπηρέτη SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Προέκυψε σφάλμα κατά την αποστολή της εντολής\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Αποστολή HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Πιστοποίηση"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Αποστολή μηνύματος..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Αποστολή EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Στέλνω MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Αποστολή"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Στέλνω RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Στέλνω DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Εγκατάλειψη..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/es.po b/po/es.po
index 32355ae7..4bff90df 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1045,7 +1045,7 @@ msgstr ""
 "¿Quiere borrar la carpeta Y todas las direcciones en «%s»? \n"
 "Si sólo borra la carpeta las direcciones se moverán a la carpeta padre."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1203,7 +1203,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1539,79 +1539,79 @@ msgstr "/_Herramientas/_Comprobar ortografía"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Herramientas/_Establecer idioma ortográfico"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "No se puede obtener el tamaño de %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componer%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1619,27 +1619,27 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta de correo antes de enviar."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1650,11 +1650,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1667,15 +1667,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Cifrando con copia oculta"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1689,83 +1689,83 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, 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:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1774,48 +1774,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Configurar barra de herramientas..."
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 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:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -2350,12 +2350,12 @@ msgstr "Renombrar carpeta"
 msgid "Can't rename the folder '%s'."
 msgstr "No se puede renombrar la carpeta «%s»."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2364,11 +2364,11 @@ msgstr ""
 "¿Eliminar la carpeta de búsqueda «%s» ?\n"
 "(Los mensajes no se borrarán)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Borrar carpeta de búsqueda"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2381,20 +2381,20 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede borrar la carpeta «%s»."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2403,34 +2403,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -2715,7 +2715,7 @@ msgstr "Conectando al servidor POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
@@ -2745,7 +2745,7 @@ msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Saliendo"
 
@@ -2797,7 +2797,7 @@ msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
@@ -2814,11 +2814,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "La autentificación falló."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2827,7 +2827,7 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Se agotó el tiempo de espera de la sesión."
 
@@ -6222,84 +6222,90 @@ msgstr ""
 "si llegará a la persona a la que lo quiere enviar.\n"
 "¿Es suficientemente fiable para usarla de todas maneras?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "La cabecera del mensaje en la cola es incorrecta.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando mensaje usando la orden: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "No se puede ejecutar la orden: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Hubo un error ejecutando la orden: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando con el servidor SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Hubo un error enviando el mandato\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Autentificando"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Enviando mensaje..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Hubo un error enviando el mensaje."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/et.po b/po/et.po
index 048f0b63..a8431e28 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1055,7 +1055,7 @@ msgstr ""
 "Kas te soovite kustutada kataloogi `%s' JA kõik aadressid ?\n"
 "Kui kustutate ainult kataloogi, siis aadressid kantakse pealmisse kausta."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
@@ -1219,7 +1219,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1597,80 +1597,80 @@ msgstr "/_Tööriist/Käivita"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1678,26 +1678,26 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1707,12 +1707,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1721,15 +1721,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1738,86 +1738,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1827,52 +1827,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2420,12 +2420,12 @@ msgstr "Nimeta kaust ümber"
 msgid "Can't rename the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2434,12 +2434,12 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2450,21 +2450,21 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2473,34 +2473,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -2795,7 +2795,7 @@ msgstr "Ühendan POP3 serveriga: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
@@ -2825,7 +2825,7 @@ msgstr "Võtan kirjade suuruse (LIST)..."
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Väljun"
 
@@ -2876,7 +2876,7 @@ msgid "Socket error."
 msgstr "Soketi viga\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2891,19 +2891,19 @@ msgid ""
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr ""
 
@@ -6418,88 +6418,94 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Järjekorda seatud kirja päis on katki.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ei saanud välist käsklust käima: %s\n"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Ühendan"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Ühendun SMTP serveriga: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Tekkis viga kirja protsessimisel."
+
+#: src/send_message.c:799
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autoriseerimine"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 #, fuzzy
 msgid "Sending message..."
 msgstr "Saadan kirja"
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Saadan"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Saadan RCPT..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Saadan andmed..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Väljun..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Saadan kirja"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Kirja saatmisel tekkis viga."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/fr.po b/po/fr.po
index 6e8d42ae..5a7350b7 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1061,7 +1061,7 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
@@ -1220,7 +1220,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Information"
 
@@ -1556,81 +1556,81 @@ msgstr "/_Outils/_Vérifier l'orthographe"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Outils/_Définir la langue du message"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr ""
 "Erreur du format de citation d'un message lors d'une réponse ou d'un "
 "transfert."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Composition%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1638,25 +1638,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:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, 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:3085
+#: src/compose.c:2983
 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:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1667,11 +1667,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1684,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Chiffrement avec « Copie discrète »"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1706,83 +1706,83 @@ msgstr ""
 "\n"
 "Envoyer quand même?"
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, 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:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1791,50 +1791,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 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:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2372,12 +2372,12 @@ msgstr "Changement de nom de dossier"
 msgid "Can't rename the folder '%s'."
 msgstr "Impossible de renommer le dossier « %s »."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2386,11 +2386,11 @@ msgstr ""
 "Effacer le dossier de tri « %s » ?\n"
 "Les messages existants ne seront PAS effacés du disque."
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Effacer le dossier de tri"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2403,20 +2403,20 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible d'effacer le dossier « %s »."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Effacer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2425,34 +2425,34 @@ msgstr ""
 "Ne plus utiliser la boîte aux lettres « %s » (les\n"
 "messages existants ne seront PAS effacés du disque) ?"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -2740,7 +2740,7 @@ msgstr "Connexion au serveur POP3 : %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Authentification..."
 
@@ -2770,7 +2770,7 @@ msgstr "Récupération de la taille des messages (LIST)..."
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Fermeture"
 
@@ -2822,7 +2822,7 @@ msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "La connexion a été fermée par le serveur."
 
@@ -2839,11 +2839,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "L'authentification à échoué."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2852,7 +2852,7 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Dépassement du délai de réponse (timeout) de la session."
 
@@ -6274,84 +6274,90 @@ msgstr ""
 "vous ne pourrez pas savoir s'il ira ou non au bon destinataire.\n"
 "Avez-vous néanmoins assez confiance en celle-ci pour l'utiliser ?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "L'en-tête du message en attente est corrompu.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Envoi du message avec la commande : %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Impossible d'exécuter la commande : %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Une erreur est survenue pendant l'exécution de la commande : %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Connexion"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Connection au serveur SMTP : %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Une erreur est survenue pendant l'envoi de la commande\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Envoi de HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Envoi du message..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Envoi de EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Envoi de MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Envoi"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Envoi de RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Envoi de DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Fermeture..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Envoi du message (%d / %d octets)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Envoi de message"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Une erreur est survenue pendant l'envoi de message."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/gl.po b/po/gl.po
index 8b43921d..b08ad23c 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1053,7 +1053,7 @@ msgstr ""
 "¿Quere borrar a carpeta E todos os enderezos en `%s'? \n"
 "Si so borra a carpeta os enderezos se moverán á carpeta pai."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1218,7 +1218,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1595,81 +1595,81 @@ msgstr "/_Ferramentas/E_xecutar"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Non se pode obter o tamaño de %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1677,25 +1677,25 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1706,12 +1706,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1720,15 +1720,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1737,85 +1737,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, 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:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1825,52 +1825,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2416,12 +2416,12 @@ msgstr "Renomear carpeta"
 msgid "Can't rename the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2430,12 +2430,12 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2446,21 +2446,21 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2469,34 +2469,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -2791,7 +2791,7 @@ msgstr "Conectando ó servidor POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Non se pode conectar ó servirdor POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
@@ -2821,7 +2821,7 @@ msgstr "Obtendo o tamaño de novas mensaxes (LIST)..."
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Saíndo"
 
@@ -2872,7 +2872,7 @@ msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2889,12 +2889,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticación"
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2903,7 +2903,7 @@ msgstr ""
 "Fallo de autenticación:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr ""
 
@@ -6415,85 +6415,91 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Cabeceira corrupta no mensaxe en cola.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Non se pode executar o comando externo: %s\n"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ocurriu un erro mentras se enviaba o correo."
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando con o servidor SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Ocurriu un erro mentras se enviaba o correo."
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 #, fuzzy
 msgid "Sending message..."
 msgstr "Enviando mensaxe"
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Enviando mensaxe"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Ocurriu un erro enviando as mensaxes."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/hr.po b/po/hr.po
index b71bfb67..8d7964d6 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1058,7 +1058,7 @@ msgstr ""
 "Želite li obrisati spis I sve adrese u `%s' ? \n"
 "Ukoliko brišete samo spis, adrese će biti premještene u prethodni spis."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Obriši spis"
 
@@ -1216,7 +1216,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1604,80 +1604,80 @@ msgstr "/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1685,25 +1685,25 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, 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:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1711,12 +1711,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1725,15 +1725,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1742,87 +1742,87 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, 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:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1832,53 +1832,53 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2430,12 +2430,12 @@ msgstr "Preimenuj spis"
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2444,12 +2444,12 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši spis"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2460,21 +2460,21 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2483,35 +2483,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -2820,7 +2820,7 @@ msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 poslužitelj: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
@@ -2850,7 +2850,7 @@ msgstr "Primam veličinu poruka (LIST)..."
 msgid "Deleting message %d"
 msgstr "Brišem poruke"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Izlazim"
 
@@ -2901,7 +2901,7 @@ msgid "Socket error."
 msgstr "protokol greška\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2917,19 +2917,19 @@ msgid ""
 "%s"
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr ""
 
@@ -6512,88 +6512,94 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavlje odložene poruke je loše.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ne mogu izvršiti vanjsku naredbu: %s\n"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Povezujem se"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Spajam se na SMTP poslužitelj: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Došlo je do greške pri radu s poštom."
+
+#: src/send_message.c:799
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autorizacija"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 #, fuzzy
 msgid "Sending message..."
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Šaljem"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Šaljem RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Šaljem DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Završavam..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Došlo je do greške prilikom slanja poruke."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/hu.po b/po/hu.po
index 75c9e8fa..230297ca 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+0900\n"
 "PO-Revision-Date: 2007-05-19 10:30+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1049,7 +1049,7 @@ msgstr ""
 "Tényleg törölni szeretné a(z) `%s' mappát ÉS az összes címet benne?\n"
 "Ha csak a mappát törli, a címek átkerülnek a szülő mappába."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
@@ -1203,7 +1203,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1539,79 +1539,79 @@ msgstr "/_Eszközök/_Helyesírásellenőrzés"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Eszközök/Helyesírás _nyelvi beállítások"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Levél válasz/továbbítás formátumhiba."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem határozható meg\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Levél: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Egy több részes levél egy darabja nem hozzáférhető."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Levél írása%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1619,26 +1619,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:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, 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:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "A levél nem menthető a kimenő mappába."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1649,11 +1649,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1666,15 +1666,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Titkos másolat(ok) titkosítása"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1689,83 +1689,83 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "a régi levelet nem lehet törölni\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "levél Várakozó sorba rakása...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "A levelet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Message-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1774,48 +1774,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "A levelet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 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:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -2348,12 +2348,12 @@ msgstr "Mappa átnevezése"
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' mappa nem nevezhető át."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhető át."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2362,11 +2362,11 @@ msgstr ""
 "A(z) `%s' keresési mappa törlése?\n"
 "Az eredeti levelek nem törlődnek."
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Keresési mappa törlése"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2379,20 +2379,20 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' mappa nem távolítható el."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden levél törlése a kukából?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2401,34 +2401,34 @@ msgstr ""
 "Tényleg eltávolítja `%s' postaládát?\n"
 "(A levelek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli a(z) `%s' IMAP4 hozzáférést?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozzáférés törlése"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírcsoportot?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírhozzáférést?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Hírhozzáférés törlése"
 
@@ -2713,7 +2713,7 @@ msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Azonosítás..."
 
@@ -2743,7 +2743,7 @@ msgstr "Új levelek méretének megszerzése (LIST)..."
 msgid "Deleting message %d"
 msgstr "%d levél törlése"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Kilépés"
 
@@ -2795,7 +2795,7 @@ msgid "Socket error."
 msgstr "Socket hiba."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "A távoli fél bezárta a kapcsolatot."
 
@@ -2812,11 +2812,11 @@ msgstr ""
 "A postafiók zárolt:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Az azonosítás nem sikerült."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2825,7 +2825,7 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Menet időtúllépése."
 
@@ -6226,84 +6226,90 @@ msgstr ""
 "tudhatja biztosan, hogy ahhoz a személyhez jut el, akinek szánta.\n"
 "Ennek ellenére megbízik annyira ebben a kulcsban, hogy használja?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "A várakozó levél fejléce sérült.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Levélküldésre használt parancs: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "A parancs nem futtatható: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Hiba történt a parancs futtatása közben: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Kapcsolódás %s SMTP szerverhez..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Hiba történt parancsküldés közben\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "HELO küldése..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Azonosítás"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Levél küldése ..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "EHLO küldése..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM küldése..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Küldés"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO küldése..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "DATA küldése..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Kilépés..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Levél küldése (%d / %d bájt)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Levél küldése"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Hiba történt a levélküldés közben."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/it.po b/po/it.po
index 5eea5501..2000a5f5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+0900\n"
 "PO-Revision-Date: 2007-05-26 09:38+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1049,7 +1049,7 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
@@ -1207,7 +1207,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1543,79 +1543,79 @@ msgstr "/S_trumenti/_Controllo ortografico"
 msgid "/_Tools/_Set spell language"
 msgstr "/S_trumenti/Impo_sta lingua"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componi%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1623,27 +1623,27 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, 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:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1655,11 +1655,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1673,15 +1673,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Cifratura con Bcc"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1695,83 +1695,83 @@ msgstr ""
 "\n"
 "Inviarlo comunque?"
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, 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:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1780,48 +1780,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Personalizza barra strumenti"
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -2356,12 +2356,12 @@ msgstr "Rinomina la cartella"
 msgid "Can't rename the folder '%s'."
 msgstr "Impossibile rinominare la cartella «%s»."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella «%s»."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2370,11 +2370,11 @@ msgstr ""
 "Rimuovere la cartella di ricerca «%s» ?\n"
 "I messaggi reali non saranno eliminati."
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Elimina la cartella di ricerca"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2388,20 +2388,20 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2410,34 +2410,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -2722,7 +2722,7 @@ msgstr "Connessione al server POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
@@ -2752,7 +2752,7 @@ msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Esco"
 
@@ -2804,7 +2804,7 @@ msgid "Socket error."
 msgstr "Errore del socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
@@ -2821,11 +2821,11 @@ msgstr ""
 "La casella postale è bloccata:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2834,7 +2834,7 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "La sessione è andata in timeout."
 
@@ -6242,84 +6242,90 @@ msgstr ""
 "saprete con sicurezza se andrà alla persona che intendete voi.\n"
 "Ritenerla sufficientemente fidata da usarla comunque?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "L'intestazione del messaggio accodato è rovinata.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Invio del messaggio usando il comando: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Impossibile eseguire il comando: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Si è verificato un errore durante l'esecuzione del comando: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Connessione"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Connessione al server SMTP: %s..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Si è verificato un errore durante l'invio del comando\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Invio di HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Autenticazione"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Invio del messaggio..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Invio di EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Invio di MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Invio"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Invio di RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Invio di DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Esco..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Invio del messaggio (%d di %d byte)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Invio del messaggio"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Si è verificato un errore durante l'invio del messaggio."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/ja.po b/po/ja.po
index b7ca84c5..a6e87e76 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1045,7 +1045,7 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
@@ -1201,7 +1201,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "注意"
 
@@ -1537,79 +1537,79 @@ msgstr "/ツール(_T)/スペルチェック(_C)"
 msgid "/_Tools/_Set spell language"
 msgstr "/ツール(_T)/スペルチェックの言語を指定(_S)"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "テキストパートを取得できません\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 作成%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "空の件名"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1617,25 +1617,25 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1646,11 +1646,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1663,15 +1663,15 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Bcc を伴う暗号化"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1685,83 +1685,83 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1770,48 +1770,48 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -2344,12 +2344,12 @@ msgstr "フォルダ名の変更"
 msgid "Can't rename the folder '%s'."
 msgstr "フォルダ '%s' の名前を変更できません。"
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "フォルダ `%s' を移動できません。"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2358,11 +2358,11 @@ msgstr ""
 "検索フォルダ '%s' を削除しますか?\n"
 "実際のメッセージは削除されません。"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "検索フォルダの削除"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2375,20 +2375,20 @@ msgstr ""
 "\n"
 "本当に削除してもいいですか?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "フォルダ '%s' を削除できません。"
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "ごみ箱を空にする"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2397,34 +2397,34 @@ msgstr ""
 "本当にメールボックス `%s' を削除しますか?\n"
 "(メッセージはディスクからは削除されません)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "メールボックスの削除"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "本当にIMAP4アカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "IMAP4アカウントの削除"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "本当にニュースグループ `%s' を削除しますか?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "ニュースグループの削除"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "本当にニュースアカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "ニュースアカウントの削除"
 
@@ -2709,7 +2709,7 @@ msgstr "POP3サーバ: %s に接続中..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3サーバ: %s:%d に接続できません\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "認証中..."
 
@@ -2739,7 +2739,7 @@ msgstr "メッセージのサイズを取得中 (LIST)..."
 msgid "Deleting message %d"
 msgstr "メッセージ %d を削除中"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "切断中"
 
@@ -2791,7 +2791,7 @@ msgid "Socket error."
 msgstr "ソケットエラーです。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "リモートホストによって接続を切断されました。"
 
@@ -2808,11 +2808,11 @@ msgstr ""
 "メールボックスはロックされています:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2821,7 +2821,7 @@ msgstr ""
 "認証に失敗しました:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "セッションがタイムアウトしました。"
 
@@ -6207,84 +6207,89 @@ msgstr ""
 "それが目的の相手に届くかどうかは保証できません。\n"
 "とにかくこの鍵を信用して使用しますか?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "送信待機中のメッセージのヘッダが壊れています。\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "コマンドを使用してメッセージを送信中: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "コマンドを実行できません: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "コマンドの実行中にエラーが発生しました: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "接続中"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTPサーバ: %s に接続中..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "QUIT コマンドの後にエラーが発生しました (無視されます)"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "HELO を送信中..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "認証中"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "メッセージを送信中..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "EHLO を送信中..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM を送信中..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "送信中"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO を送信中..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "DATA を送信中..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "切断中..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "メッセージを送信中 (%d / %d bytes)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "メッセージを送信中"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "メッセージの送信中にエラーが発生しました。"
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/ko.po b/po/ko.po
index d30feaf7..94c0b6de 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1044,7 +1044,7 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
@@ -1202,7 +1202,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "알림"
 
@@ -1580,80 +1580,80 @@ msgstr "/도구(_T)/실행(_x)"
 msgid "/_Tools/_Set spell language"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1661,25 +1661,25 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1689,12 +1689,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1703,15 +1703,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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,86 +1720,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1809,52 +1809,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -2399,12 +2399,12 @@ msgstr "폴더 이름 변경"
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2413,12 +2413,12 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "폴더 삭제"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2429,21 +2429,21 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2452,34 +2452,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -2773,7 +2773,7 @@ msgstr "POP3 서버 %s에 연결합니다..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
 
@@ -2803,7 +2803,7 @@ msgstr "메시지의 크기를 얻는 중 (LIST)..."
 msgid "Deleting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "끝마치는 중"
 
@@ -2852,7 +2852,7 @@ msgid "Socket error."
 msgstr "소켓 에러."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2867,19 +2867,19 @@ msgid ""
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 #, fuzzy
 msgid "Authentication failed."
 msgstr "인증 방법"
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "인증 방법"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr ""
 
@@ -6358,85 +6358,91 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "보낼 메시지의 헤더가 깨졌습니다.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "외부 명령을 실행할 수가 없습니다: %s\n"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "연결 중입니다"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTP 서버에 연결하고 있습니다: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "메일을 처리하는 도중 에러"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "HELO를 보냅니다..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "인증"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 #, fuzzy
 msgid "Sending message..."
 msgstr "메시지을 보내는 중"
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "EHLO를 보냅니다..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM을 보냅니다..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "보냅니다"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO를 보냅니다..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "DATA를 보냅니다..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "끝마치는 중..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "메시지을 보내는 중"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "메시지를 보내는데 에러 발생"
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/lt.po b/po/lt.po
index 81dda8aa..76e58b8a 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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"
@@ -683,7 +683,7 @@ msgstr ""
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1050,7 +1050,7 @@ msgstr ""
 "Ar tikrai norite pašalinti katalogą „%s“ ir visus adresus jame? \n"
 "Jei pašalinsite tik katalogą, adresai bus perkelti į aukštesnįjį katalogą."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
@@ -1209,7 +1209,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1549,79 +1549,79 @@ msgstr "/Į_rankiai/_Tikrinti rašybą"
 msgid "/_Tools/_Set spell language"
 msgstr "/Į_rankiai/_Nustatyti kalbą"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: failas neegzistuoja\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Negaliu gauti dalies teksto\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Formato klaida."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Atsakymo/persiuntimo formato klaida."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti failo „%s“ dydžio\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Failas %s yra tuščias"
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Negaliu perskaityti %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Laiškas: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1629,25 +1629,25 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti laiško „outbox“."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1658,11 +1658,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1675,15 +1675,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1692,83 +1692,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1777,48 +1777,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -2355,12 +2355,12 @@ msgstr "Pervadinti katalogą"
 msgid "Can't rename the folder '%s'."
 msgstr "Negaliu pervadinti katalogo „%s“"
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo „%s“"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2369,11 +2369,11 @@ msgstr ""
 "Ištrinti paieškos katalogą „%s“ ?\n"
 "Tikri laiškai nebus trinami."
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Ištrinti paieškos katalogą"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2386,20 +2386,20 @@ msgstr ""
 "\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Ištrinti visus laiškus šiukšlinėje?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2408,34 +2408,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(laiškai NEBUS ištrinti iš disko)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
@@ -2729,7 +2729,7 @@ msgstr "Jungiuosi prie POP3 serverio: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Patvirtinamas autentiškumas..."
 
@@ -2759,7 +2759,7 @@ msgstr "Gaunamas naujų laiškų dydis (LIST)..."
 msgid "Deleting message %d"
 msgstr "Trinamas laiškas %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Išeinu"
 
@@ -2809,7 +2809,7 @@ msgid "Socket error."
 msgstr "Socket error."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Prisijungimas uždarytas nuotolinio serverio."
 
@@ -2826,11 +2826,11 @@ msgstr ""
 "Dėžutė užrakinta:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Nepavyko patvirtinti autentiškumo."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2839,7 +2839,7 @@ msgstr ""
 "Nepavyko patvirtinti autentiškumo:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Baigėsi sesijos laikas."
 
@@ -6263,84 +6263,90 @@ msgstr ""
 "įsitikines, kad ji pasieks jūsų norimą adresatą.\n"
 "Ar jus pakankamai pasitikite šiuo raktu?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Neteisinga eilėje esančio laiško antraštė.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Laiškas siunčiama komanda: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Negaliu įvykdyti komandos: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Klaida vykdant komandą: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Jungiuosi prie SMTP serverio: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Klaida siunčiant komandą\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Siunčiu HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Tikrinamas autentiškumas"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Siunčiu laišką..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Siunčiu EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Siunčiu MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Siunčiu"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Siunčiu RCTP TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Siunčiu DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Išeinu..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Siunčiu laišką (%d / %d baitai)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Siunčiu laišką"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Klaida siunčiant laišką."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/nl.po b/po/nl.po
index a53e6e25..34d88ca0 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1059,7 +1059,7 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Verwijder map"
 
@@ -1220,7 +1220,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1560,79 +1560,79 @@ msgstr "/_Gereedschap/_Spellingscontrole"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Gereedschap/_Taal instellen"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Geen onderwerp"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1640,25 +1640,25 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, 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:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1669,11 +1669,11 @@ msgstr ""
 "\n"
 "Toch versturen als %s?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1686,15 +1686,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1703,83 +1703,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, 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:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1788,48 +1788,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -2369,12 +2369,12 @@ msgstr "Hernoem map"
 msgid "Can't rename the folder '%s'."
 msgstr "Kan map '%s' niet hernoemen."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2383,11 +2383,11 @@ msgstr ""
 "Wilt u de zoekmap '%s' verwijderen?\n"
 "De berichten zelf zullen NIET worden verwijderd."
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Zoekmap verwijderen"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2400,20 +2400,20 @@ msgstr ""
 "\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2422,34 +2422,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -2744,7 +2744,7 @@ msgstr "Verbinden met POP3-server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan niet verbinden met POP3 server: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
@@ -2774,7 +2774,7 @@ msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
@@ -2825,7 +2825,7 @@ msgstr "Socket-fout."
 
 #  consider EOF right after QUIT successful
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Verbinding verbroken door verbindingspartner."
 
@@ -2842,11 +2842,11 @@ msgstr ""
 "Mailbox is vergrendeld:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Identificatie mislukt."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2855,7 +2855,7 @@ msgstr ""
 "Identificatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Sessie is verlopen."
 
@@ -6300,84 +6300,90 @@ msgstr ""
 "niet zeker dat het bericht bij de juiste persoon terecht komt.\n"
 "Wilt u desondanks doorgaan?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "De header van het bericht in de wachtrij is kapot.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Bericht wordt verzonden met de opdracht: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "kan opdracht niet uitvoeren: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fout bij uitvoeren van opdracht: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Bezig met maken van verbinding"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Bezig met verbinden met SMTP server: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Fout opgetreden bij sturen van de opdracht\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Bezig met sturen van HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Bezig met identificatie"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Bericht verzenden..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Bezig met sturen van EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Bezig met verzenden van MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Bezig met verzenden"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Bezig met verzenden van RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Bezig met verzenden van DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Bezig met afsluiten..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Bezig met verzenden van bericht"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Er is een fout opgetreden bij het verzenden."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/pl.po b/po/pl.po
index 70e581d6..11d09ab5 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1050,7 +1050,7 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
@@ -1215,7 +1215,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1560,80 +1560,80 @@ msgstr "/_Narzędzia/_Wykonaj"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Utwórz wiadomość%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "Temat"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1641,26 +1641,26 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1670,12 +1670,12 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to %s ?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1684,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1701,83 +1701,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1787,51 +1787,51 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -2373,12 +2373,12 @@ msgstr "Zmień nazwę katalogu"
 msgid "Can't rename the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2387,12 +2387,12 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Usuń katalog"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2403,21 +2403,21 @@ msgstr ""
 "Wszystkie katalogi i wiadomości w \"%s\" zostaną usunięte.\n"
 "Czy naprawdę chcesz je usunąć?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2426,34 +2426,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -2747,7 +2747,7 @@ msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
@@ -2777,7 +2777,7 @@ msgstr "Pobieranie rozmiaru wiadomości (LIST)..."
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Wychodzenie"
 
@@ -2827,7 +2827,7 @@ msgid "Socket error."
 msgstr "Błąd gniazda."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zamknięte przez zdalny komputer."
 
@@ -2844,11 +2844,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2857,7 +2857,7 @@ msgstr ""
 "Błąd uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Sesja wygasła."
 
@@ -6299,84 +6299,90 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Uszkodzony nagłówek wiadomości w kolejce.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Wysyłanie wiadomości z użyciem polecenia: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Nie można wykonać polecenia: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Błąd podczas wykonywania polecenia: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Podłączanie"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Łączenie z serwerem SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Błąd podczas wysyłania polecenia\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Wysyłanie HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Uwierzytelnianie"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Wysyłanie wiadomości..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Wysyłanie EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Wysyłanie MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Wysyłanie"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Wysyłanie RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Wysyłanie DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Wychodzenie..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Wysyłanie wiadomości (%d / %d)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Wysyłanie wiadomości"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Błąd podczas wysyłania wiadomości."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8737779b..3773f17d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 15:39+0900\n"
-"PO-Revision-Date: 2007-05-18 10:42-0300\n"
+"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"PO-Revision-Date: 2007-05-28 10:36-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "MIME-Version: 1.0\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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1052,7 +1052,7 @@ msgstr ""
 "Você quer apagar a pasta E todos os endereços em `%s' ?\n"
 "Caso apague somente a pasta, os endereços serão movidos para a pasta pai."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
@@ -1211,7 +1211,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1547,79 +1547,79 @@ msgstr "/_Ferramentas/_Verificar ortografia"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Definir _idioma do verificador ortográfico"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Não foi possível obter o texto\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível especificar o tamanho de %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) dessa mensagem."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compondo%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto em branco. Enviar assim mesmo?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1627,25 +1627,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:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 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:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1657,11 +1657,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Erro convertendo codificação"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1674,15 +1674,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Encriptando com Bcc"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1696,83 +1696,83 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, 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:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1781,48 +1781,48 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Customizar barra de ferramentas..."
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 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:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2358,12 +2358,12 @@ msgstr "Renomear pasta"
 msgid "Can't rename the folder '%s'."
 msgstr "Não foi possível renomear a pasta '%s'."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Não foi possível mover a pasta `%s'."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2372,11 +2372,11 @@ msgstr ""
 "Apagar a pasta de busca '%s' ?\n"
 "As mensagens reais não serão apagadas."
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Apagar pasta de busca"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2389,20 +2389,20 @@ msgstr ""
 "\n"
 "Quer realmente apagá-las?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Apagar todas as mensagens da lixeira?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2411,34 +2411,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
@@ -2725,7 +2725,7 @@ msgstr "Conectando ao servidor POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
@@ -2755,7 +2755,7 @@ msgstr "Obtendo o número de novas mensagens (LIST)..."
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Saindo"
 
@@ -2807,7 +2807,7 @@ msgid "Socket error."
 msgstr "erro de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Conexão remota finalizada pela estação remota."
 
@@ -2824,11 +2824,11 @@ msgstr ""
 "Caixa de correio está trancada:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2837,7 +2837,7 @@ msgstr ""
 "Falha de autenticação:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Tempo limite da sessão."
 
@@ -3786,7 +3786,8 @@ msgstr ""
 "--send\n"
 "--status [pasta]...\n"
 "--status-full [pasta]...\n"
-"--open pasta/número--configdir diretório\n"
+"--open pasta/número\n"
+"--configdir diretório\n"
 "--exit\n"
 "--debug\n"
 "--help\n"
@@ -3905,24 +3906,20 @@ msgid "/_Print..."
 msgstr "/_Imprimir..."
 
 #: src/mimeview.c:142
-#, fuzzy
 msgid "/_Reply/_Reply"
-msgstr "/E_xibir/_Reply-To"
+msgstr "/_Responder/_Responder"
 
 #: src/mimeview.c:143
-#, fuzzy
 msgid "/_Reply/Reply to _all"
-msgstr "/Responder para _todos"
+msgstr "/_Responder/Responder para _todos"
 
 #: src/mimeview.c:145
-#, fuzzy
 msgid "/_Reply/Reply to _sender"
-msgstr "/Responder para o _remetente"
+msgstr "/_Responder/Responder para o _remetente"
 
 #: src/mimeview.c:147
-#, fuzzy
 msgid "/_Reply/Reply to mailing _list"
-msgstr "/Responder para a /_lista"
+msgstr "/_Responder/Responder para a /_lista"
 
 #: src/mimeview.c:151
 msgid "/_Check signature"
@@ -6236,84 +6233,90 @@ msgstr ""
 "saberá com certeza se ela irá com certeza para a pessoa que você deseja.\n"
 "Confia nela suficientemente para usá-la mesmo assim?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Mensagem da fila com cabeçalho corrompido.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando mensagem usando o comando: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Não foi possível executar o comando: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Erro ao executar comando: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando com o servidor SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Erro ao enviar comando\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Enviando mensagem..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Saindo..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensagem (%d / %d bytes)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro ao enviar suas mensagens."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/ro.po b/po/ro.po
index 19a2d700..7b88403a 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+0900\n"
 "PO-Revision-Date: 2007-05-25 12:45+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1067,7 +1067,7 @@ msgstr ""
 "Doriți să ștergeți folderul ȘI toate adresele din '%s' ?\n"
 "Dacă ștergeți doar folderul, adresele vor fi mutate în folderul părinte."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Ștergere folder"
 
@@ -1225,7 +1225,7 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1564,80 +1564,80 @@ msgstr "/_Unelte/Verifi_că ortografia"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Unelte/_Selectați limba ortografiei"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fișier inexistent\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Nu se poate obține partea de text\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citației."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Eroare de format mesaj de răspuns sau de trimitere mai departe."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fișierul %s nu există\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nu se poate obține dimensiunea fișierului %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Fișierul %s este gol."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Nu se poate citi %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compune%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu este specificat."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Subiect gol"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Subiectul este gol. Îl trimt oricum ?"
 
 # hm ?
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1645,26 +1645,26 @@ msgstr ""
 "Contul pentru trimitere mail nu a fost specificat.\n"
 "Vă rugăm să selectați un cont înainte de a trimite."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, 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:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Nu se poate salva mesajul în 'Trimise'."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nici o cheie nu a putut fi asociată cu id-ul cheii selectate '%s'."
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fișierului\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1676,11 +1676,11 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ca %s ?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1693,15 +1693,15 @@ msgstr ""
 "\n"
 "Îl trimit oricum ?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Criptare cu Bcc"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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,83 +1715,83 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "nu se poate șterge mesajul vechi\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de așteptare...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi folderul de coadă\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de așteptare\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Creare fereastră de compunere...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1800,48 +1800,48 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Selectați fișierele"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Selectați fișierul"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Salvează mesajul"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 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:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Doriți să aplicați șablonul '%s' ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -2380,12 +2380,12 @@ msgstr "Redenumește folderul"
 msgid "Can't rename the folder '%s'."
 msgstr "Nu se poate redenumi folderul '%s'"
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nu se poate muta folderul '%s'"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2394,11 +2394,11 @@ msgstr ""
 "Ștergeți folderul de căutare '%s' ?\n"
 "Mesajele reale NU sunt șterse de pe disc."
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Șterge folderul pentru căutare"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2411,23 +2411,23 @@ msgstr ""
 "\n"
 "Chiar doriți să ștergeți ?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nu se poate șterge folderul '%s'."
 
 # hm ? nu merge golește gunoiul cu fraza următoare, sau trebuie reformulată fraza următoare
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Golire gunoi"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Ștergeți toate mesajele din containerul de gunoi ?"
 
 # sau ștergeți ?
 # sau retrageți ?
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2436,34 +2436,34 @@ msgstr ""
 "Chiar ștergeți căsuța poștală '%s' ?\n"
 "(Mesajele NU sunt șterse de pe disc)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Șterge căsuța poștală"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sigur ștergeți contul IMAP4 '%s'?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Șterge cont IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sigur ștergeți grupul de știri '%s' ?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Ștergere grup de știri"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sigur ștergeți contul de știri '%s' ?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Șterge contul de știri"
 
@@ -2756,7 +2756,7 @@ msgstr "Conectare la serverul POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nu se poate efectua conexiunea la serverul POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
@@ -2786,7 +2786,7 @@ msgstr "Obținerea dimensiunii mesajelor (LIST)..."
 msgid "Deleting message %d"
 msgstr "Ștergere mesaje %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Părăsire"
 
@@ -2838,7 +2838,7 @@ msgid "Socket error."
 msgstr "Eroare socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Conexiune închisă de serverul de la distanță."
 
@@ -2855,11 +2855,11 @@ msgstr ""
 "Căsuța poștală este blocată:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Autentificarea a eșuat."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2868,7 +2868,7 @@ msgstr ""
 "Autentificarea a eșuat:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Timpul sesiunii a expirat."
 
@@ -6315,85 +6315,91 @@ msgstr ""
 "că va ajunge la persoana la care intenționați să ajungă.\n"
 "Îi acordați suficientă încredere încât să o folosiți oricum ?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Header-ul mesajului din coada de așteptare este invalid.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Trimitere mesaj utilizând comanda: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Nu se poate executa comanda: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "A apărut o eroare în timpul executării comenzii: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Conectare"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectare la serverul SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "A apărut o eroare în timpul trimiterii comenzii\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Trimitere HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Autentificare"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Trimitere mesaj..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Trimitere HELO"
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Trimitere MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Trimitere"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Trimitere RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Trimitere DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Părăsire..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Trimitere mesaj (%d / %d octeți)"
 
 # hm ? asta este o înștiințare sau o comandă ?
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Trimitere mesaj"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "A apărut o eroare în timpul trimiterii mesajului."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/ru.po b/po/ru.po
index 3189dcd1..c2819303 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+0900\n"
 "PO-Revision-Date: 2006-06-09 14:30+0400\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -688,7 +688,7 @@ msgstr ""
 "по команде \"Получить все\"."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1055,7 +1055,7 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Удалить папку"
 
@@ -1217,7 +1217,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1557,79 +1557,79 @@ msgstr "/Инструменты/Проверить орфографию"
 msgid "/_Tools/_Set spell language"
 msgstr "/Инструменты/Язык для проверки орфографии"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Тема не указана"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1637,25 +1637,25 @@ msgstr ""
 "Учётная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите её перед отправкой."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору \"%s\"."
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1666,11 +1666,11 @@ msgstr ""
 "\n"
 "Отправить его в кодировке %s?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Ошибка преобразования кодировки"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1683,15 +1683,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1700,83 +1700,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1786,48 +1786,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -2366,12 +2366,12 @@ msgstr "Переименовать папку"
 msgid "Can't rename the folder '%s'."
 msgstr "Не удалось переименовать папку \"%s\"."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не удалось переместить папку \"%s\"."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2380,11 +2380,11 @@ msgstr ""
 "Удалить папку поиска \"%s\"?\n"
 "Это не приведёт к удалению сообщений."
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Удалить папку поиска"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2397,20 +2397,20 @@ msgstr ""
 "\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ошибка при удалении папки \"%s\"."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2419,34 +2419,34 @@ msgstr ""
 "Удалить почтовый ящик \"%s\"?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учётную запись IMAP4 \"%s\"?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Удалить учётную запись IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей \"%s\"?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учётную запись новостей \"%s\"?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Удалить учётную запись новостей"
 
@@ -2740,7 +2740,7 @@ msgstr "Соединение с сервером POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
@@ -2770,7 +2770,7 @@ msgstr "Получение размера сообщений (LIST)..."
 msgid "Deleting message %d"
 msgstr "Удаление сообщения %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Выход"
 
@@ -2820,7 +2820,7 @@ msgid "Socket error."
 msgstr "Ошибка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Сервер закрыл соединение."
 
@@ -2837,11 +2837,11 @@ msgstr ""
 "Почтовый ящик занят:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2850,7 +2850,7 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Время сеанса истекло."
 
@@ -6286,84 +6286,90 @@ msgstr ""
 "тем человеком, который указан в User ID ключа.\n"
 "Использовать этот ключ, несмотря на отсутствие доверия?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Заголовок сообщения в очереди испорчен.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Отправка сообщения с помощью команды: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Не удалось выполнить команду: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Произошла ошибка при выполнении команды: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Соединение"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Соединение с сервером SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Произошла ошибка при передаче команды.\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Передача HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Аутентификация"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Отправка сообщения..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Передача EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Передача MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Отправка"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Передача RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Отправка данных..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Завершение..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Произошла ошибка при отправке сообщения."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/sk.po b/po/sk.po
index 56800bf8..f444ce57 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1051,7 +1051,7 @@ msgstr ""
 "Naozaj chcete zmazať priečinok A SÚČASNE všetky adresy v %s ?\n"
 "Ak zmažete len priečinok, adresy z neho sa presunú do nadradeného priečinku."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
@@ -1216,7 +1216,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1593,80 +1593,80 @@ msgstr "/_Nástroje/V_ykonať"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1674,25 +1674,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:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1703,12 +1703,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, 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:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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,85 +1734,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1822,52 +1822,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2413,12 +2413,12 @@ msgstr "Premenovať priečinok"
 msgid "Can't rename the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2427,12 +2427,12 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Odstrániť priečinok"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2443,21 +2443,21 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2466,34 +2466,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -2788,7 +2788,7 @@ msgstr "Pripájam sa k serveru POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Autentizácia..."
 
@@ -2818,7 +2818,7 @@ msgstr "Získavam veľkosť správ (LIST)..."
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Odpájam sa"
 
@@ -2868,7 +2868,7 @@ msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
@@ -2885,11 +2885,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2898,7 +2898,7 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 #, fuzzy
 msgid "Session timed out."
 msgstr "čas spojenia vypršal\n"
@@ -6413,84 +6413,90 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Hlavička správy vo fronte je poškodená.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Vykonať"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Pripájam sa k serveru SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Pri odosielaní správy nastala chyba."
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Posielam HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Autentizácia"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Odosielam správu..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Posielam EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Posielam MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Posielam"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Posielam RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Posielam DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Odpájam sa..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Odosielam správu"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/sl.po b/po/sl.po
index 612be09f..aaa14d8b 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1057,7 +1057,7 @@ msgstr ""
 "Ali res želite izbrisati mapo IN vse naslove v '%s' ? \n"
 "Če izbrišete samo mapo, se bodo vsi naslovi prestavili v starševsko mapo."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
@@ -1221,7 +1221,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1599,80 +1599,80 @@ msgstr "/_Orodja/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1680,25 +1680,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:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, 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:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1708,12 +1708,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1722,15 +1722,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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,86 +1739,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1828,52 +1828,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, 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:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2418,12 +2418,12 @@ msgstr "Preimenuj mapo"
 msgid "Can't rename the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2432,12 +2432,12 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Izbriši mapo"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2448,21 +2448,21 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2471,34 +2471,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -2793,7 +2793,7 @@ msgstr "Povezujem se s strežnikom POP: %s"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom POP: %s%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
@@ -2823,7 +2823,7 @@ msgstr "Ugotavljam velikost sporočil (LIST)..."
 msgid "Deleting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Zapuščam"
 
@@ -2872,7 +2872,7 @@ msgid "Socket error."
 msgstr "napaka v priključku."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2887,19 +2887,19 @@ msgid ""
 "%s"
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr ""
 
@@ -6413,85 +6413,91 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavje čakajočega sporočila je razbito.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ne morem pognati zunanjega ukaza: %s\n"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Povezovanje"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Povezujem se s strežnikom SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Med obdelavo pošte je prišlo do napake."
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Pošiljam HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Overovljam"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 #, fuzzy
 msgid "Sending message..."
 msgstr "Pošiljam sporočilo"
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Pošiljam EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Pošiljam MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Pošiljanje"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Pošiljam RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Pošiljam DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Zapuščam..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Med pošiljanjem sporočila je prišlo do napake."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/sr.po b/po/sr.po
index d5c8e12b..8a44a667 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1058,7 +1058,7 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
@@ -1215,7 +1215,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1593,80 +1593,80 @@ msgstr "/_Alati/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1674,26 +1674,26 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, 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:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1703,12 +1703,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, 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:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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,86 +1734,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1823,52 +1823,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2413,12 +2413,12 @@ msgstr "Preimenuj direktorijum"
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2427,12 +2427,12 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2443,21 +2443,21 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2466,34 +2466,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -2788,7 +2788,7 @@ msgstr "Povezujem se na POP3 server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
@@ -2818,7 +2818,7 @@ msgstr "Preuzimam veličinu poruka (LIST)..."
 msgid "Deleting message %d"
 msgstr "Brišem poruke %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Izlazim"
 
@@ -2867,7 +2867,7 @@ msgid "Socket error."
 msgstr "Protokol greška."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2882,19 +2882,19 @@ msgid ""
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Način provere identieta"
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Način provere identieta"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr ""
 
@@ -6409,88 +6409,94 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavlje odložene poruke je loše.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ne mogu izvršiti spoljašnu naredbu: %s\n"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Povezujem se"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Spajam se na SMTP server: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Došlo je do greške pri radu s poštom."
+
+#: src/send_message.c:799
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 #, fuzzy
 msgid "Authenticating"
 msgstr "Provera identiteta"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 #, fuzzy
 msgid "Sending message..."
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Šaljem"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Šaljem RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Šaljem DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Završavnje..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Došlo je do greške prilikom slanja poruke."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/sv.po b/po/sv.po
index 19d9d55c..a44abffd 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1055,7 +1055,7 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
@@ -1212,7 +1212,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Notera"
 
@@ -1557,79 +1557,79 @@ msgstr "/V_erktyg/Utför _köade åtgärder"
 msgid "/_Tools/_Set spell language"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Skriv%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Tomt ämne"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1637,26 +1637,26 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1667,11 +1667,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1684,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1701,83 +1701,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1787,48 +1787,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -2367,12 +2367,12 @@ msgstr "Byt namn på mapp"
 msgid "Can't rename the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan inte flytta mappen \"%s\"."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2381,12 +2381,12 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2399,20 +2399,20 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2421,34 +2421,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -2742,7 +2742,7 @@ msgstr "Ansluter till POP3-server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
@@ -2772,7 +2772,7 @@ msgstr "Tar emot meddelandenas storlek (LIST)..."
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Avslutar"
 
@@ -2822,7 +2822,7 @@ msgid "Socket error."
 msgstr "Fel på uttag (socket)."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen stängdes av fjärrvärden."
 
@@ -2839,11 +2839,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2852,7 +2852,7 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Sessionens väntetid tog slut."
 
@@ -6289,84 +6289,90 @@ msgstr ""
 "med säkerhet att den kommer att gå till den person du avser.\n"
 "Litar du på den tillräckligt för att använda den ändå?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Brevhuvud i köat meddelande är trasigt.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Skickar meddelande med kommando: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Kan inte köra kommando: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fel uppstod vid körning av kommando: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Upprättar förbindelse"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Upprättar förbindelse med SMTP-server: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Fel uppstod när kommandot skickades\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Skickar HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Skickar meddelande..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Skickar EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Skickar MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Skickar"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Skickar RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Skickar DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Avslutar..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Skickar meddelande (%d / %d byte)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Fel uppstod när meddelandet skickades."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/tr.po b/po/tr.po
index b8619f3c..9e26ef73 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1055,7 +1055,7 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Dizini sil"
 
@@ -1217,7 +1217,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Not"
 
@@ -1586,80 +1586,80 @@ msgstr "/A_raçlar/Ç_alıştır"
 msgid "/_Tools/_Set spell language"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "Konu"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1667,25 +1667,25 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1696,12 +1696,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1710,15 +1710,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1727,85 +1727,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, 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:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1815,52 +1815,52 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -2403,12 +2403,12 @@ msgstr "Dizini yeniden adlandır"
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2417,12 +2417,12 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2433,21 +2433,21 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2456,34 +2456,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -2777,7 +2777,7 @@ msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
@@ -2807,7 +2807,7 @@ msgstr "İletilerin boyutları alınıyor (LIST)..."
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
@@ -2857,7 +2857,7 @@ msgid "Socket error."
 msgstr "protokol hatası"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
@@ -2874,11 +2874,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata oluştu."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2887,7 +2887,7 @@ msgstr ""
 "Yetkilendirme başarısız:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Oturum zaman aşımına uğradı."
 
@@ -6358,84 +6358,90 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Alıntı metinindeki başlıklar hatalı.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Komut çalıştır"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Komut gönderilirken hata oluştu\n"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Bağlantı kuruluyor"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTP sunucuya bağlantı kuruluyor: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Komut gönderilirken hata oluştu\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "HELO gönderiliyor..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr " Kimlik denetimi"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "İleti gönderiliyor..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "EHLO gönderiliyor... "
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM gönderiliyor..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Gönderiliyor"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO gönderiliyor..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "DATA gönderiliyor..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Çıkılıyor..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "İleti gönderiliyor"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "İleti gönderilirken hata oluştu."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/uk.po b/po/uk.po
index 22d57478..798c7c6b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+0900\n"
 "PO-Revision-Date: 2007-01-05 13:58+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -690,7 +690,7 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1057,7 +1057,7 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Видалити папку"
 
@@ -1213,7 +1213,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1552,79 +1552,79 @@ msgstr "/Інструменти/Перевірка правопису"
 msgid "/_Tools/_Set spell language"
 msgstr "/Інструменти/Обрати мову для перевірки правопису"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Не вдалось отримати текстову частину\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Порожня тема"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1632,25 +1632,25 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1661,11 +1661,11 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати як %s?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1678,15 +1678,15 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr "Шифрувати з прихованими адресатами"
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1700,83 +1700,83 @@ msgstr ""
 "\n"
 "Все ж послати?"
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1785,48 +1785,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -2363,12 +2363,12 @@ msgstr "Перейменувати папку"
 msgid "Can't rename the folder '%s'."
 msgstr "Не вдалось перейменувати папку `%s'."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не вдалось перенести папку `%s'."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2377,11 +2377,11 @@ msgstr ""
 "Справді видалити папку пошуку `%s' ?\n"
 "(Листи НЕ видаляються з диска.)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Видалити папку пошуку"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2394,20 +2394,20 @@ msgstr ""
 "\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2416,34 +2416,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
@@ -2736,7 +2736,7 @@ msgstr "З'єднуємось з сервером POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Автентифікація..."
 
@@ -2766,7 +2766,7 @@ msgstr "Отримуємо розмір листів (LIST)..."
 msgid "Deleting message %d"
 msgstr "Видаляємо лист %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Виходимо"
 
@@ -2816,7 +2816,7 @@ msgid "Socket error."
 msgstr "Помилка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "З'єднання закрито віддаленим хостом."
 
@@ -2833,11 +2833,11 @@ msgstr ""
 "Скриньку заблоковано:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Невдача аутентифікації."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2846,7 +2846,7 @@ msgstr ""
 "Невдача аутентифікації:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Таймаут сесії."
 
@@ -6260,84 +6260,90 @@ msgstr ""
 "напевно, що він потрапить до відповідної людини.\n"
 "Все ж вживати? "
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Заголовок листа з черги зіпсовано.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Посилаємо лист з допомогою команди: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Не вдалось виконати команду: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "При виконанні команди '%s' трапилась помилка"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "З'єднуємось"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "З'єднання з сервером SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "При відсиланні команди трапилась помилка\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Посилаємо HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Аутентифікація"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Посилаємо лист..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Посилаємо EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Посилаємо MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Посилаємо"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Посилаємо RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Посилаємо DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Виходимо..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Посилаємо лист (%d / %d байтів)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Посилаємо лист"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "При відсиланні листа трапилась помилка."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/vi.po b/po/vi.po
index 4e7050ec..35dcafa4 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1035,7 +1035,7 @@ msgstr ""
 "Bạn có muốn xoá thư mục VÀ mọi địa chỉ trong `%s' ?\n"
 "Nếu chỉ xoá thư mục, các địa chỉ sẽ được chuyển đến thư mục cấp cao hơn."
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
@@ -1195,7 +1195,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1535,79 +1535,79 @@ msgstr "/_Công cụ/Kiểm tra _chính tả"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Công cụ/Chọn ngôn ngữ để _kiểm tra chính tả"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "Không thể lấy phần văn bản\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "Lỗi định dạng đánh dấu trích dẫn."
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "Lỗi định dạng trả lời/chuyển tiếp thư."
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Không thể xác định kích tước tập tin của %s\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Không thể đọc %s."
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Thư: %s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Viết thư%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "Chưa chỉ định người nhận."
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "Tiêu đề bị bỏ trống"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1615,25 +1615,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:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, 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:3085
+#: src/compose.c:2983
 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:3123
+#: src/compose.c:3021
 #, 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:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1644,11 +1644,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1661,15 +1661,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1678,83 +1678,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 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:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, 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:5986
+#: src/compose.c:5854
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1763,48 +1763,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:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 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:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, 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:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -2342,12 +2342,12 @@ msgstr "Đổi tên thư mục"
 msgid "Can't rename the folder '%s'."
 msgstr "Không thể đổi tên thư mục `%s'."
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Không thể di chuyển thư mục `%s'."
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2356,11 +2356,11 @@ msgstr ""
 "Xoá thư mục tìm kiếm `%s' ?\n"
 "Thư sẽ không bị xoá khỏi ổ cứng."
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 msgid "Delete search folder"
 msgstr "Xoá thư mục tìm kiếm"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2373,20 +2373,20 @@ msgstr ""
 "\n"
 "Bạn có thực sự muốn xoá không?"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Không thể xoá thư mục '%s'."
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "Đổi rác"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2395,34 +2395,34 @@ msgstr ""
 "Thực sự muốn xoá hộp thư `%s' ?\n"
 "(Thư sẽ KHÔNG bị xoá khỏi ổ cứng)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản IMAP4 `%s'?"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "Xoá tài khoản IMAP4"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Thực sự muốn xoá nhóm tin `%s'?"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "Xoá nhóm tin"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản tin tức `%s'?"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "Xoá tài khoản tin tức"
 
@@ -2716,7 +2716,7 @@ msgstr "Đang kết nối tới máy chủ POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Không thể kết nối tới máy thủ POP3: %s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
 
@@ -2746,7 +2746,7 @@ msgstr "Đang xác định kích thước thư (LIST)..."
 msgid "Deleting message %d"
 msgstr "Đang xoá thư %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "Đang thoát"
 
@@ -2796,7 +2796,7 @@ msgid "Socket error."
 msgstr "Lỗi socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "Kết nối bị ngắt bởi máy từ xa."
 
@@ -2813,11 +2813,11 @@ msgstr ""
 "Hộp thư bị khoá:\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "Xác thực thất bại."
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2826,7 +2826,7 @@ msgstr ""
 "Xác thực thất bại:\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "Phiên làm việc hết giờ."
 
@@ -6248,84 +6248,90 @@ msgstr ""
 "nó sẽ đến được đúng với người mà bạn muốn.\n"
 "Bạn có đủ tin tưởng để dùng nó không?"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "Header của thư đang đợi gửi đã bị hỏng.\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Đang gửi thư với lệnh: %s\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Không chạy được lệnh: %s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Có lỗi khi chạy lệnh: %s"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "Đang kết nối"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Đang kết nối tới máy chủ SMTP: %s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "Có gỗi khi gửi lệnh\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "Đang gửi HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "Đang xác thực"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "Đang gửi thư..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "Đang gửi EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "Đang gửi MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "Đang gửi"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "Đang gửi RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "Đang gửi DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "Đang thoát..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Đang gửi thư (%d / %d byte)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "Đang gửi thư"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "Có lỗi khi gửi thư."
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e20bac70..620d8bf3 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1048,7 +1048,7 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "删除文件夹"
 
@@ -1203,7 +1203,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "注意"
 
@@ -1551,80 +1551,80 @@ msgstr "/工具(_T)/执行(_X)"
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1632,25 +1632,25 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1660,12 +1660,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1674,15 +1674,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1691,85 +1691,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1779,51 +1779,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2365,12 +2365,12 @@ msgstr "重命名文件件"
 msgid "Can't rename the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2379,12 +2379,12 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2395,21 +2395,21 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2418,34 +2418,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -2739,7 +2739,7 @@ msgstr "正在连接POP3服务器：%s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "正在验证..."
 
@@ -2769,7 +2769,7 @@ msgstr "正在获取新邮件的大小(LIST)..."
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "正在退出"
 
@@ -2819,7 +2819,7 @@ msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
@@ -2836,11 +2836,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2849,7 +2849,7 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "会话超时。"
 
@@ -6295,84 +6295,90 @@ msgstr ""
 "的人那里。\n"
 "您仍然要使用它吗？"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "队列中的邮件的邮件头头损坏。\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "无法执行外部命令：%s\n"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "发送命令时发生错误\n"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "正在连接SMTP服务器：%s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "发送命令时发生错误\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "正在发送 HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "正在验证"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "正在发送邮件..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "正在发送 EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "正在发送 MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "正在发送"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "正在发送 RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "正在发送 DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "正在退出..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "正在发送邮件"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "发送邮件时发生错误。"
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 79ef7efe..29eb8908 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1051,7 +1051,7 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
@@ -1208,7 +1208,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "注意"
 
@@ -1553,79 +1553,79 @@ msgstr "/工具(_T)/執行(_X)"
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "沒有文字部份\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄郵件格式錯誤。"
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "郵件：%s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 編寫郵件%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 msgid "Empty subject"
 msgstr "主旨空白"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1633,25 +1633,25 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "無法將郵件送至寄件夾中。"
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1661,11 +1661,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1678,15 +1678,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1695,83 +1695,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1781,48 +1781,48 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -2361,12 +2361,12 @@ msgstr "重新命名資料夾"
 msgid "Can't rename the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "無法移動資料夾「%s」。"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2375,12 +2375,12 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2393,20 +2393,20 @@ msgstr ""
 "\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2415,34 +2415,34 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "移除信箱"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組「%s」嗎？"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號「%s」嗎？"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -2736,7 +2736,7 @@ msgstr "連線到 POP3 伺服器 %s 中..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "認證"
 
@@ -2766,7 +2766,7 @@ msgstr "取得新郵件的數量中"
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "離開"
 
@@ -2816,7 +2816,7 @@ msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
@@ -2831,11 +2831,11 @@ msgid ""
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2844,7 +2844,7 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "作業逾時"
 
@@ -6257,84 +6257,90 @@ msgstr ""
 "您所希望的收件者。\n"
 "即使如此您還是信任去使用它嗎？"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "暫存資料夾中的郵件標頭錯誤。\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "使用命令 %s 送出郵件\n"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "無法執行命令：%s"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "執行命令 %s 時發生錯誤"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "連線到 SMTP 伺服器 %s..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "送出命令時發生錯誤。\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "送出 HELO 標頭..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "認證中..."
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "送出郵件中..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "送出 EHLO 標頭..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "送出 MAIL FROM 標頭..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "送信中"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "送出 RCPT TO 標頭..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "送出郵件資料 DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "離開中..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "送出新郵件 (%d / %d 位元組)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "送出郵件"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "送信時發生錯誤。"
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2007-07-20 06:52:59 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2007-07-20 06:52:59 +0000
commit	08b6c427a1c7f206927d66a49bb5860287c9b672 (patch)
tree	35894cf9f5ad33becbb5719e5f26240a73fbf416 /po
parent	9fff27c6dd65ad4995fa08bce2ff8daf268e5d62 (diff)